bug #19640 [Cache] Minor fixes after merging 3.1 (nicolas-grekas)
This PR was merged into the 3.2-dev branch.
Discussion
----------
[Cache] Minor fixes after merging 3.1
| Q | A
| ------------- | ---
| Branch? | master
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
Commits
-------
0f9e54a
[Cache] Minor fixes after merging 3.1
This commit is contained in:
commit
3bf89b628e
@ -64,7 +64,7 @@ class ArrayAdapter implements AdapterInterface, LoggerAwareInterface
|
|||||||
} elseif ('b:0;' === $value = $this->values[$key]) {
|
} elseif ('b:0;' === $value = $this->values[$key]) {
|
||||||
$value = false;
|
$value = false;
|
||||||
} elseif (false === $value = unserialize($value)) {
|
} elseif (false === $value = unserialize($value)) {
|
||||||
$value = null;
|
$this->values[$key] = $value = null;
|
||||||
$isHit = false;
|
$isHit = false;
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
@ -210,7 +210,7 @@ class ArrayAdapter implements AdapterInterface, LoggerAwareInterface
|
|||||||
} elseif ('b:0;' === $value = $this->values[$key]) {
|
} elseif ('b:0;' === $value = $this->values[$key]) {
|
||||||
$value = false;
|
$value = false;
|
||||||
} elseif (false === $value = unserialize($value)) {
|
} elseif (false === $value = unserialize($value)) {
|
||||||
$value = null;
|
$this->values[$key] = $value = null;
|
||||||
$isHit = false;
|
$isHit = false;
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
|
@ -70,7 +70,7 @@ class PhpFilesAdapter extends AbstractAdapter
|
|||||||
if ('N;' === $value) {
|
if ('N;' === $value) {
|
||||||
$values[$id] = null;
|
$values[$id] = null;
|
||||||
} elseif (is_string($value) && isset($value[2]) && ':' === $value[1]) {
|
} elseif (is_string($value) && isset($value[2]) && ':' === $value[1]) {
|
||||||
$values[$id] = unserialize($value);
|
$values[$id] = parent::unserialize($value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -98,7 +98,7 @@ class PhpFilesAdapter extends AbstractAdapter
|
|||||||
$value = serialize($value);
|
$value = serialize($value);
|
||||||
} elseif (is_array($value)) {
|
} elseif (is_array($value)) {
|
||||||
$serialized = serialize($value);
|
$serialized = serialize($value);
|
||||||
$unserialized = unserialize($serialized);
|
$unserialized = parent::unserialize($serialized);
|
||||||
// Store arrays serialized if they contain any objects or references
|
// Store arrays serialized if they contain any objects or references
|
||||||
if ($unserialized !== $value || (false !== strpos($serialized, ';R:') && preg_match('/;R:[1-9]/', $serialized))) {
|
if ($unserialized !== $value || (false !== strpos($serialized, ';R:') && preg_match('/;R:[1-9]/', $serialized))) {
|
||||||
$value = $serialized;
|
$value = $serialized;
|
||||||
|
Reference in New Issue
Block a user