Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit a1eb0d3

Browse filesBrowse files
fabpotfabpot
committed
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 in a2c924d#r36427445 Commits ------- 09818e9 [Cache] fix checking for igbinary availability
2 parents 1e9aad0 + 09818e9 commit a1eb0d3
Copy full SHA for a1eb0d3

File tree

Expand file treeCollapse file tree

3 files changed

+9
-9
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+9
-9
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ before_install:
172172
173173
tfold ext.apcu tpecl apcu-5.1.17 apcu.so $INI
174174
tfold ext.mongodb tpecl mongodb-1.6.0alpha1 mongodb.so $INI
175-
tfold ext.igbinary tpecl igbinary-2.0.8 igbinary.so $INI
175+
tfold ext.igbinary tpecl igbinary-3.1.2 igbinary.so $INI
176176
tfold ext.zookeeper tpecl zookeeper-0.7.1 zookeeper.so $INI
177177
tfold ext.amqp tpecl amqp-1.9.4 amqp.so $INI
178178
tfold ext.redis tpecl redis-4.3.0 redis.so $INI "no"

‎src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ class DefaultMarshaller implements MarshallerInterface
2525
public function __construct(bool $useIgbinarySerialize = null)
2626
{
2727
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.');
3131
}
3232
$this->useIgbinarySerialize = $useIgbinarySerialize;
3333
}
@@ -66,7 +66,7 @@ public function unmarshall(string $value)
6666
return null;
6767
}
6868
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)) {
7070
return null;
7171
}
7272
$unserializeCallbackHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');

‎src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function testSerialize()
2424
'b' => function () {},
2525
];
2626

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)];
2828
$this->assertSame($expected, $marshaller->marshall($values, $failed));
2929
$this->assertSame(['b'], $failed);
3030
}
@@ -43,7 +43,7 @@ public function testNativeUnserialize()
4343
*/
4444
public function testIgbinaryUnserialize()
4545
{
46-
if (\PHP_VERSION_ID >= 70400) {
46+
if (\PHP_VERSION_ID >= 70400 && version_compare('3.1.0', phpversion('igbinary'), '>')) {
4747
$this->markTestSkipped('igbinary is not compatible with PHP 7.4.');
4848
}
4949

@@ -67,7 +67,7 @@ public function testNativeUnserializeNotFoundClass()
6767
*/
6868
public function testIgbinaryUnserializeNotFoundClass()
6969
{
70-
if (\PHP_VERSION_ID >= 70400) {
70+
if (\PHP_VERSION_ID >= 70400 && version_compare('3.1.0', phpversion('igbinary'), '>')) {
7171
$this->markTestSkipped('igbinary is not compatible with PHP 7.4.');
7272
}
7373

@@ -95,7 +95,7 @@ public function testNativeUnserializeInvalid()
9595
*/
9696
public function testIgbinaryUnserializeInvalid()
9797
{
98-
if (\PHP_VERSION_ID >= 70400) {
98+
if (\PHP_VERSION_ID >= 70400 && version_compare('3.1.0', phpversion('igbinary'), '>')) {
9999
$this->markTestSkipped('igbinary is not compatible with PHP 7.4.');
100100
}
101101

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.