symfony
diff --git a/‎src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
+4-13 b/‎src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
+4-13
diff --git a/‎src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
-1 b/‎src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
-1
diff --git a/‎src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php
+17 b/‎src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php
+17
diff --git a/‎src/Symfony/Component/Cache/Tests/Adapter/ArrayAdapterTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Adapter/ArrayAdapterTest.php
-13 b/‎src/Symfony/Component/Cache/Tests/Adapter/ArrayAdapterTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Adapter/ArrayAdapterTest.php
-13
diff --git a/‎src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php
+1 b/‎src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php
+1
@@ -101,19 +101,10 @@ protected function doSave(array $values, int $lifetime): array|bool
             return $failed;
         }
 
-        try {
-            if (false === $failures = apcu_store($values, null, $lifetime)) {
-                $failures = $values;
-            }
-
-            return array_keys($failures);
-        } catch (\Throwable $e) {
-            if (1 === \count($values)) {
-                // Workaround https://github.com/krakjoe/apcu/issues/170
-                apcu_delete(array_key_first($values));
-            }
-
-            throw $e;
+        if (false === $failures = apcu_store($values, null, $lifetime)) {
+            $failures = $values;
         }
+
+        return array_keys($failures);
     }
 }
@@ -312,7 +312,6 @@ private function freeze($value, string $key): string|int|float|bool|array|\UnitE
             try {
                 $serialized = serialize($value);
             } catch (\Exception $e) {
-                unset($this->values[$key], $this->expiries[$key], $this->tags[$key]);
                 $type = get_debug_type($value);
                 $message = sprintf('Failed to save key "{key}" of type %s: %s', $type, $e->getMessage());
                 CacheItem::log($this->logger, $message, ['key' => $key, 'exception' => $e, 'cache-adapter' => get_debug_type($this)]);
 
@@ -352,6 +352,23 @@ public function testNumericKeysWorkAfterMemoryLeakPrevention()
 
         $this->assertEquals('value-50', $cache->getItem((string) 50)->get());
     }
+
+    public function testErrorsDontInvalidate()
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
+        }
+
+        $cache = $this->createCachePool(0, __FUNCTION__);
+
+        $item = $cache->getItem('foo');
+        $this->assertTrue($cache->save($item->set('bar')));
+        $this->assertTrue($cache->hasItem('foo'));
+
+        $item->set(static fn () => null);
+        $this->assertFalse($cache->save($item));
+        $this->assertSame('bar', $cache->getItem('foo')->get());
+    }
 }
 
 class NotUnserializable
 
@@ -102,17 +102,4 @@ public function testEnum()
 
         $this->assertSame(TestEnum::Foo, $cache->getItem('foo')->get());
     }
-
-    public function testExpiryCleanupOnError()
-    {
-        $cache = new ArrayAdapter();
-
-        $item = $cache->getItem('foo');
-        $this->assertTrue($cache->save($item->set('bar')));
-        $this->assertTrue($cache->hasItem('foo'));
-
-        $item->set(static fn () => null);
-        $this->assertFalse($cache->save($item));
-        $this->assertFalse($cache->hasItem('foo'));
-    }
 }
@@ -42,6 +42,7 @@ class PhpArrayAdapterTest extends AdapterTestCase
         'testSaveDeferredWhenChangingValues' => 'PhpArrayAdapter is read-only.',
         'testSaveDeferredOverwrite' => 'PhpArrayAdapter is read-only.',
         'testIsHitDeferred' => 'PhpArrayAdapter is read-only.',
+        'testErrorsDontInvalidate' => 'PhpArrayAdapter is read-only.',
 
         'testExpiresAt' => 'PhpArrayAdapter does not support expiration.',
         'testExpiresAtWithNull' => 'PhpArrayAdapter does not support expiration.',
Original file line number	Diff line number	Diff line change
`@@ -101,19 +101,10 @@ protected function doSave(array $values, int $lifetime): array\|bool`
`101`	`101`	`return $failed;`
`102`	`102`	`}`
`103`	`103`
`104`		`- try {`
`105`		`- if (false === $failures = apcu_store($values, null, $lifetime)) {`
`106`		`- $failures = $values;`
`107`		`- }`
`108`		`-`
`109`		`- return array_keys($failures);`
`110`		`- } catch (\Throwable $e) {`
`111`		`- if (1 === \count($values)) {`
`112`		`- // Workaround https://github.com/krakjoe/apcu/issues/170`
`113`		`- apcu_delete(array_key_first($values));`
`114`		`- }`
`115`		`-`
`116`		`- throw $e;`
	`104`	`+ if (false === $failures = apcu_store($values, null, $lifetime)) {`
	`105`	`+ $failures = $values;`
`117`	`106`	`}`
	`107`	`+`
	`108`	`+ return array_keys($failures);`
`118`	`109`	`}`
`119`	`110`	`}`