Merge pull request #557 from Slamdunk/lcobucci_clock_v3

Update `lcobucci/jwt` to ^4.3.0 and `lcobucci/clock` to v3
psr7-sessions · Jan 5, 2023 · e00f031 · e00f031
2 parents de81e55 + 9466a35
commit e00f031
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 82 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,8 +1,12 @@
-/test export-ignore
-/tools export-ignore
-/examples export-ignore
-.gitattributes export-ignore
-.gitignore export-ignore
-.scrutinizer.yml export-ignore
-.travis.yml export-ignore
-phpunit.xml.dist
+/.github                export-ignore
+/test                   export-ignore
+/tools                  export-ignore
+/examples               export-ignore
+/.gitattributes         export-ignore
+/.gitignore             export-ignore
+/composer.lock          export-ignore
+/infection.json.dist    export-ignore
+/phpcs.xml.dist         export-ignore
+/psalm.xml              export-ignore
+/phpunit.xml.dist       export-ignore
+/renovate.json          export-ignore
diff --git a/composer.json b/composer.json
@@ -24,8 +24,8 @@
         "php":                             "~8.1.0 || ~8.2.0",
         "ext-json":                        "*",
         "dflydev/fig-cookies":             "^3.0.0",
-        "lcobucci/jwt":                    "^4.2.1",
-        "lcobucci/clock":                  "^2.3.0",
+        "lcobucci/jwt":                    "^4.3.0",
+        "lcobucci/clock":                  "^3.0.0",
         "psr/http-message":                "^1.0.1",
         "psr/http-server-handler":         "^1.0.1",
         "psr/http-server-middleware":      "^1.0.1"

diff --git a/composer.lock b/composer.lock
diff --git a/test/StoragelessTest/Http/SessionMiddlewareTest.php b/test/StoragelessTest/Http/SessionMiddlewareTest.php
@@ -236,7 +236,10 @@ public function testWillIgnoreRequestsWithNonPlainTokens(): void
     {
         $unknownTokenType = $this->createMock(Token::class);
         $fakeParser       = $this->createMock(ParserInterface::class);
-        $configuration    = Configuration::forUnsecuredSigner();
+        $configuration    = Configuration::forSymmetricSigner(
+            new Sha256(),
+            self::makeRandomSymmetricKey(),
+        );
 
         $fakeParser->expects(self::atLeastOnce())
             ->method('parse')
@@ -285,7 +288,10 @@ public function testWillIgnoreRequestsWithTokensFromFuture(callable $middlewareF
     public function testWillIgnoreUnSignedTokens(callable $middlewareFactory): void
     {
         $middleware    = $middlewareFactory();
-        $configuration = Configuration::forUnsecuredSigner();
+        $configuration = Configuration::forSymmetricSigner(
+            new Sha256(),
+            self::makeRandomSymmetricKey(),
+        );
         $unsignedToken = (new ServerRequest())
             ->withCookieParams([
                 SessionMiddleware::DEFAULT_COOKIE => $configuration->builder()