Merge pull request #25 from gsteel/PHP-8.3

Add support for PHP 8.3
mezzio · Dec 12, 2023 · 68f0821 · 68f0821
2 parents 7c9e50d + 3541f7b
commit 68f0821
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 42 deletions.
diff --git a/composer.json b/composer.json
@@ -35,16 +35,16 @@
         }
     },
     "require": {
-        "php": "~8.1.0 || ~8.2.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
         "mezzio/mezzio-session": "^1.0",
         "psr/container": "^1.0 || ^2.0",
         "psr/http-server-middleware": "^1.0"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.5.0",
-        "mezzio/mezzio-flash": "^1.6",
-        "phpunit/phpunit": "^10.1.3",
-        "vimeo/psalm": "^5.11"
+        "mezzio/mezzio-flash": "^1.8",
+        "phpunit/phpunit": "^10.5.2",
+        "vimeo/psalm": "^5.17"
     },
     "conflict": {
         "zendframework/zend-expressive-csrf": "*"

diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.8.0@9cf4f60a333f779ad3bc704a555920e81d4fdcda">
+<files psalm-version="5.17.0@c620f6e80d0abfca532b00bda366062aaedf6e5d">
   <file src="test/ConfigProviderTest.php">
     <RedundantCondition>
       <code>assertIsArray</code>

diff --git a/test/FlashCsrfGuardTest.php b/test/FlashCsrfGuardTest.php
@@ -45,7 +45,7 @@ public function testGenerateTokenStoresTokenInFlashAndReturnsIt(string $keyName)
             );
 
         $token = $this->guard->generateToken($keyName);
-        $this->assertSame((string) $expected, $token);
+        $this->assertSame($expected, $token);
     }
 
     public static function tokenValidationProvider(): array