Merge branch 'php74'

* php74: update phpstan add minimum req for zend-stlib to ^3.2.1 add php 7.4 support
samsonasik · Dec 1, 2019 · 4833d75 · 4833d75
2 parents eb179ad + b252f46
commit 4833d75
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,6 +14,18 @@ matrix:
     - php: 7.2
       env:
         - DEPS=latest
+    - php: 7.3
+      env:
+        - DEPS=lowest
+    - php: 7.3
+      env:
+        - DEPS=latest
+    - php: 7.4snapshot
+      env:
+        - DEPS=lowest
+    - php: 7.4snapshot
+      env:
+        - DEPS=latest
 
 before_script:
   - mkdir -p build/logs

diff --git a/composer.json b/composer.json
@@ -25,14 +25,15 @@
     "require": {
         "php": "^7.1",
         "zendframework/zend-http": "^2.6",
-        "zendframework/zend-json": "^3.0",
-        "zendframework/zend-servicemanager": "^3.3.0"
+        "zendframework/zend-json": "^3.1.2",
+        "zendframework/zend-servicemanager": "^3.3.0",
+        "zendframework/zend-stdlib": "^3.2.1"
     },
     "require-dev": {
         "guzzlehttp/guzzle": "^6.3",
         "kahlan/kahlan": "^4.0",
         "php-coveralls/php-coveralls": "^2.0",
-        "phpstan/phpstan": "^0.10",
+        "phpstan/phpstan": "^0.11.19",
         "symfony/yaml": "^3.2.7",
         "zendframework/zend-coding-standard": "^1.0"
     },