bug #35428 [Cache] fix checking for igbinary availability (nicolas-grekas)
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 ina2c924d772 (r36427445)
Commits -------09818e99ac
[Cache] fix checking for igbinary availability
This commit is contained in:
commit
a1eb0d3c44
|
@ -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"
|
||||
|
|
|
@ -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 @@ 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 || version_compare('3.1.0', phpversion('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 ? 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 @@ class DefaultMarshallerTest extends TestCase
|
|||
*/
|
||||
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 @@ class DefaultMarshallerTest extends TestCase
|
|||
*/
|
||||
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 @@ class DefaultMarshallerTest extends TestCase
|
|||
*/
|
||||
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.');
|
||||
}
|
||||
|
||||
|
|
Reference in New Issue