minor #42719 [Cache] Fix tests (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 58c7f748b10f · 2021-08-25T10:19:56.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Cache] Fix tests | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - :crossed_fingers: Commits ------- 4807fbc Fix tests
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -51,7 +51,7 @@ static function ($key, $value, $isHit) {
                 // Detect wrapped values that encode for their expiry and creation duration
                 // For compactness, these values are packed in the key of an array using
                 // magic numbers in the form 9D-..-..-..-..-00-..-..-..-5F
-                if (\is_array($v) && 1 === \count($v) && 10 === \strlen($k = (string) key($v)) && "\x9D" === $k[0] && "\0" === $k[5] && "\x5F" === $k[9]) {
+                if (\is_array($v) && 1 === \count($v) && 10 === \strlen($k = (string) array_key_first($v)) && "\x9D" === $k[0] && "\0" === $k[5] && "\x5F" === $k[9]) {
                     $item->value = $v[$k];
                     $v = unpack('Ve/Nc', substr($k, 1, -1));
                     $item->metadata[CacheItem::METADATA_EXPIRY] = $v['e'] + CacheItem::METADATA_EXPIRY_OFFSET;
diff --git a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
@@ -59,7 +59,7 @@ static function ($key, $innerItem) use ($poolHash) {
                 // Detect wrapped values that encode for their expiry and creation duration
                 // For compactness, these values are packed in the key of an array using
                 // magic numbers in the form 9D-..-..-..-..-00-..-..-..-5F
-                if (\is_array($v) && 1 === \count($v) && 10 === \strlen($k = (string) key($v)) && "\x9D" === $k[0] && "\0" === $k[5] && "\x5F" === $k[9]) {
+                if (\is_array($v) && 1 === \count($v) && 10 === \strlen($k = (string) array_key_first($v)) && "\x9D" === $k[0] && "\0" === $k[5] && "\x5F" === $k[9]) {
                     $item->value = $v[$k];
                     $v = unpack('Ve/Nc', substr($k, 1, -1));
                     $item->metadata[CacheItem::METADATA_EXPIRY] = $v['e'] + CacheItem::METADATA_EXPIRY_OFFSET;
diff --git a/src/Symfony/Component/Cache/Traits/ApcuTrait.php b/src/Symfony/Component/Cache/Traits/ApcuTrait.php
@@ -112,7 +112,7 @@ protected function doSave(array $values, int $lifetime)
         } catch (\Throwable $e) {
             if (1 === \count($values)) {
                 // Workaround https://github.com/krakjoe/apcu/issues/170
-                apcu_delete(key($values));
+                apcu_delete(array_key_first($values));
             }
 
             throw $e;
diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json
@@ -25,6 +25,7 @@
         "psr/cache": "^1.0|^2.0",
         "psr/log": "^1|^2|^3",
         "symfony/cache-contracts": "^1.1.7|^2",
+        "symfony/polyfill-php73": "^1.9",
         "symfony/polyfill-php80": "^1.16",
         "symfony/service-contracts": "^1.1|^2",
         "symfony/var-exporter": "^4.2|^5.0"

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ protected function doSave(array $values, int $lifetime)`
`112`	`112`	`} catch (\Throwable $e) {`
`113`	`113`	`if (1 === \count($values)) {`
`114`	`114`	`// Workaround https://github.com/krakjoe/apcu/issues/170`
`115`		`- apcu_delete(key($values));`
	`115`	`+ apcu_delete(array_key_first($values));`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`throw $e;`