Merge branch 'hotfix/qa-tooling'

Close #5
Close #3

Author: weierophinney

Diff for: .gitattributes

@@ -1,3 +1,4 @@
+/docs export-ignore
 /test export-ignore
 /vendor export-ignore
 .coveralls.yml export-ignore

Diff for: .gitignore

@@ -6,12 +6,11 @@
 .*.sw*
 .*.un~
 nbproject
-doc/html/
+docs/html/
 tmp/
 vendor/
 zf-mkdoc-theme/
 
 clover.xml
-composer.lock
 coveralls-upload.json
 phpunit.xml

Diff for: .travis.yml

@@ -10,53 +10,75 @@ branches:
 cache:
   directories:
     - $HOME/.composer/cache
-    - $HOME/.local
-    - zf-mkdoc-theme
 
 env:
   global:
-    - SITE_URL=https://zendframework.github.io/zend-json-server
-    - GH_USER_NAME="Matthew Weier O'Phinney"
-    - [email protected]
-    - GH_REF=github.com/zendframework/zend-json-server.git
-    - secure: "KvztcHanoXLkqi+yL3o5el7ypu/jcyHqKy0VtOKGB483sg2wn6wJyAuVLBJscmzgazjPzQa57MBe9an7OOpuoJNPtE5m9huk41KByK2ibzMnC4F7D8lox5CUoV0jRaohYQmpZitbj/BKPlFbYaT42d+/R2o9CEQUJ4T3nYltzAydvB3T1CJE1u7HtZ8mB/Kgkfjqcyx+/bnmvmeGlwop4rDxHmEmrfApdWSUMSKUKjJqUlZt0ASpa2fJy3HL4don6WV1ufPcKVI7bQN1dkn+zZhW5zQ7PRg0hMEMxEMC8MLyLZvDXxL4rUmt2i3I0NtK6E357QdoX13NQKJZiH47jFpJA3DFQl2vE7Vu3kEkMqsrM2fbp9xTCyN9Gg5ZHueUd+iUxVCTy5Twlqt8MqBd2Z4tbljOsgBQkRuKxRg+JkNcWGM5RIWhA169nGY25867Bah/hh25blpsj77RVsvJdeUzAqCHWm5ey+2rNcUWbJXUK2nQdlonCLNsP0LweA5344GFFw+U+93btEw/5mpADbjhaYuZKXhMOcnqJgTGghxkp0cnExb7w5p6KxAsQ+E/C5X7RDwwhaTb6LUuKrTgar4/3RVUIqujdVVUntB1161S6Qnut1TqdaRHbgGOBSlCNWAB960icfdNbN+y4mtJZf9AVgvkoN8QGlncVPF+6GI="
+    - COMPOSER_ARGS="--no-interaction"
+    - COVERAGE_DEPS="satooshi/php-coveralls"
+    - LEGACY_DEPS="phpunit/phpunit"
 
 matrix:
   fast_finish: true
   include:
-    - php: 5.5
+    - php: 5.6
+      env:
+        - DEPS=lowest
+    - php: 5.6
       env:
-        - EXECUTE_CS_CHECK=true
+        - DEPS=locked
+        - TEST_COVERAGE=true
     - php: 5.6
       env:
-        - EXECUTE_TEST_COVERALLS=true
-        - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
-        - PATH="$HOME/.local/bin:$PATH"
+        - DEPS=latest
     - php: 7
-    - php: hhvm 
+      env:
+        - DEPS=lowest
+    - php: 7
+      env:
+        - DEPS=locked
+        - CS_CHECK=true
+    - php: 7
+      env:
+        - DEPS=latest
+    - php: 7.1
+      env:
+        - DEPS=lowest
+    - php: 7.1
+      env:
+        - DEPS=locked
+    - php: 7.1
+      env:
+        - DEPS=latest
+    - php: 7.2
+      env:
+        - DEPS=lowest
+    - php: 7.2
+      env:
+        - DEPS=locked
+    - php: 7.2
+      env:
+        - DEPS=latest
   allow_failures:
-    - php: hhvm
-
-notifications:
-  irc: "irc.freenode.org#zftalk.dev"
-  email: false
+    - php: 7.2
 
 before_install:
-  - if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
+  - if [[ $TEST_COVERAGE != 'true' && "$(php --version | grep xdebug -ci)" -ge 1 ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
   - travis_retry composer self-update
-  - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
 
 install:
-  - travis_retry composer install --no-interaction --ignore-platform-reqs
+  - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
+  - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
+  - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
+  - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
+  - stty cols 120 && composer show
 
 script:
-  - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer test-coverage ; fi
-  - if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then composer test ; fi
-  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then composer cs-check ; fi
-  - if [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then wget -O theme-installer.sh "https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh" ; chmod 755 theme-installer.sh ; ./theme-installer.sh ; fi
-
-after_success:
-  - if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
+  - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
 
 after_script:
-  - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer upload-coverage ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
+
+notifications:
+  email: false

Diff for: CHANGELOG.md

@@ -2,11 +2,12 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 3.0.1 - TBD
+## 3.1.0 - 2017-10-16
 
 ### Added
 
-- Nothing.
+- [#5](https://github.com/zendframework/zend-xml2json/pull/5) adds support for
+  PHP 7.1 and 7.2.
 
 ### Changed
 
@@ -21,6 +22,13 @@ All notable changes to this project will be documented in this file, in reverse
 - [#1](https://github.com/zendframework/zend-xml2json/pull/1) removes an
   obsolete `@deprecated` annotation.
 
+- [#5](https://github.com/zendframework/zend-xml2json/pull/5) removes support
+  for PHP 5.5. The code likely still runs on that version, but we no longer
+  support it.
+
+- [#5](https://github.com/zendframework/zend-xml2json/pull/5) removes support
+  for HHVM.
+
 ### Fixed
 
 - Nothing.

Diff for: LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2016, Zend Technologies USA, Inc.
+Copyright (c) 2005-2017, Zend Technologies USA, Inc.
 
 All rights reserved.
 

Diff for: README.md

@@ -6,4 +6,4 @@
 zend-xml2json provides functionality for converting XML structures to JSON.
 
 - File issues at https://github.com/zendframework/zend-xml2json/issues
-- Documentation is at https://zendframework.github.io/zend-xml2json/
+- Documentation is at https://docs.zendframework.com/zend-xml2json/

Diff for: composer.json

@@ -8,20 +8,23 @@
         "xml"
     ],
     "homepage": "https://github.com/zendframework/zend-xml2json",
+    "config": {
+        "sort-packages": true
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "3.0-dev",
             "dev-develop": "3.1-dev"
         }
     },
     "require": {
-        "php": "^5.5 || ^7.0",
+        "php": "^5.6 || ^7.0",
         "zendframework/zend-json": "^2.6.1 || ^3.0",
         "zendframework/zendxml": "^1.0.2"
     },
     "require-dev": {
-        "squizlabs/php_codesniffer": "^2.3",
-        "phpunit/PHPUnit": "~4.0"
+        "phpunit/phpunit": "^5.7.22 || ^6.4.1",
+        "zendframework/zend-coding-standard": "~1.0.0"
     },
     "autoload": {
         "psr-4": {