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

[Cache] Minor fixes after merging 3.1

Browse Source
This commit is contained in:
Nicolas Grekas 2016-08-03 16:45:27 +02:00
parent 77e0161870
commit 0f9e54a590
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
View File

@ -64,7 +64,7 @@ class ArrayAdapter implements AdapterInterface, LoggerAwareInterface
} elseif ('b:0;' === $value = $this->values[$key]) {
$value = false;
} elseif (false === $value = unserialize($value)) {
$value = null;
$this->values[$key] = $value = null;
$isHit = false;
}
} catch (\Exception $e) {
@ -210,7 +210,7 @@ class ArrayAdapter implements AdapterInterface, LoggerAwareInterface
} elseif ('b:0;' === $value = $this->values[$key]) {
$value = false;
} elseif (false === $value = unserialize($value)) {
$value = null;
$this->values[$key] = $value = null;
$isHit = false;
}
} catch (\Exception $e) {

4
src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
View File

@ -70,7 +70,7 @@ class PhpFilesAdapter extends AbstractAdapter
if ('N;' === $value) {
$values[$id] = null;
} 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);
} elseif (is_array($value)) {
$serialized = serialize($value);
$unserialized = unserialize($serialized);
$unserialized = parent::unserialize($serialized);
// Store arrays serialized if they contain any objects or references
if ($unserialized !== $value || (false !== strpos($serialized, ';R:') && preg_match('/;R:[1-9]/', $serialized))) {
$value = $serialized;