Merge branch '3.1'

nicolas-grekas · nicolas-grekas · commit 64ace101fb6a · 2016-08-05T12:06:06.000+02:00
* 3.1:
  [Cache] Skip tests that sleep() but can't be clock-mocked
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php
@@ -15,6 +15,12 @@
 
 abstract class AbstractRedisAdapterTest extends AdapterTestCase
 {
+    protected $skippedTests = array(
+        'testExpiration' => 'Testing expiration slows down the test suite',
+        'testHasItemReturnsFalseWhenDeferredItemIsExpired' => 'Testing expiration slows down the test suite',
+        'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
+    );
+
     protected static $redis;
 
     public function createCachePool($defaultLifetime = 0)
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ApcuAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ApcuAdapterTest.php
@@ -15,6 +15,12 @@
 
 class ApcuAdapterTest extends AdapterTestCase
 {
+    protected $skippedTests = array(
+        'testExpiration' => 'Testing expiration slows down the test suite',
+        'testHasItemReturnsFalseWhenDeferredItemIsExpired' => 'Testing expiration slows down the test suite',
+        'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
+    );
+
     public function createCachePool($defaultLifetime = 0)
     {
         if (!function_exists('apcu_fetch') || !ini_get('apc.enabled') || ('cli' === PHP_SAPI && !ini_get('apc.enable_cli'))) {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php
@@ -18,6 +18,7 @@
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
+ * @group time-sensitive
  */
 class ChainAdapterTest extends AdapterTestCase
 {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/DoctrineAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/DoctrineAdapterTest.php
@@ -26,6 +26,6 @@ class DoctrineAdapterTest extends AdapterTestCase
 
     public function createCachePool($defaultLifetime = 0)
     {
-        return new DoctrineAdapter(new ArrayCache(), '', $defaultLifetime);
+        return new DoctrineAdapter(new ArrayCache($defaultLifetime), '', $defaultLifetime);
     }
 }
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/NamespacedProxyAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/NamespacedProxyAdapterTest.php
@@ -21,6 +21,6 @@ class NamespacedProxyAdapterTest extends ProxyAdapterTest
 {
     public function createCachePool($defaultLifetime = 0)
     {
-        return new ProxyAdapter(new ArrayAdapter(), 'foo', $defaultLifetime);
+        return new ProxyAdapter(new ArrayAdapter($defaultLifetime), 'foo', $defaultLifetime);
     }
 }
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/NullAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/NullAdapterTest.php
@@ -14,6 +14,9 @@
 use Psr\Cache\CacheItemInterface;
 use Symfony\Component\Cache\Adapter\NullAdapter;
 
+/**
+ * @group time-sensitive
+ */
 class NullAdapterTest extends \PHPUnit_Framework_TestCase
 {
     public function createCachePool()
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php
@@ -15,6 +15,9 @@
 use Symfony\Component\Cache\Adapter\NullAdapter;
 use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
 
+/**
+ * @group time-sensitive
+ */
 class PhpArrayAdapterTest extends AdapterTestCase
 {
     protected $skippedTests = array(
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareRedisArrayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareRedisArrayAdapterTest.php
@@ -21,6 +21,9 @@ class TagAwareRedisArrayAdapterTest extends AbstractRedisAdapterTest
     protected $skippedTests = array(
         'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayAdapter is not.',
         'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayAdapter is not.',
+        'testExpiration' => 'Testing expiration slows down the test suite',
+        'testHasItemReturnsFalseWhenDeferredItemIsExpired' => 'Testing expiration slows down the test suite',
+        'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
     );
 
     public static function setupBeforeClass()

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,12 @@`
`15`	`15`
`16`	`16`	`class ApcuAdapterTest extends AdapterTestCase`
`17`	`17`	`{`
	`18`	`+ protected $skippedTests = array(`
	`19`	`+ 'testExpiration' => 'Testing expiration slows down the test suite',`
	`20`	`+ 'testHasItemReturnsFalseWhenDeferredItemIsExpired' => 'Testing expiration slows down the test suite',`
	`21`	`+ 'testDefaultLifeTime' => 'Testing expiration slows down the test suite',`
	`22`	`+ );`
	`23`	`+`
`18`	`24`	`public function createCachePool($defaultLifetime = 0)`
`19`	`25`	`{`
`20`	`26`	`if (!function_exists('apcu_fetch') \|\| !ini_get('apc.enabled') \|\| ('cli' === PHP_SAPI && !ini_get('apc.enable_cli'))) {`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`
`19`	`19`	`/**`
`20`	`20`	`* @author Kévin Dunglas <[email protected]>`
	`21`	`+ * @group time-sensitive`
`21`	`22`	`*/`
`22`	`23`	`class ChainAdapterTest extends AdapterTestCase`
`23`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,6 @@ class DoctrineAdapterTest extends AdapterTestCase`
`26`	`26`
`27`	`27`	`public function createCachePool($defaultLifetime = 0)`
`28`	`28`	`{`
`29`		`- return new DoctrineAdapter(new ArrayCache(), '', $defaultLifetime);`
	`29`	`+ return new DoctrineAdapter(new ArrayCache($defaultLifetime), '', $defaultLifetime);`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ class NamespacedProxyAdapterTest extends ProxyAdapterTest`
`21`	`21`	`{`
`22`	`22`	`public function createCachePool($defaultLifetime = 0)`
`23`	`23`	`{`
`24`		`- return new ProxyAdapter(new ArrayAdapter(), 'foo', $defaultLifetime);`
	`24`	`+ return new ProxyAdapter(new ArrayAdapter($defaultLifetime), 'foo', $defaultLifetime);`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@`
`14`	`14`	`use Psr\Cache\CacheItemInterface;`
`15`	`15`	`use Symfony\Component\Cache\Adapter\NullAdapter;`
`16`	`16`
	`17`	`+/**`
	`18`	`+ * @group time-sensitive`
	`19`	`+ */`
`17`	`20`	`class NullAdapterTest extends \PHPUnit_Framework_TestCase`
`18`	`21`	`{`
`19`	`22`	`public function createCachePool()`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,9 @@`
`15`	`15`	`use Symfony\Component\Cache\Adapter\NullAdapter;`
`16`	`16`	`use Symfony\Component\Cache\Adapter\PhpArrayAdapter;`
`17`	`17`
	`18`	`+/**`
	`19`	`+ * @group time-sensitive`
	`20`	`+ */`
`18`	`21`	`class PhpArrayAdapterTest extends AdapterTestCase`
`19`	`22`	`{`
`20`	`23`	`protected $skippedTests = array(`