Merge branch 'hotfix/31'

Close #31

Author: Xerkus

.coveralls.yml

@@ -1,3 +1,2 @@
 coverage_clover: clover.xml
 json_path: coveralls-upload.json
-src_dir: src

.travis.yml

@@ -6,38 +6,25 @@ branches:
   except:
     - /^release-.*$/
     - /^ghgfk-.*$/
-
 cache:
   directories:
     - $HOME/.composer/cache
-    - $HOME/.local
-    - zf-mkdoc-theme
+
+env:
+  global:
+    - COMPOSER_ARGS="--no-interaction"
+    - COVERAGE_DEPS="satooshi/php-coveralls"
+    - LEGACY_DEPS="phpunit/phpunit"
 
 matrix:
-  fast_finish: true
   include:
-    - php: 5.5
-      env:
-        - DEPS=lowest
-    - php: 5.5
-      env:
-        - DEPS=locked
-        - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
-        - PATH="$HOME/.local/bin:$PATH"
-        - SITE_URL: https://zendframework.github.io/zend-router
-        - GH_USER_NAME: "Matthew Weier O'Phinney"
-        - GH_USER_EMAIL: [email protected]
-        - GH_REF: github.com/zendframework/zend-router.git
-        - secure: "QfhiZVZvQD1Z7aiepuUyWhVaXG+Z/fcLXjJgleWl9Kh2h805oVP2AyJaUi88eFzOYSuKn6/Zm8sRge+RRHO0d76fZSpA5vSDflWak01qIpw9iNREEIikoDGLgWPCyBQE5ngiypUv7B0MaM2jSiuIid/lMB7UO/1paUVHSMxVtUbNZbwVf1wmMSICEIm0ZoPl0J+mkg48pWluqntc+KOUuOwtG84N9CbG9jNnVmz40gzq/rodJpOZ03wjM9AoEn/iVj6+UMtA6kpF+6BZAPP9pRQEWzb52RzLf1tIFR7ZyC6GdQfMTjWu5FCllnZAUiH+G2L/bq52YxGJjWw5nf8qnb7sWubPYjd6lMAxvqZMbj85Lgv8lernHxa1uJReDY7Nu9OuF6CvrA1EYIxLAH44rQhMd6D1fE3WtbG7xLi/jU3bKFwKWKpRjb2lQIK2vmPHiuVlZ5ggJhh2M9hftMmLHedFYSr+ZzDhAvyMMv5vaWWq/1sWu6OSUocm+aqbx9vnYR8VDNupdmYP4x6m8u75WAgAbb7TIIyOB/piM3H3pGr/gffp3ZA2Wa4+TY2hepStO3iPrEJ7d/rtT76sIdBjO0q8X3eQFAlwCLavsdzEsurrANBMkOyGDOdJEwzDaRyTRntJ6F3/0vHm0QJzCWi7Xe8wYp8/3jRd0BJeg/eer5o="
-    - php: 5.5
-      env:
-        - DEPS=latest
     - php: 5.6
       env:
         - DEPS=lowest
     - php: 5.6
       env:
         - DEPS=locked
+        - CS_CHECK=true
         - TEST_COVERAGE=true
     - php: 5.6
       env:
@@ -48,49 +35,48 @@ matrix:
     - php: 7
       env:
         - DEPS=locked
-        - CHECK_CS=true
     - php: 7
       env:
         - DEPS=latest
-    - php: hhvm
+    - 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: hhvm
+    - php: 7.2
       env:
         - DEPS=locked
-    - php: hhvm
+    - php: 7.2
       env:
         - DEPS=latest
   allow_failures:
-    - php: hhvm
-
-env:
-  global:
-    - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
-
-notifications:
-  irc: "irc.freenode.org#zftalk.dev"
-  email: false
+    - php: 7.2
 
 before_install:
+  - 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 [[ $TRAVIS_PHP_VERSION != "hhvm" && $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini ; fi
-  - if [[ $DEPS == 'locked' ]]; then composer validate; fi
 
 install:
+  - 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 --no-update --dev $COMPOSER_ARGS satooshi/php-coveralls ; fi
-  - travis_retry composer install $COMPOSER_ARGS
-  - composer show --installed
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
+  - stty cols 120 && composer show
 
 script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
-  - if [[ $CHECK_CS == 'true' ]]; then composer cs-check ; fi
-  - if [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then travis_retry curl -sSL https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh | bash ; fi
+  - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
 
 after_script:
-  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer upload-coverage ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
 
-after_success:
-  - if [[ $DEPLOY_DOCS == "true" ]]; then ./zf-mkdoc-theme/deploy.sh ; fi
+notifications:
+  email: false