Merge pull request #33 from WyriHaximus/update-code-to-1.0

Update code to be compatible with react/http 1.0

Author: WyriHaximus

composer.json

@@ -13,10 +13,11 @@
         "hansott/psr7-cookies": "^2.0 || ^1.0",
         "psr/http-message": "^1.0",
         "react/cache": "^0.5.0 || ^0.6.0 || ^1.0.0",
-        "react/http": "^1.0.0",
+        "react/http": "^1.0 || ^0.8",
         "react/promise": "^2.7"
     },
     "require-dev": {
+        "thecodingmachine/safe": "^0.1 || ^1.0",
         "wyrihaximus/async-test-utilities": "^1.1"
     },
     "config": {

composer.lock

@@ -3,8 +3,10 @@ parameters:
 		- '#Constructor in [a-zA-Z0-9\\_]+ has parameter \$[a-zA-Z0-9_]+ with default value.#'
 		- '#Method [a-zA-Z0-9\\_]+::[a-zA-Z0-9_]+\(\) has parameter \$[a-zA-Z0-9_]+ with a nullable type declaration.#'
 		- '#Method [a-zA-Z0-9\\_]+::[a-zA-Z0-9_]+\(\) has parameter \$[a-zA-Z0-9_]+ with null as default value.#'
+		- '#Array \(array<string, mixed>\) does not accept key int|string.#'
+		- '#In method \"WyriHaximus\\React\\Http\\Middleware\\SessionMiddleware::fetchSessionFromRequest\", caught \"Throwable\" must be rethrown.#'
 	classesAllowedToBeExtended:
 		- ApiClients\Tools\TestUtilities\TestCase
 
 includes:
-	- vendor/wyrihaximus/async-test-utilities/rules.neon
+	- vendor/wyrihaximus/async-test-utilities/rules.neon

phpstan.neon

@@ -10,7 +10,7 @@ final class Session
     private $id;
 
     /**
-     * @var array
+     * @var array<string, mixed>
      */
     private $contents;
 
@@ -30,9 +30,9 @@ final class Session
     private $status = \PHP_SESSION_NONE;
 
     /**
-     * @param string             $id
-     * @param array              $contents
-     * @param SessionIdInterface $sessionId
+     * @param string               $id
+     * @param array<string, mixed> $contents
+     * @param SessionIdInterface   $sessionId
      */
     public function __construct(string $id, array $contents, SessionIdInterface $sessionId)
     {
@@ -54,15 +54,15 @@ public function getId(): string
     }
 
     /**
-     * @param array $contents
+     * @param array<string, mixed> $contents
      */
     public function setContents(array $contents): void
     {
         $this->contents = $contents;
     }
 
     /**
-     * @return array
+     * @return array<string, mixed>
      */
     public function getContents(): array
     {
@@ -123,6 +123,9 @@ public function regenerate(): bool
         return true;
     }
 
+    /**
+     * @return array<string, mixed>
+     */
     public function toArray(): array
     {
         return [
@@ -134,14 +137,14 @@ public function toArray(): array
     }
 
     /**
-     * @param  array                     $session
+     * @param  array<string, mixed>      $session
      * @param  bool                      $clone
      * @throws \InvalidArgumentException
      * @return Session
      */
     public function fromArray(array $session, bool $clone = true): self
     {
-        if (!isset($session['id']) || !isset($session['contents']) || !isset($session['oldIds']) || !isset($session['status'])) {
+        if (!\array_key_exists('id', $session) || !\array_key_exists('contents', $session) || !\array_key_exists('oldIds', $session) || !\array_key_exists('status', $session)) {
             throw new \InvalidArgumentException('Session array most contain "id", "contents", "oldIds", and "status".');
         }
 

src/Session.php

@@ -47,7 +47,7 @@ final class SessionMiddleware
     /**
      * @param string                  $cookieName
      * @param CacheInterface          $cache
-     * @param array                   $cookieParams
+     * @param array<int, mixed>       $cookieParams
      * @param SessionIdInterface|null $sessionId
      */
     public function __construct(
@@ -107,6 +107,7 @@ private function fetchSessionFromRequest(ServerRequestInterface $request): Promi
             });
         } catch (Throwable $et) {
             // Do nothing, only a not found will be thrown so generating our own id now
+            // @ignoreException
         }
 
         return resolve(new Session($id, [], $this->sessionId));

src/SessionMiddleware.php

@@ -9,11 +9,11 @@
 
 final class InspectableArrayCache implements CacheInterface
 {
-    /** @var array */
+    /** @var array<string, mixed|null> */
     private $data = [];
 
     /**
-     * @return array
+     * @return array<string, mixed|null>
      */
     public function getData(): array
     {
@@ -27,7 +27,7 @@ public function getData(): array
      */
     public function get($key, $default = null): PromiseInterface
     {
-        if (!isset($this->data[$key])) {
+        if (!\array_key_exists($key, $this->data)) {
             return resolve($default);
         }
 
@@ -67,7 +67,7 @@ public function getMultiple(array $keys, $default = null)
     {
         $items = [];
         foreach ($keys as $key) {
-            if (isset($this->data[$key])) {
+            if (!\array_key_exists($key, $this->data)) {
                 $items[$key] = $this->data[$key];
 
                 continue;
@@ -123,6 +123,6 @@ public function clear()
      */
     public function has($key)
     {
-        return resolve(isset($this->data[$key]));
+        return resolve(\array_key_exists($key, $this->data));
     }
 }

tests/InspectableArrayCache.php

@@ -28,7 +28,7 @@ public function testGenerate(int $size): void
         for ($i = 0; $i < 15; $i++) {
             $id = $randomBytes->generate();
             /** @var string $id */
-            $id = \hex2bin($id);
+            $id = \Safe\hex2bin($id);
             self::assertSame($size, \strlen($id));
         }
     }

tests/SessionId/RandomBytesTest.php

@@ -405,7 +405,7 @@ function () {
 
                 return [
                     $t,
-                    \sprintf(
+                    \Safe\sprintf(
                         '; expires=%s',
                         \gmdate('D, d-M-Y H:i:s T', \time() + $t)
                     ),
@@ -419,7 +419,7 @@ function () {
 
                 return [
                     $t,
-                    \sprintf(
+                    \Safe\sprintf(
                         '; expires=%s',
                         \gmdate('D, d-M-Y H:i:s T', \time() + $t)
                     ),
@@ -433,7 +433,7 @@ function () {
 
                 return [
                     $t,
-                    \sprintf(
+                    \Safe\sprintf(
                         '; expires=%s',
                         \gmdate('D, d-M-Y H:i:s T', \time() + $t)
                     ),

tests/SessionMiddlewareTest.php

@@ -177,6 +177,8 @@ public function provideSessionArrayWithMissingItems(): iterable
 
     /**
      * @dataProvider provideSessionArrayWithMissingItems
+     *
+     * @param array<string, string> $session
      */
     public function testFromArrayThrowsOnMissingElements(array $session): void
     {