bug #1183 Fix for PHP <7.4 compatibility (fracsi)

This PR was squashed before being merged into the 2.x branch. Discussion ---------- Fix for PHP <7.4 compatibility Follow up for #1174 Fixes #1182 Arrow functions are introduced in php 7.4 as well. Commits ------- 6d985be Fix for PHP <7.4 compatibility
lexik · Dec 8, 2023 · a4df695 · a4df695
2 parents 3df8317 + 6d985be
commit a4df695
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/Command/EnableEncryptionConfigCommand.php b/Command/EnableEncryptionConfigCommand.php
@@ -86,12 +86,20 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $algorithms = $this->algorithmManagerFactory->all();
         $availableKeyEncryptionAlgorithms = array_map(
-            static fn (Algorithm $algorithm): string => $algorithm->name(),
-            array_filter($algorithms, static fn (Algorithm $algorithm): bool => ($algorithm instanceof KeyEncryptionAlgorithm && $algorithm->name() !== 'dir'))
+            static function (Algorithm $algorithm): string {
+                return $algorithm->name();
+            },
+            array_filter($algorithms, static function (Algorithm $algorithm): bool {
+                return ($algorithm instanceof KeyEncryptionAlgorithm && $algorithm->name() !== 'dir');
+            })
         );
         $availableContentEncryptionAlgorithms = array_map(
-            static fn (Algorithm $algorithm): string => $algorithm->name(),
-            array_filter($algorithms, static fn (Algorithm $algorithm): bool => $algorithm instanceof ContentEncryptionAlgorithm)
+            static function (Algorithm $algorithm): string {
+                return $algorithm->name();
+            },
+            array_filter($algorithms, static function (Algorithm $algorithm): bool {
+                return $algorithm instanceof ContentEncryptionAlgorithm;
+            })
         );
 
         $keyEncryptionAlgorithmAlias = $io->choice('Key Encryption Algorithm', $availableKeyEncryptionAlgorithms);
@@ -215,7 +223,7 @@ private function checkRequirements(): void
             JWEBuilder::class => 'web-token/jwt-encryption',
         ];
         if ($this->algorithmManagerFactory === null) {
-            throw new \RuntimeException(sprintf('The package "web-token/jwt-bundle" is missing. Please install it for using this migration tool.', $requirement));
+            throw new \RuntimeException('The package "web-token/jwt-bundle" is missing. Please install it for using this migration tool.');
         }
         foreach (array_keys($requirements) as $requirement) {
             if (!class_exists($requirement)) {

diff --git a/Security/Http/Cookie/JWTCookieProvider.php b/Security/Http/Cookie/JWTCookieProvider.php
@@ -75,7 +75,7 @@ public function createCookie(string $jwt, ?string $name = null, $expiresAt = nul
             $httpOnly ?: $this->defaultHttpOnly,
             false,
             $sameSite ?: $this->defaultSameSite,
-            $partitioned ?: $this->defaultPartitioned,
+            $partitioned ?: $this->defaultPartitioned
         );
     }
 }