Merge remote-tracking branch 'origin/AC-9499' into Hammer_PlatForm_Health_247Beta3_03Jan23

glo71317 · glo71317 · commit 77d36bdf8a8d · 2024-01-22T12:01:07.000+05:30
diff --git a/composer.json b/composer.json
@@ -87,7 +87,7 @@
         "symfony/string": "^6.4",
         "tedivm/jshrink": "^1.4",
         "tubalmartin/cssmin": "^4.1",
-        "web-token/jwt-framework": "^3.1, <3.2.9",
+        "web-token/jwt-framework": "^3.1",
         "webonyx/graphql-php": "^15.0",
         "wikimedia/less.php": "^3.2"
     },
diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/integration/testsuite/Magento/JwtFrameworkAdapter/Model/JwsManagerTest.php b/dev/tests/integration/testsuite/Magento/JwtFrameworkAdapter/Model/JwsManagerTest.php
@@ -21,7 +21,7 @@ protected function setUp(): void
 
     public function testCreatingJwsWithAlgorithmSetInHeadersDirectly(): void
     {
-        $secret = "ZXF1YXRpb24tS2VudHVja3ktY29udGludWVkLWRpZmZlcmVuY2U=";
+        $secret = "ZXF1YXRpb24tS2VudHVja3ktY29udGludWVkLWRpZmZlcmVuY2U";
         $payload = json_encode([
             'MyCustomClaim' => 'some value', // not important at all
             'nbf' => time(),

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ protected function setUp(): void`
`21`	`21`
`22`	`22`	`public function testCreatingJwsWithAlgorithmSetInHeadersDirectly(): void`
`23`	`23`	`{`
`24`		`- $secret = "ZXF1YXRpb24tS2VudHVja3ktY29udGludWVkLWRpZmZlcmVuY2U=";`
	`24`	`+ $secret = "ZXF1YXRpb24tS2VudHVja3ktY29udGludWVkLWRpZmZlcmVuY2U";`
`25`	`25`	`$payload = json_encode([`
`26`	`26`	`'MyCustomClaim' => 'some value', // not important at all`
`27`	`27`	`'nbf' => time(),`