bug #35428 [Cache] fix checking for igbinary availability (nicolas-grekas)

fabpot · fabpot · commit a1eb0d3c440e · 2020-01-22T10:38:05.000+01:00
This PR was merged into the 4.3 branch. Discussion ---------- [Cache] fix checking for igbinary availability | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - As reported by @andrerom in a2c924d#r36427445 Commits ------- 09818e9 [Cache] fix checking for igbinary availability
diff --git a/.travis.yml b/.travis.yml
@@ -172,7 +172,7 @@ before_install:
 
           tfold ext.apcu tpecl apcu-5.1.17 apcu.so $INI
           tfold ext.mongodb tpecl mongodb-1.6.0alpha1 mongodb.so $INI
-          tfold ext.igbinary tpecl igbinary-2.0.8 igbinary.so $INI
+          tfold ext.igbinary tpecl igbinary-3.1.2 igbinary.so $INI
           tfold ext.zookeeper tpecl zookeeper-0.7.1 zookeeper.so $INI
           tfold ext.amqp tpecl amqp-1.9.4 amqp.so $INI
           tfold ext.redis tpecl redis-4.3.0 redis.so $INI "no"
diff --git a/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php b/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php
@@ -25,9 +25,9 @@ class DefaultMarshaller implements MarshallerInterface
     public function __construct(bool $useIgbinarySerialize = null)
     {
         if (null === $useIgbinarySerialize) {
-            $useIgbinarySerialize = \extension_loaded('igbinary') && \PHP_VERSION_ID < 70400;
-        } elseif ($useIgbinarySerialize && (!\extension_loaded('igbinary') || \PHP_VERSION_ID >= 70400)) {
-            throw new CacheException('The "igbinary" PHP extension is not '.(\PHP_VERSION_ID >= 70400 ? 'compatible with PHP 7.4.' : 'loaded.'));
+            $useIgbinarySerialize = \extension_loaded('igbinary') && (\PHP_VERSION_ID < 70400 || version_compare('3.1.0', phpversion('igbinary'), '<='));
+        } elseif ($useIgbinarySerialize && (!\extension_loaded('igbinary') || (\PHP_VERSION_ID >= 70400 && version_compare('3.1.0', phpversion('igbinary'), '>')))) {
+            throw new CacheException(\extension_loaded('igbinary') && \PHP_VERSION_ID >= 70400 ? 'Please upgrade the "igbinary" PHP extension to v3.1 or higher.' : 'The "igbinary" PHP extension is not loaded.');
         }
         $this->useIgbinarySerialize = $useIgbinarySerialize;
     }
@@ -66,7 +66,7 @@ public function unmarshall(string $value)
             return null;
         }
         static $igbinaryNull;
-        if ($value === ($igbinaryNull ?? $igbinaryNull = \extension_loaded('igbinary') && \PHP_VERSION_ID < 70400 ? igbinary_serialize(null) : false)) {
+        if ($value === ($igbinaryNull ?? $igbinaryNull = \extension_loaded('igbinary') && (\PHP_VERSION_ID < 70400 || version_compare('3.1.0', phpversion('igbinary'), '<=')) ? igbinary_serialize(null) : false)) {
             return null;
         }
         $unserializeCallbackHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');
diff --git a/src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php b/src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php
@@ -24,7 +24,7 @@ public function testSerialize()
             'b' => function () {},
         ];
 
-        $expected = ['a' => \extension_loaded('igbinary') && \PHP_VERSION_ID < 70400 ? igbinary_serialize(123) : serialize(123)];
+        $expected = ['a' => \extension_loaded('igbinary') && (\PHP_VERSION_ID < 70400 || version_compare('3.1.0', phpversion('igbinary'), '<=')) ? igbinary_serialize(123) : serialize(123)];
         $this->assertSame($expected, $marshaller->marshall($values, $failed));
         $this->assertSame(['b'], $failed);
     }
@@ -43,7 +43,7 @@ public function testNativeUnserialize()
      */
     public function testIgbinaryUnserialize()
     {
-        if (\PHP_VERSION_ID >= 70400) {
+        if (\PHP_VERSION_ID >= 70400 && version_compare('3.1.0', phpversion('igbinary'), '>')) {
             $this->markTestSkipped('igbinary is not compatible with PHP 7.4.');
         }
 
@@ -67,7 +67,7 @@ public function testNativeUnserializeNotFoundClass()
      */
     public function testIgbinaryUnserializeNotFoundClass()
     {
-        if (\PHP_VERSION_ID >= 70400) {
+        if (\PHP_VERSION_ID >= 70400 && version_compare('3.1.0', phpversion('igbinary'), '>')) {
             $this->markTestSkipped('igbinary is not compatible with PHP 7.4.');
         }
 
@@ -95,7 +95,7 @@ public function testNativeUnserializeInvalid()
      */
     public function testIgbinaryUnserializeInvalid()
     {
-        if (\PHP_VERSION_ID >= 70400) {
+        if (\PHP_VERSION_ID >= 70400 && version_compare('3.1.0', phpversion('igbinary'), '>')) {
             $this->markTestSkipped('igbinary is not compatible with PHP 7.4.');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@ class DefaultMarshaller implements MarshallerInterface`
`25`	`25`	`public function __construct(bool $useIgbinarySerialize = null)`
`26`	`26`	`{`
`27`	`27`	`if (null === $useIgbinarySerialize) {`
`28`		`- $useIgbinarySerialize = \extension_loaded('igbinary') && \PHP_VERSION_ID < 70400;`
`29`		`- } elseif ($useIgbinarySerialize && (!\extension_loaded('igbinary') \|\| \PHP_VERSION_ID >= 70400)) {`
`30`		`- throw new CacheException('The "igbinary" PHP extension is not '.(\PHP_VERSION_ID >= 70400 ? 'compatible with PHP 7.4.' : 'loaded.'));`
	`28`	`+ $useIgbinarySerialize = \extension_loaded('igbinary') && (\PHP_VERSION_ID < 70400 \|\| version_compare('3.1.0', phpversion('igbinary'), '<='));`
	`29`	`+ } elseif ($useIgbinarySerialize && (!\extension_loaded('igbinary') \|\| (\PHP_VERSION_ID >= 70400 && version_compare('3.1.0', phpversion('igbinary'), '>')))) {`
	`30`	`+ throw new CacheException(\extension_loaded('igbinary') && \PHP_VERSION_ID >= 70400 ? 'Please upgrade the "igbinary" PHP extension to v3.1 or higher.' : 'The "igbinary" PHP extension is not loaded.');`
`31`	`31`	`}`
`32`	`32`	`$this->useIgbinarySerialize = $useIgbinarySerialize;`
`33`	`33`	`}`
`@@ -66,7 +66,7 @@ public function unmarshall(string $value)`
`66`	`66`	`return null;`
`67`	`67`	`}`
`68`	`68`	`static $igbinaryNull;`
`69`		`- if ($value === ($igbinaryNull ?? $igbinaryNull = \extension_loaded('igbinary') && \PHP_VERSION_ID < 70400 ? igbinary_serialize(null) : false)) {`
	`69`	`+ if ($value === ($igbinaryNull ?? $igbinaryNull = \extension_loaded('igbinary') && (\PHP_VERSION_ID < 70400 \|\| version_compare('3.1.0', phpversion('igbinary'), '<=')) ? igbinary_serialize(null) : false)) {`
`70`	`70`	`return null;`
`71`	`71`	`}`
`72`	`72`	`$unserializeCallbackHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function testSerialize()`
`24`	`24`	`'b' => function () {},`
`25`	`25`	`];`
`26`	`26`
`27`		`- $expected = ['a' => \extension_loaded('igbinary') && \PHP_VERSION_ID < 70400 ? igbinary_serialize(123) : serialize(123)];`
	`27`	`+ $expected = ['a' => \extension_loaded('igbinary') && (\PHP_VERSION_ID < 70400 \|\| version_compare('3.1.0', phpversion('igbinary'), '<=')) ? igbinary_serialize(123) : serialize(123)];`
`28`	`28`	`$this->assertSame($expected, $marshaller->marshall($values, $failed));`
`29`	`29`	`$this->assertSame(['b'], $failed);`
`30`	`30`	`}`
`43`	`43`	`*/`
`44`	`44`	`public function testIgbinaryUnserialize()`
`45`	`45`	`{`
`46`		`- if (\PHP_VERSION_ID >= 70400) {`
	`46`	`+ if (\PHP_VERSION_ID >= 70400 && version_compare('3.1.0', phpversion('igbinary'), '>')) {`
`47`	`47`	`$this->markTestSkipped('igbinary is not compatible with PHP 7.4.');`
`48`	`48`	`}`
`49`	`49`
`@@ -67,7 +67,7 @@ public function testNativeUnserializeNotFoundClass()`
`67`	`67`	`*/`
`68`	`68`	`public function testIgbinaryUnserializeNotFoundClass()`
`69`	`69`	`{`
`70`		`- if (\PHP_VERSION_ID >= 70400) {`
	`70`	`+ if (\PHP_VERSION_ID >= 70400 && version_compare('3.1.0', phpversion('igbinary'), '>')) {`
`71`	`71`	`$this->markTestSkipped('igbinary is not compatible with PHP 7.4.');`
`72`	`72`	`}`
`73`	`73`
`@@ -95,7 +95,7 @@ public function testNativeUnserializeInvalid()`
`95`	`95`	`*/`
`96`	`96`	`public function testIgbinaryUnserializeInvalid()`
`97`	`97`	`{`
`98`		`- if (\PHP_VERSION_ID >= 70400) {`
	`98`	`+ if (\PHP_VERSION_ID >= 70400 && version_compare('3.1.0', phpversion('igbinary'), '>')) {`
`99`	`99`	`$this->markTestSkipped('igbinary is not compatible with PHP 7.4.');`
`100`	`100`	`}`
`101`	`101`