diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.3' into 4.4 

* 4.3:
  [Cache] Disable igbinary on PHP >= 7.4
This commit is contained in:
Nicolas Grekas 2019-11-17 12:01:12 +01:00
parent 88cf8a7d48 479efc54f3
commit 0c12b9e31b
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php
View File

@ -25,9 +25,9 @@ class DefaultMarshaller implements MarshallerInterface
public function __construct(bool $useIgbinarySerialize = null) public function __construct(bool $useIgbinarySerialize = null)
{ {
if (null === $useIgbinarySerialize) { if (null === $useIgbinarySerialize) {
$useIgbinarySerialize = \extension_loaded('igbinary') && \PHP_VERSION_ID !== 70400; $useIgbinarySerialize = \extension_loaded('igbinary') && \PHP_VERSION_ID < 70400;
} elseif ($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.')); throw new CacheException('The "igbinary" PHP extension is not '.(\PHP_VERSION_ID >= 70400 ? 'compatible with PHP 7.4.' : 'loaded.'));
} }
$this->useIgbinarySerialize = $useIgbinarySerialize; $this->useIgbinarySerialize = $useIgbinarySerialize;
} }
@ -66,7 +66,7 @@ class DefaultMarshaller implements MarshallerInterface
return null; return null;
} }
static $igbinaryNull; 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; return null;
} }
$unserializeCallbackHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback'); $unserializeCallbackHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');

14
src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php
View File

@ -24,7 +24,7 @@ class DefaultMarshallerTest extends TestCase
'b' => function () {}, '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($expected, $marshaller->marshall($values, $failed));
$this->assertSame(['b'], $failed); $this->assertSame(['b'], $failed);
} }
@ -43,8 +43,8 @@ class DefaultMarshallerTest extends TestCase
*/ */
public function testIgbinaryUnserialize() public function testIgbinaryUnserialize()
{ {
if (\PHP_VERSION_ID === 70400) { if (\PHP_VERSION_ID >= 70400) {
$this->markTestSkipped('igbinary is not compatible with PHP 7.4.0.'); $this->markTestSkipped('igbinary is not compatible with PHP 7.4.');
} }
$marshaller = new DefaultMarshaller(); $marshaller = new DefaultMarshaller();
@ -67,8 +67,8 @@ class DefaultMarshallerTest extends TestCase
*/ */
public function testIgbinaryUnserializeNotFoundClass() public function testIgbinaryUnserializeNotFoundClass()
{ {
if (\PHP_VERSION_ID === 70400) { if (\PHP_VERSION_ID >= 70400) {
$this->markTestSkipped('igbinary is not compatible with PHP 7.4.0.'); $this->markTestSkipped('igbinary is not compatible with PHP 7.4.');
} }
$this->expectException('DomainException'); $this->expectException('DomainException');
@ -95,8 +95,8 @@ class DefaultMarshallerTest extends TestCase
*/ */
public function testIgbinaryUnserializeInvalid() public function testIgbinaryUnserializeInvalid()
{ {
if (\PHP_VERSION_ID === 70400) { if (\PHP_VERSION_ID >= 70400) {
$this->markTestSkipped('igbinary is not compatible with PHP 7.4.0'); $this->markTestSkipped('igbinary is not compatible with PHP 7.4.');
} }
$this->expectException('DomainException'); $this->expectException('DomainException');