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

bug #19640 [Cache] Minor fixes after merging 3.1 (nicolas-grekas)

Browse Source 
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:
Fabien Potencier 2016-08-16 10:14:58 -07:00
commit 3bf89b628e
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;