[Cache] skip igbinary < 3.1.6
This commit is contained in:
parent
2f7751f0df
commit
065474c94f
@ -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 || 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.');
|
||||
$useIgbinarySerialize = \extension_loaded('igbinary') && (\PHP_VERSION_ID < 70400 || version_compare('3.1.6', phpversion('igbinary'), '<='));
|
||||
} elseif ($useIgbinarySerialize && (!\extension_loaded('igbinary') || (\PHP_VERSION_ID >= 70400 && version_compare('3.1.6', phpversion('igbinary'), '>')))) {
|
||||
throw new CacheException(\extension_loaded('igbinary') && \PHP_VERSION_ID >= 70400 ? 'Please upgrade the "igbinary" PHP extension to v3.1.6 or higher.' : 'The "igbinary" PHP extension is not 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 || version_compare('3.1.0', phpversion('igbinary'), '<=')) ? igbinary_serialize(null) : false)) {
|
||||
if ($value === ($igbinaryNull ?? $igbinaryNull = \extension_loaded('igbinary') ? igbinary_serialize(null) : false)) {
|
||||
return null;
|
||||
}
|
||||
$unserializeCallbackHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');
|
||||
|
@ -24,7 +24,7 @@ class DefaultMarshallerTest extends TestCase
|
||||
'b' => function () {},
|
||||
];
|
||||
|
||||
$expected = ['a' => \extension_loaded('igbinary') && (\PHP_VERSION_ID < 70400 || version_compare('3.1.0', phpversion('igbinary'), '<=')) ? igbinary_serialize(123) : serialize(123)];
|
||||
$expected = ['a' => \extension_loaded('igbinary') && (\PHP_VERSION_ID < 70400 || version_compare('3.1.6', phpversion('igbinary'), '<=')) ? igbinary_serialize(123) : serialize(123)];
|
||||
$this->assertSame($expected, $marshaller->marshall($values, $failed));
|
||||
$this->assertSame(['b'], $failed);
|
||||
}
|
||||
@ -43,7 +43,7 @@ class DefaultMarshallerTest extends TestCase
|
||||
*/
|
||||
public function testIgbinaryUnserialize()
|
||||
{
|
||||
if (\PHP_VERSION_ID >= 70400 && version_compare('3.1.0', phpversion('igbinary'), '>')) {
|
||||
if (\PHP_VERSION_ID >= 70400 && version_compare('3.1.6', phpversion('igbinary'), '>')) {
|
||||
$this->markTestSkipped('igbinary is not compatible with PHP 7.4.');
|
||||
}
|
||||
|
||||
@ -67,7 +67,7 @@ class DefaultMarshallerTest extends TestCase
|
||||
*/
|
||||
public function testIgbinaryUnserializeNotFoundClass()
|
||||
{
|
||||
if (\PHP_VERSION_ID >= 70400 && version_compare('3.1.0', phpversion('igbinary'), '>')) {
|
||||
if (\PHP_VERSION_ID >= 70400 && version_compare('3.1.6', phpversion('igbinary'), '>')) {
|
||||
$this->markTestSkipped('igbinary is not compatible with PHP 7.4.');
|
||||
}
|
||||
|
||||
@ -95,7 +95,7 @@ class DefaultMarshallerTest extends TestCase
|
||||
*/
|
||||
public function testIgbinaryUnserializeInvalid()
|
||||
{
|
||||
if (\PHP_VERSION_ID >= 70400 && version_compare('3.1.0', phpversion('igbinary'), '>')) {
|
||||
if (\PHP_VERSION_ID >= 70400 && version_compare('3.1.6', phpversion('igbinary'), '>')) {
|
||||
$this->markTestSkipped('igbinary is not compatible with PHP 7.4.');
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user