Skip to content

[Cache] Use generator in ArrayAdapter #17522

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
fabpot merged 1 commit into from
Jan 25, 2016
Merged

[Cache] Use generator in ArrayAdapter #17522

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
20 changes: 13 additions & 7 deletions src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,11 @@ public function getItem($key)
*/
public function getItems(array $keys = array())
{
$f = $this->createCacheItem;
$items = array();
$now = time();

foreach ($keys as $key) {
$isHit = isset($this->expiries[$this->validateKey($key)]) && ($this->expiries[$key] >= $now || !$this->deleteItem($key));
$items[$key] = $f($key, $isHit ? $this->values[$key] : null, $isHit);
$this->validateKey($key);
}

return $items;
return $this->generateItems($keys);
}

/**
Expand Down Expand Up @@ -176,4 +171,15 @@ private function validateKey($key)

return $key;
}

private function generateItems(array $keys)
{
$f = $this->createCacheItem;

foreach ($keys as $key) {
$isHit = isset($this->expiries[$key]) && ($this->expiries[$key] >= time() || !$this->deleteItem($key));

yield $key => $f($key, $isHit ? $this->values[$key] : null, $isHit);
}
}
}
1 change: 1 addition & 0 deletions src/Symfony/Component/Cache/Tests/Adapter/ArrayAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class ArrayAdapterTest extends CachePoolTest
{
protected $skippedTests = array(
'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayAdapter is not.',
'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayAdapter is not.',
'testDeferredExpired' => 'Failing for now, needs to be fixed.',
);

Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Component/Cache/Tests/Adapter/DoctrineAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class DoctrineAdapterTest extends CachePoolTest
{
protected $skippedTests = array(
'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayCache is not.',
'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayCache is not.',
'testDeferredExpired' => 'Failing for now, needs to be fixed.',
);

Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class ProxyAdapterTest extends CachePoolTest
{
protected $skippedTests = array(
'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayAdapter is not.',
'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayAdapter is not.',
'testDeferredExpired' => 'Failing for now, needs to be fixed.',
);

Expand Down