Skip to content

[Cache] fix memory leak when using PhpArrayAdapter #34839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 7, 2019
Merged

[Cache] fix memory leak when using PhpArrayAdapter #34839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,13 @@ static function ($key, $value, $isHit) {
* fallback pool with this adapter only if the current PHP version is supported.
*
* @param string $file The PHP file were values are cached
* @param CacheItemPoolInterface $fallbackPool Fallback for old PHP versions or opcache disabled
* @param CacheItemPoolInterface $fallbackPool A pool to fallback on when an item is not hit
*
* @return CacheItemPoolInterface
*/
public static function create($file, CacheItemPoolInterface $fallbackPool)
{
// Shared memory is available in PHP 7.0+ with OPCache enabled and in HHVM
if ((\PHP_VERSION_ID >= 70000 && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)) || \defined('HHVM_VERSION')) {
if (\PHP_VERSION_ID >= 70000) {
if (!$fallbackPool instanceof AdapterInterface) {
$fallbackPool = new ProxyAdapter($fallbackPool);
}
Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Component/Cache/Simple/PhpArrayCache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ public function __construct($file, CacheInterface $fallbackPool)
* stores arrays in its latest versions. This factory method decorates the given
* fallback pool with this adapter only if the current PHP version is supported.
*
* @param string $file The PHP file were values are cached
* @param string $file The PHP file were values are cached
* @param CacheInterface $fallbackPool A pool to fallback on when an item is not hit
*
* @return CacheInterface
*/
public static function create($file, CacheInterface $fallbackPool)
{
// Shared memory is available in PHP 7.0+ with OPCache enabled and in HHVM
if ((\PHP_VERSION_ID >= 70000 && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)) || \defined('HHVM_VERSION')) {
if (\PHP_VERSION_ID >= 70000) {
return new static($file, $fallbackPool);
}

Expand Down
2 changes: 2 additions & 0 deletions src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ public static function setUpBeforeClass()

protected function tearDown()
{
$this->createCachePool()->clear();

if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
}
Expand Down
2 changes: 2 additions & 0 deletions src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public static function setUpBeforeClass()

protected function tearDown()
{
$this->createCachePool()->clear();

if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
}
Expand Down
2 changes: 2 additions & 0 deletions src/Symfony/Component/Cache/Tests/Simple/PhpArrayCacheTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ public static function setUpBeforeClass()

protected function tearDown()
{
$this->createSimpleCache()->clear();

if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
}
Expand Down
2 changes: 2 additions & 0 deletions src/Symfony/Component/Cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ public static function setUpBeforeClass()

protected function tearDown()
{
$this->createSimpleCache()->clear();

if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
}
Expand Down
12 changes: 11 additions & 1 deletion src/Symfony/Component/Cache/Traits/PhpArrayTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ trait PhpArrayTrait
private $values;
private $zendDetectUnicode;

private static $valuesCache = [];

/**
* Store an array of cached values.
*
Expand Down Expand Up @@ -107,6 +109,7 @@ public function warmUp(array $values)
unset($serialized, $unserialized, $value, $dump);

@rename($tmpFile, $this->file);
unset(self::$valuesCache[$this->file]);

$this->initialize();
}
Expand All @@ -119,6 +122,7 @@ public function clear()
$this->values = [];

$cleared = @unlink($this->file) || !file_exists($this->file);
unset(self::$valuesCache[$this->file]);

return $this->pool->clear() && $cleared;
}
Expand All @@ -128,11 +132,17 @@ public function clear()
*/
private function initialize()
{
if (isset(self::$valuesCache[$this->file])) {
$this->values = self::$valuesCache[$this->file];

return;
}

if ($this->zendDetectUnicode) {
$zmb = ini_set('zend.detect_unicode', 0);
}
try {
$this->values = file_exists($this->file) ? (include $this->file ?: []) : [];
$this->values = self::$valuesCache[$this->file] = file_exists($this->file) ? (include $this->file ?: []) : [];
} finally {
if ($this->zendDetectUnicode) {
ini_set('zend.detect_unicode', $zmb);
Expand Down