Moved Middle to PHP 7.1

jschreuder · Apr 3, 2017 · 8f7dd28 · 8f7dd28
1 parent 61ac27c
commit 8f7dd28
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 36 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,7 +1,7 @@
 build:
     environment:
         php:
-            version: 7.0.7
+            version: 7.1
     tests:
         override:
             -

diff --git a/README.rst b/README.rst
@@ -19,7 +19,7 @@ The implementations can be atomic in nature: just performing one task. Composing
 complex capabilities by choosing which simple middlewares you decorate or add
 to the stack. Also every component is NIH; PSR-1, PSR-2, PSR-3, PSR-4, PSR-7
 and forward compatible with PSR-15 & PSR-17 through HTTP-Interop; aimed at PHP
-7.0 or higher (probably 7.1+ once that's released).
+7.1.
 
 Check out the `Middle skeleton <https://github.com/jschreuder/Middle-skeleton>`_
 application to get an example setup running quickly.

diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
         "http-interop/http-factory": "^0.2"
     },
     "require-dev": {
-        "php": ">=7.0",
+        "php": ">=7.1",
         "phpspec/phpspec": "^3.0",
         "henrikbjorn/phpspec-code-coverage": "^3.0",
         "twig/twig": "^1.24",

diff --git a/src/Controller/RequestValidatorInterface.php b/src/Controller/RequestValidatorInterface.php
@@ -13,5 +13,5 @@ interface RequestValidatorInterface
      * @return  void
      * @throws  ValidationFailedException
      */
-    public function validateRequest(ServerRequestInterface $request);
+    public function validateRequest(ServerRequestInterface $request): void;
 }
diff --git a/src/Delegate.php b/src/Delegate.php
@@ -7,6 +7,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
+// @todo prevent calling ->process() twice
 final class Delegate implements DelegateInterface
 {
     /** @var  \SplStack */

diff --git a/src/Router/RouterInterface.php b/src/Router/RouterInterface.php
@@ -12,8 +12,7 @@ public function parseRequest(ServerRequestInterface $request): RouteMatchInterfa
     /** Returns UrlGenerator for reverse routing */
     public function getGenerator(): UrlGeneratorInterface;
 
-    /** @return  void */
-    public function registerRoutes(RoutingProviderInterface $routingProvider);
+    public function registerRoutes(RoutingProviderInterface $routingProvider): void;
 
     /** Generic method for adding routes with arbitrary or multiple methods */
     public function match(

diff --git a/src/Router/SymfonyRouter.php b/src/Router/SymfonyRouter.php
@@ -70,7 +70,7 @@ public function getGenerator(): UrlGeneratorInterface
     }
 
     /** @return  void */
-    public function registerRoutes(RoutingProviderInterface $routingProvider)
+    public function registerRoutes(RoutingProviderInterface $routingProvider): void
     {
         $routingProvider->registerRoutes($this);
     }

diff --git a/src/Session/JwtSessionProcessor.php b/src/Session/JwtSessionProcessor.php
@@ -102,8 +102,7 @@ public function processResponse(ServerRequestInterface $request, ResponseInterfa
         );
     }
 
-    /** @return  ?Token */
-    public function parseToken(ServerRequestInterface $request)
+    public function parseToken(ServerRequestInterface $request): ?Token
     {
         $cookies = $request->getCookieParams();
         $cookieName = $this->defaultCookie->getName();
@@ -128,7 +127,7 @@ public function parseToken(ServerRequestInterface $request)
     public function appendToken(
         SessionInterface $session,
         ResponseInterface $response,
-        Token $token = null
+        ?Token $token
     ): ResponseInterface
     {
         $sessionContainerChanged = $session->hasChanged();
@@ -182,7 +181,7 @@ private function getTokenCookie(SessionInterface $session): SetCookie
             ->withExpires($timestamp + $this->expirationTime);
     }
 
-    public function extractSessionContainer(Token $token = null): SessionInterface
+    public function extractSessionContainer(?Token $token): SessionInterface
     {
         try {
             if (is_null($token) || !$token->verify($this->signer, $this->verificationKey)) {

diff --git a/src/Session/Session.php b/src/Session/Session.php
@@ -47,7 +47,7 @@ public function get(string $key)
         return $this->sessionData[$key] ?? null;
     }
 
-    public function set(string $key, $value)
+    public function set(string $key, $value): void
     {
         $this->changed = true;
         $this->sessionData[$key] = $value;
@@ -63,7 +63,7 @@ public function getFlash(string $key)
         return $this->sessionData[self::FLASH_DATA_KEY_PREFIX . $key] ?? null;
     }
 
-    public function setFlash(string $key, $value)
+    public function setFlash(string $key, $value): void
     {
         $this->changed = true;
         $this->markFlashKey($key);
@@ -76,13 +76,13 @@ private function markFlashKey(string $key)
         $this->sessionData[self::FLASH_DATA_META_KEY][$key] = 1;
     }
 
-    public function destroy()
+    public function destroy(): void
     {
         $this->changed = true;
         $this->sessionData = [];
     }
 
-    public function rotateId()
+    public function rotateId(): void
     {
         $this->changed = true;
         // These sessions don't have an ID to change, but this should force overwrite

diff --git a/src/Session/SessionInterface.php b/src/Session/SessionInterface.php
@@ -9,22 +9,18 @@ public function has(string $key): bool;
     /** @return  mixed */
     public function get(string $key);
 
-    /** @return  void */
-    public function set(string $key, $value);
+    public function set(string $key, $value): void;
 
     public function hasFlash(string $key): bool;
 
     /** @return  mixed */
     public function getFlash(string $key);
 
-    /** @return  void */
-    public function setFlash(string $key, $value);
+    public function setFlash(string $key, $value): void;
 
-    /** @return  void */
-    public function destroy();
+    public function destroy(): void;
 
-    /** @return  void */
-    public function rotateId();
+    public function rotateId(): void;
 
     public function isEmpty(): bool;
 

diff --git a/src/Session/ZendSession.php b/src/Session/ZendSession.php
@@ -34,7 +34,7 @@ public function get(string $key)
     }
 
     /** @return  void */
-    public function set(string $key, $value)
+    public function set(string $key, $value): void
     {
         $this->changed = true;
         $this->container[$key] = $value;
@@ -51,7 +51,7 @@ public function getFlash(string $key)
     }
 
     /** @return  void */
-    public function setFlash(string $key, $value)
+    public function setFlash(string $key, $value): void
     {
         $key = self::FLASH_DATA_KEY_PREFIX . $key;
         $this->changed = true;
@@ -60,13 +60,13 @@ public function setFlash(string $key, $value)
     }
 
     /** @return  void */
-    public function destroy()
+    public function destroy(): void
     {
         $this->sessionManager->destroy();
     }
 
     /** @return  void */
-    public function rotateId()
+    public function rotateId(): void
     {
         $this->changed = true;
         $this->sessionManager->regenerateId();

diff --git a/src/Session/ZendSessionProcessor.php b/src/Session/ZendSessionProcessor.php
@@ -13,7 +13,7 @@ final class ZendSessionProcessor implements SessionProcessorInterface
     /** @var  ?ConfigInterface */
     private $zendSessionConfig;
 
-    public function __construct(ConfigInterface $zendSessionConfig = null)
+    public function __construct(?ConfigInterface $zendSessionConfig = null)
     {
         $this->zendSessionConfig = $zendSessionConfig;
     }

diff --git a/src/View/RedirectView.php b/src/View/RedirectView.php
@@ -35,7 +35,7 @@ public function getHeaders(): array
         return $this->headers;
     }
 
-    public function setHeader(string $key, string $value)
+    public function setHeader(string $key, string $value): void
     {
         $this->headers[$key] = $value;
     }
@@ -50,7 +50,7 @@ public function getParameters(): array
         return [];
     }
 
-    public function setParameter(string $key, $value)
+    public function setParameter(string $key, $value): void
     {
         throw new \RuntimeException('No parameters allowed on RedirectView');
     }

diff --git a/src/View/View.php b/src/View/View.php
@@ -45,7 +45,7 @@ public function getHeaders(): array
     }
 
     /** @return  void */
-    public function setHeader(string $key, string $value)
+    public function setHeader(string $key, string $value): void
     {
         $this->headers[$key] = $value;
     }
@@ -66,7 +66,7 @@ public function getParameters(): array
     }
 
     /** @return  void */
-    public function setParameter(string $key, $value)
+    public function setParameter(string $key, $value): void
     {
         $this->parameters[$key] = $value;
     }

diff --git a/src/View/ViewInterface.php b/src/View/ViewInterface.php
@@ -13,13 +13,11 @@ public function getContentType(): string;
 
     public function getHeaders(): array;
 
-    /** @return  void */
-    public function setHeader(string $key, string $value);
+    public function setHeader(string $key, string $value): void;
 
     public function getTemplate(): string;
 
     public function getParameters(): array;
 
-    /** @return  void */
-    public function setParameter(string $key, $value);
+    public function setParameter(string $key, $value): void;
 }