Merge pull request #11 from php-middleware/php72-support

snapshotpl · web-flow · commit 3936e46a3b53 · 2019-05-02T20:36:18.000+02:00
PHP 7.2 support
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
 
 env:
   - DEPS=lowest
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "http-interop/http-middleware": "^0.4.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.6 || ^6.1.3",
+        "phpunit/phpunit": "^5.7.27 || ^6.1.3",
         "ramsey/uuid": "^3.0",
         "zendframework/zend-diactoros": "^1.1.3"
     },
diff --git a/src/RequestIdMiddleware.php b/src/RequestIdMiddleware.php
@@ -7,6 +7,7 @@
 use PhpMiddleware\DoublePassCompatibilityTrait;
 use PhpMiddleware\RequestId\Exception\NotGenerated;
 use PhpMiddleware\RequestId\RequestIdProviderFactoryInterface;
+use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
@@ -60,7 +61,7 @@ public function process(ServerRequestInterface $request, DelegateInterface $dele
     }
 
     /**
-     * @return ResponseInterface
+     * @return RequestInterface
      */
     private function attachRequestIdToAttribute(ServerRequestInterface $request)
     {

-Original file line number
+Diff line change
   - 5.6
   - 7.0
   - 7.1
 +  - 7.2
 env:
   - DEPS=lowest
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`use PhpMiddleware\DoublePassCompatibilityTrait;`
`8`	`8`	`use PhpMiddleware\RequestId\Exception\NotGenerated;`
`9`	`9`	`use PhpMiddleware\RequestId\RequestIdProviderFactoryInterface;`
	`10`	`+use Psr\Http\Message\RequestInterface;`
`10`	`11`	`use Psr\Http\Message\ResponseInterface;`
`11`	`12`	`use Psr\Http\Message\ServerRequestInterface;`
`12`	`13`
`@@ -60,7 +61,7 @@ public function process(ServerRequestInterface $request, DelegateInterface $dele`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`/**`
`63`		`- * @return ResponseInterface`
	`64`	`+ * @return RequestInterface`
`64`	`65`	`*/`
`65`	`66`	`private function attachRequestIdToAttribute(ServerRequestInterface $request)`
`66`	`67`	`{`