8000 [Cache] Minor cleanup · symfony/symfony@34d9518 · GitHub
[go: up one dir, main page]
Skip to content

Commit 34d9518

Browse files
nicolas-grekasnicolas-grekas
committed
[Cache] Minor cleanup
1 parent be4255e commit 34d9518

File tree

6 files changed

+9
-18
lines changed

6 files changed

+9
-18
lines changed

‎src/Symfony/Component/Cache/Adapter/AbstractAdapter.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,6 @@ public function save(CacheItemInterface $item)
270270
if (!$item instanceof CacheItem) {
271271
return false;
272272
}
273-
if ($this->deferred) {
274-
$this->commit();
275-
}
276273
$this->deferred[$item->getKey()] = $item;
277274

278275
return $this->commit();

‎src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ abstract class AbstractRedisAdapterTest extends AdapterTestCase
1919

2020
public function createCachePool($defaultLifetime = 0)
2121
{
22-
if (defined('HHVM_VERSION')) {
23-
$this->skippedTests['testDeferredSaveWithoutCommit'] = 'Fails on HHVM';
24-
}
25-
2622
return new RedisAdapter(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime);
2723
}
2824

‎src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@
1515

1616
abstract class AdapterTestCase extends CachePoolTest
1717
{
18+
protected function setUp()
19+
{
20+
parent::setUp();
21+
22+
if (!array_key_exists('testDeferredSaveWithoutCommit', $this->skippedTests) && defined('HHVM_VERSION')) {
23+
$this->skippedTests['testDeferredSaveWithoutCommit'] = 'Destructors are called late on HHVM.';
24+
}
25+
}
26+
1827
public function testDefaultLifeTime()
1928
{
2029
if (isset($this->skippedTests[__FUNCTION__])) {

‎src/Symfony/Component/Cache/Tests/Adapter/ApcuAdapterTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ class ApcuAdapterTest extends AdapterTestCase
1717
{
1818
public function createCachePool($defaultLifetime = 0)
1919
{
20-
if (defined('HHVM_VERSION')) {
21-
$this->skippedTests['testDeferredSaveWithoutCommit'] = 'Fails on HHVM';
22-
}
2320
if (!function_exists('apcu_fetch') || !ini_get('apc.enabled') || ('cli' === PHP_SAPI && !ini_get('apc.enable_cli'))) {
2421
$this->markTestSkipped('APCu extension is required.');
2522
}

‎src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ class ChainAdapterTest extends AdapterTestCase
2323
{
2424
public function createCachePool($defaultLifetime = 0)
2525
{
26-
if (defined('HHVM_VERSION')) {
27-
$this->skippedTests['testDeferredSaveWithoutCommit'] = 'Fails on HHVM';
28-
}
29-
3026
return new ChainAdapter(array(new ArrayAdapter($defaultLifetime), new ExternalAdapter(), new FilesystemAdapter('', $defaultLifetime)), $defaultLifetime);
3127
}
3228

‎src/Symfony/Component/Cache/Tests/Adapter/FilesystemAdapterTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ class FilesystemAdapterTest extends AdapterTestCase
2020
{
2121
public function createCachePool($defaultLifetime = 0)
2222
{
23-
if (defined('HHVM_VERSION')) {
24-
$this->skippedTests['testDeferredSaveWithoutCommit'] = 'Fails on HHVM';
25-
}
26-
2723
return new FilesystemAdapter('', $defaultLifetime);
2824
}
2925

0 commit comments

Comments
 (0)
0