Full psr-15 support, php 7.1 as minimum

snapshotpl · snapshotpl · commit c363f19a0151 · 2019-06-19T16:31:56.000+02:00
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -3,7 +3,7 @@ checks:
 build:
     environment:
         php:
-            version: 5.6.16
+            version: 7.3
     tests:
         override:
             -
diff --git a/.travis.yml b/.travis.yml
@@ -1,18 +1,16 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
   - 7.1
   - 7.2
+  - 7.3
 
 env:
   - DEPS=lowest
   - DEPS=latest
 
 before_script:
   - phpenv config-rm xdebug.ini
-  - composer self-update
   - if [[ $DEPS == 'lowest' ]]; then composer update --prefer-stable --no-interaction --prefer-lowest ; fi
   - if [[ $DEPS == 'latest' ]]; then composer update --prefer-stable --no-interaction ; fi
 
diff --git a/README.md b/README.md
@@ -11,12 +11,8 @@ This middleware provide framework-agnostic possibility to generate and add to re
 
 ## Installation
 
-```json
-{
-    "require": {
-        "php-middleware/request-id": "^3.0.0"
-    }
-}
+```bash
+composer require php-middleware/request-id
 ```
 
 ## Usage
diff --git a/composer.json b/composer.json
@@ -10,15 +10,15 @@
         "request-id"
     ],
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.1",
         "psr/http-message": "^1.0",
-        "php-middleware/double-pass-compatibility": "^1.0",
-        "http-interop/http-middleware": "^0.4.1"
+        "psr/http-server-handler": "^1.0",
+        "psr/http-server-middleware": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.27 || ^6.1.3",
         "ramsey/uuid": "^3.0",
-        "zendframework/zend-diactoros": "^1.1.3"
+        "zendframework/zend-diactoros": "^2.0",
+        "phpunit/phpunit": "^7.5.13"
     },
     "suggest": {
         "ramsey/uuid": "To use Ramsey\\Uuid 3.0 generator"
diff --git a/src/Generator/GeneratorInterface.php b/src/Generator/GeneratorInterface.php
@@ -4,8 +4,5 @@
 
 interface GeneratorInterface
 {
-    /**
-     * @return string unique value
-     */
-    public function generateRequestId();
+    public function generateRequestId(): string;
 }
diff --git a/src/Generator/Md5Generator.php b/src/Generator/Md5Generator.php
@@ -11,7 +11,7 @@ public function __construct(GeneratorInterface $generator)
         $this->generator = $generator;
     }
 
-    public function generateRequestId()
+    public function generateRequestId(): string
     {
         return md5($this->generator->generateRequestId());
     }
diff --git a/src/Generator/PhpUniqidGenerator.php b/src/Generator/PhpUniqidGenerator.php
@@ -4,32 +4,19 @@
 
 final class PhpUniqidGenerator implements GeneratorInterface
 {
-    /**
-     * @var string
-     */
     protected $prefix;
-
-    /**
-     * @var bool
-     */
     protected $moreEntropy;
 
     /**
-     * @param string $prefix
-     * @param bool $moreEntropy
-     *
      * @link http://php.net/manual/en/function.uniqid.php
      */
-    public function __construct($prefix = '', $moreEntropy = false)
+    public function __construct(string $prefix = '', bool $moreEntropy = false)
     {
-        $this->prefix = (string) $prefix;
-        $this->moreEntropy = (bool) $moreEntropy;
+        $this->prefix = $prefix;
+        $this->moreEntropy = $moreEntropy;
     }
 
-    /**
-     * @return string
-     */
-    public function generateRequestId()
+    public function generateRequestId(): string
     {
         return uniqid($this->prefix, $this->moreEntropy);
     }
diff --git a/src/Generator/PrefixedGenerator.php b/src/Generator/PrefixedGenerator.php
@@ -7,20 +7,13 @@ final class PrefixedGenerator implements GeneratorInterface
     private $prefix;
     private $generator;
 
-    /**
-     * @param string $prefix
-     * @param GeneratorInterface $generator
-     */
-    public function __construct($prefix, GeneratorInterface $generator)
+    public function __construct(string $prefix, GeneratorInterface $generator)
     {
-        $this->prefix = (string) $prefix;
+        $this->prefix = $prefix;
         $this->generator = $generator;
     }
 
-    /**
-     * @return string
-     */
-    public function generateRequestId()
+    public function generateRequestId(): string
     {
         return $this->prefix . $this->generator->generateRequestId();
     }
diff --git a/src/Generator/RamseyUuid1Generator.php b/src/Generator/RamseyUuid1Generator.php
@@ -7,27 +7,20 @@
 final class RamseyUuid1Generator implements GeneratorInterface
 {
     private $node;
-
     private $clockSeq;
-
     private $factory;
 
     /**
-     * @param UuidFactoryInterface $factory
      * @param int|string $node
-     * @param int $clockSeq
      */
-    public function __construct(UuidFactoryInterface $factory, $node = null, $clockSeq = null)
+    public function __construct(UuidFactoryInterface $factory, $node = null, int $clockSeq = null)
     {
         $this->factory = $factory;
         $this->node = $node;
         $this->clockSeq = $clockSeq;
     }
 
-    /**
-     * @return string
-     */
-    public function generateRequestId()
+    public function generateRequestId(): string
     {
         return $this->factory->uuid1($this->node, $this->clockSeq)->toString();
     }
diff --git a/src/Generator/RamseyUuid3Generator.php b/src/Generator/RamseyUuid3Generator.php
@@ -7,27 +7,17 @@
 final class RamseyUuid3Generator implements GeneratorInterface
 {
     private $ns;
-
     private $name;
-
     private $factory;
 
-    /**
-     * @param UuidFactoryInterface $factory
-     * @param string $ns
-     * @param string $name
-     */
-    public function __construct(UuidFactoryInterface $factory, $ns, $name)
+    public function __construct(UuidFactoryInterface $factory, string $ns, string $name)
     {
         $this->factory = $factory;
         $this->ns = $ns;
         $this->name = $name;
     }
 
-    /**
-     * @return string
-     */
-    public function generateRequestId()
+    public function generateRequestId(): string
     {
         return $this->factory->uuid3($this->ns, $this->name)->toString();
     }
diff --git a/src/Generator/RamseyUuid4Generator.php b/src/Generator/RamseyUuid4Generator.php
@@ -13,10 +13,7 @@ public function __construct(UuidFactoryInterface $factory)
         $this->factory = $factory;
     }
 
-    /**
-     * @return string
-     */
-    public function generateRequestId()
+    public function generateRequestId(): string
     {
         return $this->factory->uuid4()->toString();
     }
diff --git a/src/Generator/RamseyUuid4StaticGenerator.php b/src/Generator/RamseyUuid4StaticGenerator.php
@@ -6,10 +6,7 @@
 
 final class RamseyUuid4StaticGenerator implements GeneratorInterface
 {
-    /**
-     * @return string
-     */
-    public function generateRequestId()
+    public function generateRequestId(): string
     {
         return Uuid::uuid4()->toString();
     }
diff --git a/src/Generator/RamseyUuid5Generator.php b/src/Generator/RamseyUuid5Generator.php
@@ -7,27 +7,17 @@
 final class RamseyUuid5Generator implements GeneratorInterface
 {
     private $ns;
-
     private $name;
-
     private $factory;
 
-    /**
-     * @param UuidFactoryInterface $factory
-     * @param string $ns
-     * @param string $name
-     */
-    public function __construct(UuidFactoryInterface $factory, $ns, $name)
+    public function __construct(UuidFactoryInterface $factory, string $ns, string $name)
     {
         $this->factory = $factory;
         $this->ns = $ns;
         $this->name = $name;
     }
 
-    /**
-     * @return string
-     */
-    public function generateRequestId()
+    public function generateRequestId(): string
     {
         return $this->factory->uuid5($this->ns, $this->name)->toString();
     }
diff --git a/src/MonologProcessor.php b/src/MonologProcessor.php
@@ -15,7 +15,7 @@ public function __construct(RequestIdProviderInterface $requestIdProvider)
         $this->requestIdProvider = $requestIdProvider;
     }
 
-    public function __invoke(array $record)
+    public function __invoke(array $record): array
     {
         try {
             $requestId = $this->requestIdProvider->getRequestId();
diff --git a/src/OverridePolicy/OverridePolicyInterface.php b/src/OverridePolicy/OverridePolicyInterface.php
@@ -6,5 +6,5 @@
 
 interface OverridePolicyInterface
 {
-    public function isAllowToOverride(ServerRequestInterface $request);
+    public function isAllowToOverride(ServerRequestInterface $request): bool;
 }
diff --git a/src/RequestDecorator.php b/src/RequestDecorator.php
@@ -9,20 +9,16 @@ final class RequestDecorator
     protected $requestIdProvider;
     protected $headerName;
 
-    public function __construct(RequestIdProviderInterface $requestIdProvider, $headerName = RequestIdMiddleware::DEFAULT_RESPONSE_HEADER)
+    public function __construct(RequestIdProviderInterface $requestIdProvider, string $headerName = RequestIdMiddleware::DEFAULT_RESPONSE_HEADER)
     {
         $this->requestIdProvider = $requestIdProvider;
         $this->headerName = $headerName;
     }
 
     /**
      * Adds request id to request and return new instance
-     *
-     * @param RequestInterface $request
-     *
-     * @return RequestInterface
      */
-    public function decorate(RequestInterface $request)
+    public function decorate(RequestInterface $request): RequestInterface
     {
         return $request->withHeader($this->headerName, $this->requestIdProvider->getRequestId());
     }
diff --git a/src/RequestIdMiddleware.php b/src/RequestIdMiddleware.php
diff --git a/src/RequestIdProvider.php b/src/RequestIdProvider.php
diff --git a/src/RequestIdProviderFactory.php b/src/RequestIdProviderFactory.php
diff --git a/src/RequestIdProviderFactoryInterface.php b/src/RequestIdProviderFactoryInterface.php
diff --git a/src/RequestIdProviderInterface.php b/src/RequestIdProviderInterface.php
diff --git a/test/RequestIdMiddlewareTest.php b/test/RequestIdMiddlewareTest.php
diff --git a/test/RequestIdProviderTest.php b/test/RequestIdProviderTest.php

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ checks:`
`3`	`3`	`build:`
`4`	`4`	`environment:`
`5`	`5`	`php:`
`6`		`- version: 5.6.16`
	`6`	`+ version: 7.3`
`7`	`7`	`tests:`
`8`	`8`	`override:`
`9`	`9`	`-`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,5 @@`
`4`	`4`
`5`	`5`	`interface GeneratorInterface`
`6`	`6`	`{`
`7`		`- /**`
`8`		`- * @return string unique value`
`9`		`- */`
`10`		`- public function generateRequestId();`
	`7`	`+ public function generateRequestId(): string;`
`11`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public function __construct(GeneratorInterface $generator)`
`11`	`11`	`$this->generator = $generator;`
`12`	`12`	`}`
`13`	`13`
`14`		`- public function generateRequestId()`
	`14`	`+ public function generateRequestId(): string`
`15`	`15`	`{`
`16`	`16`	`return md5($this->generator->generateRequestId());`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,20 +7,13 @@ final class PrefixedGenerator implements GeneratorInterface`
`7`	`7`	`private $prefix;`
`8`	`8`	`private $generator;`
`9`	`9`
`10`		`- /**`
`11`		`- * @param string $prefix`
`12`		`- * @param GeneratorInterface $generator`
`13`		`- */`
`14`		`- public function __construct($prefix, GeneratorInterface $generator)`
	`10`	`+ public function __construct(string $prefix, GeneratorInterface $generator)`
`15`	`11`	`{`
`16`		`- $this->prefix = (string) $prefix;`
	`12`	`+ $this->prefix = $prefix;`
`17`	`13`	`$this->generator = $generator;`
`18`	`14`	`}`
`19`	`15`
`20`		`- /**`
`21`		`- * @return string`
`22`		`- */`
`23`		`- public function generateRequestId()`
	`16`	`+ public function generateRequestId(): string`
`24`	`17`	`{`
`25`	`18`	`return $this->prefix . $this->generator->generateRequestId();`
`26`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,27 +7,20 @@`
`7`	`7`	`final class RamseyUuid1Generator implements GeneratorInterface`
`8`	`8`	`{`
`9`	`9`	`private $node;`
`10`		`-`
`11`	`10`	`private $clockSeq;`
`12`		`-`
`13`	`11`	`private $factory;`
`14`	`12`
`15`	`13`	`/**`
`16`		`- * @param UuidFactoryInterface $factory`
`17`	`14`	`* @param int\|string $node`
`18`		`- * @param int $clockSeq`
`19`	`15`	`*/`
`20`		`- public function __construct(UuidFactoryInterface $factory, $node = null, $clockSeq = null)`
	`16`	`+ public function __construct(UuidFactoryInterface $factory, $node = null, int $clockSeq = null)`
`21`	`17`	`{`
`22`	`18`	`$this->factory = $factory;`
`23`	`19`	`$this->node = $node;`
`24`	`20`	`$this->clockSeq = $clockSeq;`
`25`	`21`	`}`
`26`	`22`
`27`		`- /**`
`28`		`- * @return string`
`29`		`- */`
`30`		`- public function generateRequestId()`
	`23`	`+ public function generateRequestId(): string`
`31`	`24`	`{`
`32`	`25`	`return $this->factory->uuid1($this->node, $this->clockSeq)->toString();`
`33`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,27 +7,17 @@`
`7`	`7`	`final class RamseyUuid3Generator implements GeneratorInterface`
`8`	`8`	`{`
`9`	`9`	`private $ns;`
`10`		`-`
`11`	`10`	`private $name;`
`12`		`-`
`13`	`11`	`private $factory;`
`14`	`12`
`15`		`- /**`
`16`		`- * @param UuidFactoryInterface $factory`
`17`		`- * @param string $ns`
`18`		`- * @param string $name`
`19`		`- */`
`20`		`- public function __construct(UuidFactoryInterface $factory, $ns, $name)`
	`13`	`+ public function __construct(UuidFactoryInterface $factory, string $ns, string $name)`
`21`	`14`	`{`
`22`	`15`	`$this->factory = $factory;`
`23`	`16`	`$this->ns = $ns;`
`24`	`17`	`$this->name = $name;`
`25`	`18`	`}`
`26`	`19`
`27`		`- /**`
`28`		`- * @return string`
`29`		`- */`
`30`		`- public function generateRequestId()`
	`20`	`+ public function generateRequestId(): string`
`31`	`21`	`{`
`32`	`22`	`return $this->factory->uuid3($this->ns, $this->name)->toString();`
`33`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,7 @@ public function __construct(UuidFactoryInterface $factory)`
`13`	`13`	`$this->factory = $factory;`
`14`	`14`	`}`
`15`	`15`
`16`		`- /**`
`17`		`- * @return string`
`18`		`- */`
`19`		`- public function generateRequestId()`
	`16`	`+ public function generateRequestId(): string`
`20`	`17`	`{`
`21`	`18`	`return $this->factory->uuid4()->toString();`
`22`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,7 @@`
`6`	`6`
`7`	`7`	`final class RamseyUuid4StaticGenerator implements GeneratorInterface`
`8`	`8`	`{`
`9`		`- /**`
`10`		`- * @return string`
`11`		`- */`
`12`		`- public function generateRequestId()`
	`9`	`+ public function generateRequestId(): string`
`13`	`10`	`{`
`14`	`11`	`return Uuid::uuid4()->toString();`
`15`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,27 +7,17 @@`
`7`	`7`	`final class RamseyUuid5Generator implements GeneratorInterface`
`8`	`8`	`{`
`9`	`9`	`private $ns;`
`10`		`-`
`11`	`10`	`private $name;`
`12`		`-`
`13`	`11`	`private $factory;`
`14`	`12`
`15`		`- /**`
`16`		`- * @param UuidFactoryInterface $factory`
`17`		`- * @param string $ns`
`18`		`- * @param string $name`
`19`		`- */`
`20`		`- public function __construct(UuidFactoryInterface $factory, $ns, $name)`
	`13`	`+ public function __construct(UuidFactoryInterface $factory, string $ns, string $name)`
`21`	`14`	`{`
`22`	`15`	`$this->factory = $factory;`
`23`	`16`	`$this->ns = $ns;`
`24`	`17`	`$this->name = $name;`
`25`	`18`	`}`
`26`	`19`
`27`		`- /**`
`28`		`- * @return string`
`29`		`- */`
`30`		`- public function generateRequestId()`
	`20`	`+ public function generateRequestId(): string`
`31`	`21`	`{`
`32`	`22`	`return $this->factory->uuid5($this->ns, $this->name)->toString();`
`33`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public function __construct(RequestIdProviderInterface $requestIdProvider)`
`15`	`15`	`$this->requestIdProvider = $requestIdProvider;`
`16`	`16`	`}`
`17`	`17`
`18`		`- public function __invoke(array $record)`
	`18`	`+ public function __invoke(array $record): array`
`19`	`19`	`{`
`20`	`20`	`try {`
`21`	`21`	`$requestId = $this->requestIdProvider->getRequestId();`