From a2c924d77220011c5f5939579677d2a82b69a43d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sun, 17 Nov 2019 11:56:39 +0100
Subject: [PATCH] [Cache] Disable igbinary on PHP >= 7.4

---
 .../Cache/Marshaller/DefaultMarshaller.php         |  8 ++++----
 .../Tests/Marshaller/DefaultMarshallerTest.php     | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php b/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php
index 196fd625f1..8056090110 100644
--- 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.0.' : 'loaded.'));
+            $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.'));
         }
         $this->useIgbinarySerialize = $useIgbinarySerialize;
     }
@@ -66,7 +66,7 @@ class DefaultMarshaller implements MarshallerInterface
             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 ? 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
index 141291d6e4..cc94ad1523 100644
--- a/src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php
+++ b/src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php
@@ -24,7 +24,7 @@ class DefaultMarshallerTest extends TestCase
             '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 ? igbinary_serialize(123) : serialize(123)];
         $this->assertSame($expected, $marshaller->marshall($values, $failed));
         $this->assertSame(['b'], $failed);
     }
@@ -43,8 +43,8 @@ class DefaultMarshallerTest extends TestCase
      */
     public function testIgbinaryUnserialize()
     {
-        if (\PHP_VERSION_ID === 70400) {
-            $this->markTestSkipped('igbinary is not compatible with PHP 7.4.0.');
+        if (\PHP_VERSION_ID >= 70400) {
+            $this->markTestSkipped('igbinary is not compatible with PHP 7.4.');
         }
 
         $marshaller = new DefaultMarshaller();
@@ -67,8 +67,8 @@ class DefaultMarshallerTest extends TestCase
      */
     public function testIgbinaryUnserializeNotFoundClass()
     {
-        if (\PHP_VERSION_ID === 70400) {
-            $this->markTestSkipped('igbinary is not compatible with PHP 7.4.0.');
+        if (\PHP_VERSION_ID >= 70400) {
+            $this->markTestSkipped('igbinary is not compatible with PHP 7.4.');
         }
 
         $this->expectException('DomainException');
@@ -95,8 +95,8 @@ class DefaultMarshallerTest extends TestCase
      */
     public function testIgbinaryUnserializeInvalid()
     {
-        if (\PHP_VERSION_ID === 70400) {
-            $this->markTestSkipped('igbinary is not compatible with PHP 7.4.0');
+        if (\PHP_VERSION_ID >= 70400) {
+            $this->markTestSkipped('igbinary is not compatible with PHP 7.4.');
         }
 
         $this->expectException('DomainException');