[Cache] Stop defaulting to igbinary in DefaultMarshaller

Martijn Croonen · Martijn Croonen · commit 49247618f08f · 2024-07-10T21:15:44.000+02:00
igbinary used to be a drop in replacement for PHP's `serialize` but recent changes to the handling of uninitialized properties in `serialize` have not made it into igbinary, so it no longer is. Fixes #52391
diff --git a/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php b/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php
@@ -25,9 +25,8 @@ class DefaultMarshaller implements MarshallerInterface
 
     public function __construct(?bool $useIgbinarySerialize = null, bool $throwOnSerializationFailure = false)
     {
-        if (null === $useIgbinarySerialize) {
-            $useIgbinarySerialize = \extension_loaded('igbinary') && version_compare('3.1.6', phpversion('igbinary'), '<=');
-        } elseif ($useIgbinarySerialize && (!\extension_loaded('igbinary') || version_compare('3.1.6', phpversion('igbinary'), '>'))) {
+        $useIgbinarySerialize = true === $useIgbinarySerialize;
+        if ($useIgbinarySerialize && (!\extension_loaded('igbinary') || version_compare('3.1.6', phpversion('igbinary'), '>'))) {
             throw new CacheException(\extension_loaded('igbinary') ? 'Please upgrade the "igbinary" PHP extension to v3.1.6 or higher.' : 'The "igbinary" PHP extension is not loaded.');
         }
         $this->useIgbinarySerialize = $useIgbinarySerialize;
diff --git a/src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php b/src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php
@@ -24,7 +24,27 @@ public function testSerialize()
             'b' => function () {},
         ];
 
-        $expected = ['a' => \extension_loaded('igbinary') && (version_compare('3.1.6', phpversion('igbinary'), '<=')) ? igbinary_serialize(123) : serialize(123)];
+        $expected = ['a' => serialize(123)];
+        $this->assertSame($expected, $marshaller->marshall($values, $failed));
+        $this->assertSame(['b'], $failed);
+    }
+
+    /**
+     * @requires extension igbinary
+     */
+    public function testIgBinarySerialize()
+    {
+        if (version_compare('3.1.6', phpversion('igbinary'), '>')) {
+            $this->markTestSkipped('igbinary needs to be v3.1.6 or higher.');
+        }
+
+        $marshaller = new DefaultMarshaller(true);
+        $values = [
+            'a' => 123,
+            'b' => function () {},
+        ];
+
+        $expected = ['a' => igbinary_serialize(123)];
         $this->assertSame($expected, $marshaller->marshall($values, $failed));
         $this->assertSame(['b'], $failed);
     }

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,8 @@ class DefaultMarshaller implements MarshallerInterface`
`25`	`25`
`26`	`26`	`public function __construct(?bool $useIgbinarySerialize = null, bool $throwOnSerializationFailure = false)`
`27`	`27`	`{`
`28`		`- if (null === $useIgbinarySerialize) {`
`29`		`- $useIgbinarySerialize = \extension_loaded('igbinary') && version_compare('3.1.6', phpversion('igbinary'), '<=');`
`30`		`- } elseif ($useIgbinarySerialize && (!\extension_loaded('igbinary') \|\| version_compare('3.1.6', phpversion('igbinary'), '>'))) {`
	`28`	`+ $useIgbinarySerialize = true === $useIgbinarySerialize;`
	`29`	`+ if ($useIgbinarySerialize && (!\extension_loaded('igbinary') \|\| version_compare('3.1.6', phpversion('igbinary'), '>'))) {`
`31`	`30`	`throw new CacheException(\extension_loaded('igbinary') ? 'Please upgrade the "igbinary" PHP extension to v3.1.6 or higher.' : 'The "igbinary" PHP extension is not loaded.');`
`32`	`31`	`}`
`33`	`32`	`$this->useIgbinarySerialize = $useIgbinarySerialize;`