Merge 1f2e3f7 into a5828b3

zendframework · Nov 28, 2018 · 3ce3357 · 3ce3357
2 parents a5828b3 + 1f2e3f7
commit 3ce3357
Show file tree

Hide file tree

Showing 159 changed files with 4,845 additions and 2,732 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,59 +13,40 @@ env:
 
 matrix:
   include:
-    - php: 5.6
-      env:
-        - DEPS=lowest
-    - php: 5.6
-      env:
-        - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit"
-    - php: 5.6
-      env:
-        - DEPS=latest
-    - php: 7
-      env:
-        - DEPS=lowest
-    - php: 7
-      env:
-        - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit"
-    - php: 7
-      env:
-        - DEPS=latest
-    - php: 7.1
+    - php: 7.2
       env:
         - DEPS=lowest
-    - php: 7.1
+    - php: 7.2
       env:
         - DEPS=locked
         - CS_CHECK=true
         - TEST_COVERAGE=true
-    - php: 7.1
+        - STATIC_ANALYSIS=true
+    - php: 7.2
       env:
         - DEPS=latest
-    - php: 7.2
+    - php: 7.3
       env:
         - DEPS=lowest
-    - php: 7.2
+    - php: 7.3
       env:
         - DEPS=locked
-    - php: 7.2
+    - php: 7.3
       env:
         - DEPS=latest
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
 
 install:
-  - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
-  - if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
+  - travis_retry composer install $COMPOSER_ARGS
   - 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 [[ $STATIC_ANALYSIS == 'true' ]]; then composer analyse ; fi
   - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
   - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
 

diff --git a/composer.json b/composer.json
@@ -16,21 +16,23 @@
         "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
-        "php": "^5.6 || ^7.0",
-        "zendframework/zend-stdlib": "^3.0"
+        "php": "^7.2",
+        "zendframework/zend-stdlib": "^3.2.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
+        "phpspec/prophecy": "^1.7.5",
+        "phpstan/phpstan": "^0.10.5",
+        "phpunit/phpunit": "^7.4.4",
         "zendframework/zend-coding-standard": "~1.0.0",
-        "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-        "zendframework/zend-serializer": "^2.6.1",
-        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+        "zendframework/zend-eventmanager": "^3.2.1",
+        "zendframework/zend-modulemanager": "^2.8",
+        "zendframework/zend-serializer": "^2.9",
+        "zendframework/zend-servicemanager": "^3.3.2"
     },
     "suggest": {
-        "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage",
-        "zendframework/zend-filter": "^2.6, to support naming strategy hydrator usage",
-        "zendframework/zend-serializer": "^2.6.1, to use the SerializableStrategy",
-        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage"
+        "zendframework/zend-eventmanager": "^3.2, to support aggregate hydrator usage",
+        "zendframework/zend-serializer": "^2.9, to use the SerializableStrategy",
+        "zendframework/zend-servicemanager": "^3.3, to support hydrator plugin manager usage"
     },
     "autoload": {
         "psr-4": {
@@ -58,6 +60,7 @@
         }
     },
     "scripts": {
+        "analyse": "phpstan analyse --no-progress",
         "check": [
             "@cs-check",
             "@test"