Code optimisations for PHP8 (#45)

Author: GromNaN

src/Psr6Store.php

@@ -60,7 +60,7 @@ class Psr6Store implements Psr6StoreInterface, ClearableInterface
     private string $hashAlgorithm;
 
     /**
-     * When creating a Psr6Store you can configure a number options.
+     * When creating a Psr6Store you can configure a number of options.
      * See the README for a list of all available options and their description.
      */
     public function __construct(array $options = [])
@@ -100,7 +100,7 @@ public function __construct(array $options = [])
         $this->options = $resolver->resolve($options);
         $this->cache = $this->options['cache'];
         $this->lockFactory = $this->options['lock_factory'];
-        $this->hashAlgorithm = version_compare(PHP_VERSION, '8.1.0', '>=') ? 'xxh128' : 'sha256';
+        $this->hashAlgorithm = \PHP_VERSION_ID >= 80100 ? 'xxh128' : 'sha256';
     }
 
     public function lookup(Request $request): ?Response
@@ -227,7 +227,7 @@ public function unlock(Request $request): bool
 
         try {
             $this->locks[$cacheKey]->release();
-        } catch (LockReleasingException $e) {
+        } catch (LockReleasingException) {
             return false;
         } finally {
             unset($this->locks[$cacheKey]);
@@ -260,7 +260,7 @@ public function cleanup(): void
             foreach ($this->locks as $lock) {
                 $lock->release();
             }
-        } catch (LockReleasingException $e) {
+        } catch (LockReleasingException) {
             // noop
         } finally {
             $this->locks = [];
@@ -281,7 +281,7 @@ public function invalidateTags(array $tags): bool
 
         try {
             return $this->cache->invalidateTags($tags);
-        } catch (CacheInvalidArgumentException $e) {
+        } catch (CacheInvalidArgumentException) {
             return false;
         }
     }
@@ -508,13 +508,13 @@ private function restoreResponse(array $cacheData): ?Response
 
         // BC
         if (\is_string($value)) {
-            $value = ['expires' => 0, 'contents' => $value];
+            $value = ['contents' => $value];
         }
 
         if ($this->isBinaryFileResponseContentDigest($cacheData['headers']['x-content-digest'][0])) {
             try {
                 $file = new File($value['contents']);
-            } catch (FileNotFoundException $e) {
+            } catch (FileNotFoundException) {
                 return null;
             }
 
@@ -542,7 +542,7 @@ private function getDefaultLockStore(string $cacheDir): PersistingStoreInterface
     {
         try {
             return new SemaphoreStore();
-        } catch (LockInvalidArgumentException $exception) {
+        } catch (LockInvalidArgumentException) {
             return new FlockStore($cacheDir);
         }
     }

tests/Psr6StoreTest.php

@@ -33,10 +33,7 @@
 
 class Psr6StoreTest extends TestCase
 {
-    /**
-     * @var Psr6Store
-     */
-    private $store;
+    private Psr6Store $store;
 
     protected function setUp(): void
     {
@@ -334,7 +331,7 @@ public function testRegularCacheKey(): void
     {
         $request = Request::create('https://foobar.com/');
         $expected = 'md'.hash(
-            version_compare(PHP_VERSION, '8.1.0', '>=')
+            \PHP_VERSION_ID >= 80100
                 ? 'xxh128'
                 : 'sha256',
             'foobar.com/'
@@ -381,7 +378,7 @@ public function testRegularLookup(): void
         $this->assertSame('whatever', $result->headers->get('Foobar'));
 
         $this->assertSame(
-            version_compare(PHP_VERSION, '8.1.0', '>=')
+            \PHP_VERSION_ID >= 80100
                 ? 'endf8d09e93f874900a99b8775cc15b6c7' // xxh128
                 : 'enb94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9' // sha256
         , $result->headers->get('X-Content-Digest'));
@@ -535,7 +532,7 @@ public function testLookupWithMultipleVaryResponse(): void
         $result = $this->store->lookup($request);
         $this->assertNull($result);
 
-        // Should return null because header provided but non matching content
+        // Should return null because header provided but non-matching content
         $request = Request::create('https://foobar.com/');
         $request->headers->set('Accept', 'application/xml');
         $result = $this->store->lookup($request);
@@ -862,20 +859,20 @@ public function testContentDigestExpiresCorrectly(array $responseHeaders, $expec
             ->withConsecutive(
                 [
                     // content digest
-                    version_compare(PHP_VERSION, '8.1.0', '>=')
+                    \PHP_VERSION_ID >= 80100
                         ? 'en3c9e102628997f44ac87b0b131c6992d' // xxh128
                         : 'enc3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2' // sha256
                 ],
                 [
                     // meta
-                    version_compare(PHP_VERSION, '8.1.0', '>=')
+                    \PHP_VERSION_ID >= 80100
                         ? 'md0d10c3ce367c3309e789ed924fa6b183' // xxh128
                         : 'md390aa862a7f27c16d72dd40967066969e7eb4b102c6215478a275766bf046665' // sha256
                 ],
                 [Psr6Store::COUNTER_KEY], // write counter
                 [
                     // meta again
-                    version_compare(PHP_VERSION, '8.1.0', '>=')
+                    \PHP_VERSION_ID >= 80100
                         ? 'md0d10c3ce367c3309e789ed924fa6b183' // xxh128
                         : 'md390aa862a7f27c16d72dd40967066969e7eb4b102c6215478a275766bf046665' // sha256
                 ]