PHP version support (#8)

snapshotpl · web-flow · commit 4df69aebe937 · 2017-10-03T14:27:33.000+02:00
PHP version support
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 .idea
 composer.lock
 vendor
-data
+data
diff --git a/.travis.yml b/.travis.yml
@@ -3,12 +3,6 @@ language: php
 matrix:
   fast_finish: true
   include:
-    - php: 5.5
-      env:
-        - DEPS=lowest
-    - php: 5.5
-      env:
-        - DEPS=latest
     - php: 5.6
       env:
         - DEPS=lowest
@@ -21,17 +15,22 @@ matrix:
     - php: 7
       env:
         - DEPS=latest
-    - php: hhvm
+    - php: 7.1
+      env:
+        - DEPS=lowest
+    - php: 7.1
+      env:
+        - DEPS=latest
+    - php: 7.2
       env:
         - DEPS=lowest
-    - php: hhvm
+    - php: 7.2
       env:
         - DEPS=latest
 
 install:
-  - if [[ $DEPS == 'latest' ]]; then travis_retry composer update --no-interaction --prefer-source ; fi
-  - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --no-interaction --prefer-source --prefer-lowest ; fi
-  - composer info -i
+  - if [[ $DEPS == 'latest' ]]; then travis_retry composer update --no-interaction ; fi
+  - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --no-interaction --prefer-lowest ; fi
 
 script:
   - ./vendor/bin/phpunit
diff --git a/Module.php b/Module.php
diff --git a/composer.json b/composer.json
@@ -1,19 +1,19 @@
 {
   "name": "rstgroup/request-id-module",
   "require": {
-    "php": ">=5.5",
-    "zendframework/zend-modulemanager": "^2.4",
+    "php": ">=5.6",
     "zendframework/zend-eventmanager": "^2.4 || ^3",
     "zendframework/zend-http": "^2.4",
     "zendframework/zend-mvc": "^2.4 || ^3",
     "zendframework/zend-servicemanager": "^2.4 || ^3",
     "zendframework/zend-stdlib": "^2.4 || ^3",
-    "zendframework/zend-psr7bridge": "^0.2",
-    "php-middleware/request-id": "^3.0.0"
+    "zendframework/zend-psr7bridge": "^1.0",
+    "php-middleware/request-id": "^3.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^4.8",
-    "zendframework/zend-config": "^2.4",
+    "phpunit/phpunit": "^5.7.22",
+    "zendframework/zend-modulemanager": "^2.4",
+    "zendframework/zend-config": "^2.4 | ^3.0",
     "zendframework/zend-i18n": "^2.4",
     "zendframework/zend-log": "^2.4",
     "zendframework/zend-serializer": "^2.4",
diff --git a/src/Module.php b/src/Module.php
@@ -2,9 +2,7 @@
 
 namespace RstGroup\RequestIdModule;
 
-use Zend\ModuleManager\Feature\ConfigProviderInterface;
-
-final class Module implements ConfigProviderInterface
+final class Module
 {
     /**
      * @return array
@@ -13,4 +11,4 @@ public function getConfig()
     {
         return include __DIR__ . '/../config/module.config.php';
     }
-}
+}

-Original file line number
+Diff line change
@@ @@ -1,4 +1,4 @@ @@
 .idea
 composer.lock
 vendor
 -data
 +data
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace RstGroup\RequestIdModule;`
`4`	`4`
`5`		`-use Zend\ModuleManager\Feature\ConfigProviderInterface;`
`6`		`-`
`7`		`-final class Module implements ConfigProviderInterface`
	`5`	`+final class Module`
`8`	`6`	`{`
`9`	`7`	`/**`
`10`	`8`	`* @return array`
`@@ -13,4 +11,4 @@ public function getConfig()`
`13`	`11`	`{`
`14`	`12`	`return include __DIR__ . '/../config/module.config.php';`
`15`	`13`	`}`
`16`		`-}`
	`14`	`+}`