Merge branch 'hotix/qa-tools' into develop

Forward port #208
Forward port #222
Forward port #228
Forward port #230

Conflicts:
	src/Controller/Plugin/Forward.php
	test/Controller/ActionControllerTest.php
	test/Controller/ControllerManagerTest.php
	test/Controller/Plugin/ForwardTest.php
	test/Controller/RestfulControllerTest.php
	test/Controller/TestAsset/ControllerLoaderAbstractFactory.php
	test/Service/ServiceListenerFactoryTest.php
	test/Service/ServiceManagerConfigTest.php
	test/Service/ViewHelperManagerFactoryTest.php

Author: weierophinney

.php_cs

@@ -15,6 +15,9 @@ cache:
 
 env:
   global:
+    - COMPOSER_ARGS="--no-interaction"
+    - COVERAGE_DEPS="satooshi/php-coveralls"
+    - LEGACY_DEPS="phpunit/phpunit"
     - SITE_URL: https://zendframework.github.io/zend-mvc
     - GH_USER_NAME: "Matthew Weier O'Phinney"
     - GH_USER_EMAIL: [email protected]
@@ -30,12 +33,12 @@ matrix:
     - php: 5.6
       env:
         - DEPS=locked
-        - TEST_COVERAGE=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"
     - php: 5.6
       env:
         - DEPS=latest
+        - TEST_COVERAGE=true
     - php: 7
       env:
         - DEPS=lowest
@@ -67,24 +70,17 @@ matrix:
   allow_failures:
     - php: hhvm
 
-env:
-  global:
-    - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
-
-notifications:
-  irc: "irc.freenode.org#zftalk.dev"
-  email: false
-
 before_install:
   - travis_retry composer self-update
   - if [[ $TRAVIS_PHP_VERSION != "hhvm" && $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini ; 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 --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 ; 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
+  - composer show
 
 script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
@@ -96,3 +92,11 @@ after_script:
 
 after_success:
   - if [[ $DEPLOY_DOCS == "true" ]]; then ./zf-mkdoc-theme/deploy.sh ; fi
+
+notifications:
+  email: false
+  slack:
+    rooms:
+      - secure: "Izby0l/9kitKgdtpNsG4wpz1dENiAlBx6BTv54woOue+DB0XPpGV2kRs7Ta0u0neR3Spy1TjAIwQxtWp4SBPRyr99TAvjBmhrV8EHzdQvo3OosHP8VjXCyNTUbI5QhSW9I0UovQ+/Sd5CIQbckVLBs/YTp7MC9LhV/dBxRBM0GIO8EfkTtr7v1qYNmr6rVPGndco8zJUOSB/snSoLt/g2hk8WykAw7FaVpB/OdnAVmzy8rMRAYdqeZZjXdxoHebXF+osVvoBUgbdp2czGiv4jAGOWpRCqA6N4XaYWjqdL0kNCLvO/+LwGeinw2qAiHpm5g4xLhtpCC1mQNqnAOkVWZB9KnGjNcT9KfKD/6NO7AvQd+9LkTNII1+MAHhiwGwr2/JfXuepGuOVx/Jjto5PfZtZKBTCJb64JvacGNY3xY9n0yMpqS6rnSLW/5APq6HV0ufuu/nDDVLP5rJ4g//LHXepLC187QOkRcFfUfeVTscIpGLY8GrZY770XWLkFsR5VpAgBE40jRkqKtl/A7E2wJQ+mQ5YR6WP3vxzZFvnTC9Ut7WZo3RSZRwkwwvSdixydw739Afn/iywznpY1KUifgC2tqyI+dV0dra06hVsA579FDsZtCNHIXadSs/OMGUgoccdVNwlngN5Gxj28I1NugXeh2YGgTanJY0EFgg+Bsg="
+    on_success: change
+    on_failure: always

.travis.yml

@@ -77,24 +77,24 @@ To do so:
 
 ## Running Coding Standards Checks
 
-This component uses [php-cs-fixer](http://cs.sensiolabs.org/) for coding
+This component uses [phpcs](https://github.com/squizlabs/PHP_CodeSniffer) for coding
 standards checks, and provides configuration for our selected checks.
-`php-cs-fixer` is installed by default via Composer.
+`phpcs` is installed by default via Composer.
 
 To run checks only:
 
 ```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --dry-run --config-file=.php_cs
+$ composer cs-check
 ```
 
-To have `php-cs-fixer` attempt to fix problems for you, omit the `--dry-run`
-flag:
+`phpcs` also includes a tool for fixing most CS violations, `phpcbf`:
+
 
 ```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --config-file=.php_cs
+$ composer cs-fix
 ```
 
-If you allow php-cs-fixer to fix CS issues, please re-run the tests to ensure
+If you allow `phpcbf` to fix CS issues, please re-run the tests to ensure
 they pass, and make sure you add and commit the changes after verification.
 
 ## Recommended Workflow for Contributions

CONTRIBUTING.md

@@ -13,21 +13,21 @@
         }
     },
     "require": {
+        "container-interop/container-interop": "^1.1",
         "php": "^5.6 || ^7.0",
         "zendframework/zend-eventmanager": "^3.0",
         "zendframework/zend-http": "^2.5.4",
         "zendframework/zend-modulemanager": "^2.7.1",
         "zendframework/zend-router": "^3.0.1",
         "zendframework/zend-servicemanager": "^3.0.3",
         "zendframework/zend-stdlib": "^3.0",
-        "zendframework/zend-view": "^2.6.7",
-        "container-interop/container-interop": "^1.1"
+        "zendframework/zend-view": "^2.6.7"
     },
     "require-dev": {
+        "phpunit/phpunit": "^6.0.7 || ^5.7.14",
+        "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-json": "^2.6.1 || ^3.0",
-        "zendframework/zend-psr7bridge": "^0.2",
-        "fabpot/php-cs-fixer": "1.7.*",
-        "phpunit/phpunit": "^4.5"
+        "zendframework/zend-psr7bridge": "^0.2"
     },
     "suggest": {
         "zendframework/zend-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable",
@@ -40,6 +40,9 @@
         "zendframework/zend-psr7bridge": "(^0.2) To consume PSR-7 middleware within the MVC workflow",
         "zendframework/zend-servicemanager-di": "zend-servicemanager-di provides utilities for integrating zend-di and zend-servicemanager in your zend-mvc application"
     },
+    "config": {
+        "sort-packages": true
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "3.0-dev",
@@ -49,17 +52,20 @@
     "autoload-dev": {
         "psr-4": {
             "ZendTest\\Mvc\\": "test/"
-        }
+        },
+        "files": [
+            "test/_autoload.php"
+        ]
     },
     "scripts": {
         "check": [
             "@cs-check",
             "@test"
         ],
-        "upload-coverage": "coveralls -v",
-        "cs-check": "php-cs-fixer --version && php-cs-fixer fix -v --diff --dry-run",
-        "cs-fix": "php-cs-fixer fix -v",
-        "test": "phpunit",
-        "test-coverage": "phpunit --coverage-clover clover.xml"
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
+        "test": "phpunit --colors=always",
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
+        "upload-coverage": "coveralls -v"
     }
 }