Upgrade 1-11.38

vendor/symfony/cache/Tests/Adapter/AbstractRedisAdapterTest.php

@@ -28,18 +28,19 @@ abstract class AbstractRedisAdapterTest extends AdapterTestCase
         return new RedisAdapter(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime);
     }
 
-    public static function setUpBeforeClass(): void
+    public static function setUpBeforeClass()
     {
         if (!\extension_loaded('redis')) {
             self::markTestSkipped('Extension redis required.');
         }
-        if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
-            $e = error_get_last();
-            self::markTestSkipped($e['message']);
+        try {
+            (new \Redis())->connect(getenv('REDIS_HOST'));
+        } catch (\Exception $e) {
+            self::markTestSkipped($e->getMessage());
         }
     }
 
-    public static function tearDownAfterClass(): void
+    public static function tearDownAfterClass()
     {
         self::$redis = null;
     }

vendor/symfony/cache/Tests/Adapter/AdapterTestCase.php

@@ -12,117 +12,24 @@
 namespace Symfony\Component\Cache\Tests\Adapter;
 
 use Cache\IntegrationTests\CachePoolTest;
-use PHPUnit\Framework\Assert;
-use Psr\Cache\CacheItemInterface;
 use Psr\Cache\CacheItemPoolInterface;
-use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\PruneableInterface;
-use Symfony\Contracts\Cache\CallbackInterface;
 
 abstract class AdapterTestCase extends CachePoolTest
 {
-    protected function setUp(): void
+    protected function setUp()
     {
         parent::setUp();
 
+        if (!\array_key_exists('testDeferredSaveWithoutCommit', $this->skippedTests) && \defined('HHVM_VERSION')) {
+            $this->skippedTests['testDeferredSaveWithoutCommit'] = 'Destructors are called late on HHVM.';
+        }
+
         if (!\array_key_exists('testPrune', $this->skippedTests) && !$this->createCachePool() instanceof PruneableInterface) {
             $this->skippedTests['testPrune'] = 'Not a pruneable cache pool.';
         }
     }
 
-    public function testGet()
-    {
-        if (isset($this->skippedTests[__FUNCTION__])) {
-            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
-        }
-
-        $cache = $this->createCachePool();
-        $cache->clear();
-
-        $value = mt_rand();
-
-        $this->assertSame($value, $cache->get('foo', function (CacheItem $item) use ($value) {
-            $this->assertSame('foo', $item->getKey());
-
-            return $value;
-        }));
-
-        $item = $cache->getItem('foo');
-        $this->assertSame($value, $item->get());
-
-        $isHit = true;
-        $this->assertSame($value, $cache->get('foo', function (CacheItem $item) use (&$isHit) { $isHit = false; }, 0));
-        $this->assertTrue($isHit);
-
-        $this->assertNull($cache->get('foo', function (CacheItem $item) use (&$isHit, $value) {
-            $isHit = false;
-            $this->assertTrue($item->isHit());
-            $this->assertSame($value, $item->get());
-        }, INF));
-        $this->assertFalse($isHit);
-
-        $this->assertSame($value, $cache->get('bar', new class($value) implements CallbackInterface {
-            private $value;
-
-            public function __construct(int $value)
-            {
-                $this->value = $value;
-            }
-
-            public function __invoke(CacheItemInterface $item, bool &$save)
-            {
-                Assert::assertSame('bar', $item->getKey());
-
-                return $this->value;
-            }
-        }));
-    }
-
-    public function testRecursiveGet()
-    {
-        if (isset($this->skippedTests[__FUNCTION__])) {
-            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
-        }
-
-        $cache = $this->createCachePool(0, __FUNCTION__);
-
-        $v = $cache->get('k1', function () use (&$counter, $cache) {
-            $cache->get('k2', function () use (&$counter) { return ++$counter; });
-            $v = $cache->get('k2', function () use (&$counter) { return ++$counter; }); // ensure the callback is called once
-
-            return $v;
-        });
-
-        $this->assertSame(1, $counter);
-        $this->assertSame(1, $v);
-        $this->assertSame(1, $cache->get('k2', function () { return 2; }));
-    }
-
-    public function testGetMetadata()
-    {
-        if (isset($this->skippedTests[__FUNCTION__])) {
-            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
-        }
-
-        $cache = $this->createCachePool(0, __FUNCTION__);
-
-        $cache->deleteItem('foo');
-        $cache->get('foo', function ($item) {
-            $item->expiresAfter(10);
-            usleep(999000);
-
-            return 'bar';
-        });
-
-        $item = $cache->getItem('foo');
-
-        $expected = [
-            CacheItem::METADATA_EXPIRY => 9.5 + time(),
-            CacheItem::METADATA_CTIME => 1000,
-        ];
-        $this->assertEqualsWithDelta($expected, $item->getMetadata(), .6, 'Item metadata should embed expiry and ctime.');
-    }
-
     public function testDefaultLifeTime()
     {
         if (isset($this->skippedTests[__FUNCTION__])) {
@@ -254,9 +161,14 @@ abstract class AdapterTestCase extends CachePoolTest
     }
 }
 
-class NotUnserializable
+class NotUnserializable implements \Serializable
 {
-    public function __wakeup()
+    public function serialize()
+    {
+        return serialize(123);
+    }
+
+    public function unserialize($ser)
     {
         throw new \Exception(__CLASS__);
     }

vendor/symfony/cache/Tests/Adapter/ApcuAdapterTest.php

@@ -24,10 +24,10 @@ class ApcuAdapterTest extends AdapterTestCase
 
     public function createCachePool($defaultLifetime = 0)
     {
-        if (!\function_exists('apcu_fetch') || !filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN)) {
+        if (!\function_exists('apcu_fetch') || !filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN)) {
             $this->markTestSkipped('APCu extension is required.');
         }
-        if ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN)) {
+        if ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN)) {
             if ('testWithCliSapi' !== $this->getName()) {
                 $this->markTestSkipped('apc.enable_cli=1 is required.');
             }
@@ -54,7 +54,7 @@ class ApcuAdapterTest extends AdapterTestCase
 
     public function testVersion()
     {
-        $namespace = str_replace('\\', '.', \get_class($this));
+        $namespace = str_replace('\\', '.', static::class);
 
         $pool1 = new ApcuAdapter($namespace, 0, 'p1');
 
@@ -79,7 +79,7 @@ class ApcuAdapterTest extends AdapterTestCase
 
     public function testNamespace()
     {
-        $namespace = str_replace('\\', '.', \get_class($this));
+        $namespace = str_replace('\\', '.', static::class);
 
         $pool1 = new ApcuAdapter($namespace.'_1', 0, 'p1');
 

vendor/symfony/cache/Tests/Adapter/ArrayAdapterTest.php

@@ -19,7 +19,6 @@ use Symfony\Component\Cache\Adapter\ArrayAdapter;
 class ArrayAdapterTest extends AdapterTestCase
 {
     protected $skippedTests = [
-        'testGetMetadata' => 'ArrayAdapter does not keep metadata.',
         'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayAdapter is not.',
         'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayAdapter is not.',
     ];
@@ -36,12 +35,12 @@ class ArrayAdapterTest extends AdapterTestCase
 
         // Hit
         $item = $cache->getItem('foo');
-        $item->set('::4711');
+        $item->set('4711');
         $cache->save($item);
 
         $fooItem = $cache->getItem('foo');
         $this->assertTrue($fooItem->isHit());
-        $this->assertEquals('::4711', $fooItem->get());
+        $this->assertEquals('4711', $fooItem->get());
 
         // Miss (should be present as NULL in $values)
         $cache->getItem('bar');
@@ -50,7 +49,7 @@ class ArrayAdapterTest extends AdapterTestCase
 
         $this->assertCount(2, $values);
         $this->assertArrayHasKey('foo', $values);
-        $this->assertSame(serialize('::4711'), $values['foo']);
+        $this->assertSame(serialize('4711'), $values['foo']);
         $this->assertArrayHasKey('bar', $values);
         $this->assertNull($values['bar']);
     }

vendor/symfony/cache/Tests/Adapter/ChainAdapterTest.php

@@ -25,13 +25,9 @@ use Symfony\Component\Cache\Tests\Fixtures\ExternalAdapter;
  */
 class ChainAdapterTest extends AdapterTestCase
 {
-    public function createCachePool($defaultLifetime = 0, $testMethod = null)
+    public function createCachePool($defaultLifetime = 0)
     {
-        if ('testGetMetadata' === $testMethod) {
-            return new ChainAdapter([new FilesystemAdapter('a', $defaultLifetime), new FilesystemAdapter('b', $defaultLifetime)], $defaultLifetime);
-        }
-
-        return new ChainAdapter([new ArrayAdapter($defaultLifetime), new ExternalAdapter(), new FilesystemAdapter('', $defaultLifetime)], $defaultLifetime);
+        return new ChainAdapter([new ArrayAdapter($defaultLifetime), new ExternalAdapter($defaultLifetime), new FilesystemAdapter('', $defaultLifetime)], $defaultLifetime);
     }
 
     public function testEmptyAdaptersException()
@@ -69,6 +65,124 @@ class ChainAdapterTest extends AdapterTestCase
         $this->assertFalse($cache->prune());
     }
 
+    public function testMultipleCachesExpirationWhenCommonTtlIsNotSet()
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
+        }
+
+        $adapter1 = new ArrayAdapter(4);
+        $adapter2 = new ArrayAdapter(2);
+
+        $cache = new ChainAdapter([$adapter1, $adapter2]);
+
+        $cache->save($cache->getItem('key')->set('value'));
+
+        $item = $adapter1->getItem('key');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value', $item->get());
+
+        $item = $adapter2->getItem('key');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value', $item->get());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value', $item->get());
+
+        $item = $adapter2->getItem('key');
+        $this->assertFalse($item->isHit());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key');
+        $this->assertFalse($item->isHit());
+
+        $adapter2->save($adapter2->getItem('key1')->set('value1'));
+
+        $item = $cache->getItem('key1');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value1', $item->get());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key1');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value1', $item->get());
+
+        $item = $adapter2->getItem('key1');
+        $this->assertFalse($item->isHit());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key1');
+        $this->assertFalse($item->isHit());
+    }
+
+    public function testMultipleCachesExpirationWhenCommonTtlIsSet()
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
+        }
+
+        $adapter1 = new ArrayAdapter(4);
+        $adapter2 = new ArrayAdapter(2);
+
+        $cache = new ChainAdapter([$adapter1, $adapter2], 6);
+
+        $cache->save($cache->getItem('key')->set('value'));
+
+        $item = $adapter1->getItem('key');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value', $item->get());
+
+        $item = $adapter2->getItem('key');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value', $item->get());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value', $item->get());
+
+        $item = $adapter2->getItem('key');
+        $this->assertFalse($item->isHit());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key');
+        $this->assertFalse($item->isHit());
+
+        $adapter2->save($adapter2->getItem('key1')->set('value1'));
+
+        $item = $cache->getItem('key1');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value1', $item->get());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key1');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value1', $item->get());
+
+        $item = $adapter2->getItem('key1');
+        $this->assertFalse($item->isHit());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key1');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value1', $item->get());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key1');
+        $this->assertFalse($item->isHit());
+    }
+
     /**
      * @return MockObject|PruneableCacheInterface
      */

vendor/symfony/cache/Tests/Adapter/FilesystemAdapterTest.php

@@ -24,7 +24,7 @@ class FilesystemAdapterTest extends AdapterTestCase
         return new FilesystemAdapter('', $defaultLifetime);
     }
 
-    public static function tearDownAfterClass(): void
+    public static function tearDownAfterClass()
     {
         self::rmdir(sys_get_temp_dir().'/symfony-cache');
     }

vendor/symfony/cache/Tests/Adapter/FilesystemTagAwareAdapterTest.php

@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Symfony\Component\Cache\Adapter\FilesystemTagAwareAdapter;
-use Symfony\Component\Cache\Tests\Traits\TagAwareTestTrait;
-
-/**
- * @group time-sensitive
- */
-class FilesystemTagAwareAdapterTest extends FilesystemAdapterTest
-{
-    use TagAwareTestTrait;
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        return new FilesystemTagAwareAdapter('', $defaultLifetime);
-    }
-}

vendor/symfony/cache/Tests/Adapter/MaxIdLengthAdapterTest.php

@@ -26,7 +26,7 @@ class MaxIdLengthAdapterTest extends TestCase
         $cache->expects($this->exactly(2))
             ->method('doHave')
             ->withConsecutive(
-                [$this->equalTo('----------:nWfzGiCgLczv3SSUzXL3kg:')],
+                [$this->equalTo('----------:0GTYWa9n4ed8vqNlOT2iEr:')],
                 [$this->equalTo('----------:---------------------------------------')]
             );
 

vendor/symfony/cache/Tests/Adapter/MemcachedAdapterTest.php

@@ -23,7 +23,7 @@ class MemcachedAdapterTest extends AdapterTestCase
 
     protected static $client;
 
-    public static function setUpBeforeClass(): void
+    public static function setUpBeforeClass()
     {
         if (!MemcachedAdapter::isSupported()) {
             self::markTestSkipped('Extension memcached >=2.2.0 required.');
@@ -66,8 +66,14 @@ class MemcachedAdapterTest extends AdapterTestCase
      */
     public function testBadOptions($name, $value)
     {
-        $this->expectException('ErrorException');
-        $this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');
+        if (\PHP_VERSION_ID < 80000) {
+            $this->expectException('ErrorException');
+            $this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');
+        } else {
+            $this->expectException('Error');
+            $this->expectExceptionMessage('Undefined constant Memcached::');
+        }
+
         MemcachedAdapter::createConnection([], [$name => $value]);
     }
 
@@ -135,7 +141,7 @@ class MemcachedAdapterTest extends AdapterTestCase
             'localhost',
             11222,
         ];
-        if (filter_var(ini_get('memcached.use_sasl'), FILTER_VALIDATE_BOOLEAN)) {
+        if (filter_var(ini_get('memcached.use_sasl'), \FILTER_VALIDATE_BOOLEAN)) {
             yield [
                 'memcached://user:password@127.0.0.1?weight=50',
                 '127.0.0.1',
@@ -152,7 +158,7 @@ class MemcachedAdapterTest extends AdapterTestCase
             '/var/local/run/memcached.socket',
             0,
         ];
-        if (filter_var(ini_get('memcached.use_sasl'), FILTER_VALIDATE_BOOLEAN)) {
+        if (filter_var(ini_get('memcached.use_sasl'), \FILTER_VALIDATE_BOOLEAN)) {
             yield [
                 'memcached://user:password@/var/local/run/memcached.socket?weight=25',
                 '/var/local/run/memcached.socket',
@@ -195,46 +201,4 @@ class MemcachedAdapterTest extends AdapterTestCase
     {
         $this->assertTrue($this->createCachePool()->clear());
     }
-
-    public function testMultiServerDsn()
-    {
-        $dsn = 'memcached:?host[localhost]&host[localhost:12345]&host[/some/memcached.sock:]=3';
-        $client = MemcachedAdapter::createConnection($dsn);
-
-        $expected = [
-            0 => [
-                'host' => 'localhost',
-                'port' => 11211,
-                'type' => 'TCP',
-            ],
-            1 => [
-                'host' => 'localhost',
-                'port' => 12345,
-                'type' => 'TCP',
-            ],
-            2 => [
-                'host' => '/some/memcached.sock',
-                'port' => 0,
-                'type' => 'SOCKET',
-            ],
-        ];
-        $this->assertSame($expected, $client->getServerList());
-
-        $dsn = 'memcached://localhost?host[foo.bar]=3';
-        $client = MemcachedAdapter::createConnection($dsn);
-
-        $expected = [
-            0 => [
-                'host' => 'localhost',
-                'port' => 11211,
-                'type' => 'TCP',
-            ],
-            1 => [
-                'host' => 'foo.bar',
-                'port' => 11211,
-                'type' => 'TCP',
-            ],
-        ];
-        $this->assertSame($expected, $client->getServerList());
-    }
 }

vendor/symfony/cache/Tests/Adapter/NamespacedProxyAdapterTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Cache\Tests\Adapter;
 
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Adapter\ProxyAdapter;
 
 /**
@@ -20,12 +19,8 @@ use Symfony\Component\Cache\Adapter\ProxyAdapter;
  */
 class NamespacedProxyAdapterTest extends ProxyAdapterTest
 {
-    public function createCachePool($defaultLifetime = 0, $testMethod = null)
+    public function createCachePool($defaultLifetime = 0)
     {
-        if ('testGetMetadata' === $testMethod) {
-            return new ProxyAdapter(new FilesystemAdapter(), 'foo', $defaultLifetime);
-        }
-
         return new ProxyAdapter(new ArrayAdapter($defaultLifetime), 'foo', $defaultLifetime);
     }
 }

vendor/symfony/cache/Tests/Adapter/NullAdapterTest.php

@@ -34,19 +34,6 @@ class NullAdapterTest extends TestCase
         $this->assertNull($item->get(), "Item's value must be null when isHit is false.");
     }
 
-    public function testGet()
-    {
-        $adapter = $this->createCachePool();
-
-        $fetched = [];
-        $adapter->get('myKey', function ($item) use (&$fetched) { $fetched[] = $item; });
-        $this->assertCount(1, $fetched);
-        $item = $fetched[0];
-        $this->assertFalse($item->isHit());
-        $this->assertNull($item->get(), "Item's value must be null when isHit is false.");
-        $this->assertSame('myKey', $item->getKey());
-    }
-
     public function testHasItem()
     {
         $this->assertFalse($this->createCachePool()->hasItem('key'));

vendor/symfony/cache/Tests/Adapter/PdoAdapterTest.php

@@ -23,7 +23,7 @@ class PdoAdapterTest extends AdapterTestCase
 
     protected static $dbFile;
 
-    public static function setUpBeforeClass(): void
+    public static function setUpBeforeClass()
     {
         if (!\extension_loaded('pdo_sqlite')) {
             self::markTestSkipped('Extension pdo_sqlite required.');
@@ -35,7 +35,7 @@ class PdoAdapterTest extends AdapterTestCase
         $pool->createTable();
     }
 
-    public static function tearDownAfterClass(): void
+    public static function tearDownAfterClass()
     {
         @unlink(self::$dbFile);
     }

vendor/symfony/cache/Tests/Adapter/PdoDbalAdapterTest.php

@@ -24,16 +24,19 @@ class PdoDbalAdapterTest extends AdapterTestCase
 
     protected static $dbFile;
 
-    public static function setUpBeforeClass(): void
+    public static function setUpBeforeClass()
     {
         if (!\extension_loaded('pdo_sqlite')) {
             self::markTestSkipped('Extension pdo_sqlite required.');
         }
 
         self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
+
+        $pool = new PdoAdapter(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));
+        $pool->createTable();
     }
 
-    public static function tearDownAfterClass(): void
+    public static function tearDownAfterClass()
     {
         @unlink(self::$dbFile);
     }

vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Cache\Tests\Adapter;
 
 use Psr\Cache\CacheItemInterface;
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Adapter\NullAdapter;
 use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
 
@@ -22,8 +21,6 @@ use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
 class PhpArrayAdapterTest extends AdapterTestCase
 {
     protected $skippedTests = [
-        'testGet' => 'PhpArrayAdapter is read-only.',
-        'testRecursiveGet' => 'PhpArrayAdapter is read-only.',
         'testBasicUsage' => 'PhpArrayAdapter is read-only.',
         'testBasicUsageWithLongKey' => 'PhpArrayAdapter is read-only.',
         'testClear' => 'PhpArrayAdapter is read-only.',
@@ -58,12 +55,12 @@ class PhpArrayAdapterTest extends AdapterTestCase
 
     protected static $file;
 
-    public static function setUpBeforeClass(): void
+    public static function setUpBeforeClass()
     {
         self::$file = sys_get_temp_dir().'/symfony-cache/php-array-adapter-test.php';
     }
 
-    protected function tearDown(): void
+    protected function tearDown()
     {
         $this->createCachePool()->clear();
 
@@ -72,12 +69,8 @@ class PhpArrayAdapterTest extends AdapterTestCase
         }
     }
 
-    public function createCachePool($defaultLifetime = 0, $testMethod = null)
+    public function createCachePool()
     {
-        if ('testGetMetadata' === $testMethod) {
-            return new PhpArrayAdapter(self::$file, new FilesystemAdapter());
-        }
-
         return new PhpArrayAdapterWrapper(self::$file, new NullAdapter());
     }
 
@@ -110,32 +103,16 @@ class PhpArrayAdapterTest extends AdapterTestCase
 
     public function testStoredFile()
     {
-        $data = [
+        $expected = [
             'integer' => 42,
             'float' => 42.42,
             'boolean' => true,
             'array_simple' => ['foo', 'bar'],
             'array_associative' => ['foo' => 'bar', 'foo2' => 'bar2'],
         ];
-        $expected = [
-            [
-                'integer' => 0,
-                'float' => 1,
-                'boolean' => 2,
-                'array_simple' => 3,
-                'array_associative' => 4,
-            ],
-            [
-                0 => 42,
-                1 => 42.42,
-                2 => true,
-                3 => ['foo', 'bar'],
-                4 => ['foo' => 'bar', 'foo2' => 'bar2'],
-            ],
-        ];
 
         $adapter = $this->createCachePool();
-        $adapter->warmUp($data);
+        $adapter->warmUp($expected);
 
         $values = eval(substr(file_get_contents(self::$file), 6));
 
@@ -145,17 +122,13 @@ class PhpArrayAdapterTest extends AdapterTestCase
 
 class PhpArrayAdapterWrapper extends PhpArrayAdapter
 {
-    protected $data = [];
-
     public function save(CacheItemInterface $item)
     {
-        (\Closure::bind(function () use ($item) {
-            $key = $item->getKey();
-            $this->keys[$key] = $id = \count($this->values);
-            $this->data[$key] = $this->values[$id] = $item->get();
-            $this->warmUp($this->data);
-            list($this->keys, $this->values) = eval(substr(file_get_contents($this->file), 6));
-        }, $this, PhpArrayAdapter::class))();
+        \call_user_func(\Closure::bind(function () use ($item) {
+            $this->values[$item->getKey()] = $item->get();
+            $this->warmUp($this->values);
+            $this->values = eval(substr(file_get_contents($this->file), 6));
+        }, $this, PhpArrayAdapter::class));
 
         return true;
     }

vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php

@@ -30,12 +30,12 @@ class PhpArrayAdapterWithFallbackTest extends AdapterTestCase
 
     protected static $file;
 
-    public static function setUpBeforeClass(): void
+    public static function setUpBeforeClass()
     {
         self::$file = sys_get_temp_dir().'/symfony-cache/php-array-adapter-test.php';
     }
 
-    protected function tearDown(): void
+    protected function tearDown()
     {
         $this->createCachePool()->clear();
 

vendor/symfony/cache/Tests/Adapter/PhpFilesAdapterAppendOnlyTest.php

@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Psr\Cache\CacheItemPoolInterface;
-use Symfony\Component\Cache\Adapter\PhpFilesAdapter;
-
-/**
- * @group time-sensitive
- */
-class PhpFilesAdapterAppendOnlyTest extends PhpFilesAdapterTest
-{
-    protected $skippedTests = [
-        'testDefaultLifeTime' => 'PhpFilesAdapter does not allow configuring a default lifetime.',
-        'testExpiration' => 'PhpFilesAdapter in append-only mode does not expiration.',
-    ];
-
-    public function createCachePool(): CacheItemPoolInterface
-    {
-        return new PhpFilesAdapter('sf-cache', 0, null, true);
-    }
-}

vendor/symfony/cache/Tests/Adapter/PhpFilesAdapterTest.php

@@ -25,10 +25,14 @@ class PhpFilesAdapterTest extends AdapterTestCase
 
     public function createCachePool()
     {
+        if (!PhpFilesAdapter::isSupported()) {
+            $this->markTestSkipped('OPcache extension is not enabled.');
+        }
+
         return new PhpFilesAdapter('sf-cache');
     }
 
-    public static function tearDownAfterClass(): void
+    public static function tearDownAfterClass()
     {
         FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
     }

vendor/symfony/cache/Tests/Adapter/PredisAdapterTest.php

@@ -16,7 +16,7 @@ use Symfony\Component\Cache\Adapter\RedisAdapter;
 
 class PredisAdapterTest extends AbstractRedisAdapterTest
 {
-    public static function setUpBeforeClass(): void
+    public static function setUpBeforeClass()
     {
         parent::setUpBeforeClass();
         self::$redis = new \Predis\Client(['host' => getenv('REDIS_HOST')]);
@@ -35,12 +35,18 @@ class PredisAdapterTest extends AbstractRedisAdapterTest
         $params = [
             'scheme' => 'tcp',
             'host' => $redisHost,
+            'path' => '',
+            'dbindex' => '1',
             'port' => 6379,
-            'persistent' => 0,
+            'class' => 'Predis\Client',
             'timeout' => 3,
-            'read_write_timeout' => 0,
-            'tcp_nodelay' => true,
+            'persistent' => 0,
+            'persistent_id' => null,
+            'read_timeout' => 0,
+            'retry_interval' => 0,
+            'lazy' => false,
             'database' => '1',
+            'password' => null,
         ];
         $this->assertSame($params, $connection->getParameters()->toArray());
     }

vendor/symfony/cache/Tests/Adapter/PredisClusterAdapterTest.php

@@ -13,13 +13,13 @@ namespace Symfony\Component\Cache\Tests\Adapter;
 
 class PredisClusterAdapterTest extends AbstractRedisAdapterTest
 {
-    public static function setUpBeforeClass(): void
+    public static function setUpBeforeClass()
     {
         parent::setUpBeforeClass();
         self::$redis = new \Predis\Client([['host' => getenv('REDIS_HOST')]]);
     }
 
-    public static function tearDownAfterClass(): void
+    public static function tearDownAfterClass()
     {
         self::$redis = null;
     }

vendor/symfony/cache/Tests/Adapter/PredisRedisClusterAdapterTest.php

@@ -11,20 +11,17 @@
 
 namespace Symfony\Component\Cache\Tests\Adapter;
 
-use Symfony\Component\Cache\Adapter\RedisAdapter;
-
 class PredisRedisClusterAdapterTest extends AbstractRedisAdapterTest
 {
-    public static function setUpBeforeClass(): void
+    public static function setUpBeforeClass()
     {
         if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
             self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
         }
-
-        self::$redis = RedisAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['class' => \Predis\Client::class, 'redis_cluster' => true]);
+        self::$redis = new \Predis\Client(explode(' ', $hosts), ['cluster' => 'redis']);
     }
 
-    public static function tearDownAfterClass(): void
+    public static function tearDownAfterClass()
     {
         self::$redis = null;
     }

vendor/symfony/cache/Tests/Adapter/PredisTagAwareAdapterTest.php

@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Symfony\Component\Cache\Adapter\RedisTagAwareAdapter;
-use Symfony\Component\Cache\Tests\Traits\TagAwareTestTrait;
-
-class PredisTagAwareAdapterTest extends PredisAdapterTest
-{
-    use TagAwareTestTrait;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        $this->skippedTests['testTagItemExpiry'] = 'Testing expiration slows down the test suite';
-    }
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        $this->assertInstanceOf(\Predis\Client::class, self::$redis);
-        $adapter = new RedisTagAwareAdapter(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime);
-
-        return $adapter;
-    }
-}

vendor/symfony/cache/Tests/Adapter/PredisTagAwareClusterAdapterTest.php

@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Symfony\Component\Cache\Adapter\RedisTagAwareAdapter;
-use Symfony\Component\Cache\Tests\Traits\TagAwareTestTrait;
-
-class PredisTagAwareClusterAdapterTest extends PredisClusterAdapterTest
-{
-    use TagAwareTestTrait;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        $this->skippedTests['testTagItemExpiry'] = 'Testing expiration slows down the test suite';
-    }
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        $this->assertInstanceOf(\Predis\Client::class, self::$redis);
-        $adapter = new RedisTagAwareAdapter(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime);
-
-        return $adapter;
-    }
-}

vendor/symfony/cache/Tests/Adapter/PredisTagAwareRedisClusterAdapterTest.php

@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Symfony\Component\Cache\Adapter\RedisTagAwareAdapter;
-use Symfony\Component\Cache\Tests\Traits\TagAwareTestTrait;
-
-class PredisTagAwareRedisClusterAdapterTest extends PredisRedisClusterAdapterTest
-{
-    use TagAwareTestTrait;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        $this->skippedTests['testTagItemExpiry'] = 'Testing expiration slows down the test suite';
-    }
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        $this->assertInstanceOf(\Predis\Client::class, self::$redis);
-        $adapter = new RedisTagAwareAdapter(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime);
-
-        return $adapter;
-    }
-}

vendor/symfony/cache/Tests/Adapter/ProxyAdapterTest.php

@@ -13,7 +13,6 @@ namespace Symfony\Component\Cache\Tests\Adapter;
 
 use Psr\Cache\CacheItemInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Adapter\ProxyAdapter;
 use Symfony\Component\Cache\CacheItem;
 
@@ -28,12 +27,8 @@ class ProxyAdapterTest extends AdapterTestCase
         'testPrune' => 'ProxyAdapter just proxies',
     ];
 
-    public function createCachePool($defaultLifetime = 0, $testMethod = null)
+    public function createCachePool($defaultLifetime = 0)
     {
-        if ('testGetMetadata' === $testMethod) {
-            return new ProxyAdapter(new FilesystemAdapter(), '', $defaultLifetime);
-        }
-
         return new ProxyAdapter(new ArrayAdapter(), '', $defaultLifetime);
     }
 

vendor/symfony/cache/Tests/Adapter/Psr16AdapterTest.php

@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
-use Symfony\Component\Cache\Adapter\Psr16Adapter;
-use Symfony\Component\Cache\Psr16Cache;
-
-/**
- * @group time-sensitive
- */
-class Psr16AdapterTest extends AdapterTestCase
-{
-    protected $skippedTests = [
-        'testPrune' => 'Psr16adapter just proxies',
-    ];
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        return new Psr16Adapter(new Psr16Cache(new FilesystemAdapter()), '', $defaultLifetime);
-    }
-
-    public function testValidCacheKeyWithNamespace()
-    {
-        $cache = new Psr16Adapter(new Psr16Cache(new ArrayAdapter()), 'some_namespace', 0);
-        $item = $cache->getItem('my_key');
-        $item->set('someValue');
-        $cache->save($item);
-
-        $this->assertTrue($cache->getItem('my_key')->isHit(), 'Stored item is successfully retrieved.');
-    }
-}

vendor/symfony/cache/Tests/Adapter/RedisAdapterTest.php

@@ -17,7 +17,7 @@ use Symfony\Component\Cache\Traits\RedisProxy;
 
 class RedisAdapterTest extends AbstractRedisAdapterTest
 {
-    public static function setUpBeforeClass(): void
+    public static function setUpBeforeClass()
     {
         parent::setUpBeforeClass();
         self::$redis = AbstractAdapter::createConnection('redis://'.getenv('REDIS_HOST'), ['lazy' => true]);
@@ -31,33 +31,25 @@ class RedisAdapterTest extends AbstractRedisAdapterTest
         return $adapter;
     }
 
-    /**
-     * @dataProvider provideValidSchemes
-     */
-    public function testCreateConnection($dsnScheme)
+    public function testCreateConnection()
     {
-        $redis = RedisAdapter::createConnection($dsnScheme.':?host[h1]&host[h2]&host[/foo:]');
-        $this->assertInstanceOf(\RedisArray::class, $redis);
-        $this->assertSame(['h1:6379', 'h2:6379', '/foo'], $redis->_hosts());
-        @$redis = null; // some versions of phpredis connect on destruct, let's silence the warning
-
         $redisHost = getenv('REDIS_HOST');
 
-        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost);
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost);
         $this->assertInstanceOf(\Redis::class, $redis);
         $this->assertTrue($redis->isConnected());
         $this->assertSame(0, $redis->getDbNum());
 
-        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost.'/2');
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'/2');
         $this->assertSame(2, $redis->getDbNum());
 
-        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost, ['timeout' => 3]);
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['timeout' => 3]);
         $this->assertEquals(3, $redis->getTimeout());
 
-        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost.'?timeout=4');
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'?timeout=4');
         $this->assertEquals(4, $redis->getTimeout());
 
-        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost, ['read_timeout' => 5]);
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['read_timeout' => 5]);
         $this->assertEquals(5, $redis->getReadTimeout());
     }
 
@@ -67,7 +59,7 @@ class RedisAdapterTest extends AbstractRedisAdapterTest
     public function testFailedCreateConnection($dsn)
     {
         $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Redis connection failed');
+        $this->expectExceptionMessage('Redis connection ');
         RedisAdapter::createConnection($dsn);
     }
 
@@ -90,14 +82,6 @@ class RedisAdapterTest extends AbstractRedisAdapterTest
         RedisAdapter::createConnection($dsn);
     }
 
-    public function provideValidSchemes()
-    {
-        return [
-            ['redis'],
-            ['rediss'],
-        ];
-    }
-
     public function provideInvalidCreateConnection()
     {
         return [

vendor/symfony/cache/Tests/Adapter/RedisArrayAdapterTest.php

@@ -13,7 +13,7 @@ namespace Symfony\Component\Cache\Tests\Adapter;
 
 class RedisArrayAdapterTest extends AbstractRedisAdapterTest
 {
-    public static function setUpBeforeClass(): void
+    public static function setUpBeforeClass()
     {
         parent::setupBeforeClass();
         if (!class_exists('RedisArray')) {

vendor/symfony/cache/Tests/Adapter/RedisClusterAdapterTest.php

@@ -11,13 +11,9 @@
 
 namespace Symfony\Component\Cache\Tests\Adapter;
 
-use Symfony\Component\Cache\Adapter\AbstractAdapter;
-use Symfony\Component\Cache\Adapter\RedisAdapter;
-use Symfony\Component\Cache\Traits\RedisClusterProxy;
-
 class RedisClusterAdapterTest extends AbstractRedisAdapterTest
 {
-    public static function setUpBeforeClass(): void
+    public static function setUpBeforeClass()
     {
         if (!class_exists('RedisCluster')) {
             self::markTestSkipped('The RedisCluster class is required.');
@@ -26,33 +22,6 @@ class RedisClusterAdapterTest extends AbstractRedisAdapterTest
             self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
         }
 
-        self::$redis = AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['lazy' => true, 'redis_cluster' => true]);
-    }
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        $this->assertInstanceOf(RedisClusterProxy::class, self::$redis);
-        $adapter = new RedisAdapter(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime);
-
-        return $adapter;
-    }
-
-    /**
-     * @dataProvider provideFailedCreateConnection
-     */
-    public function testFailedCreateConnection($dsn)
-    {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Redis connection failed');
-        RedisAdapter::createConnection($dsn);
-    }
-
-    public function provideFailedCreateConnection()
-    {
-        return [
-            ['redis://localhost:1234?redis_cluster=1'],
-            ['redis://foo@localhost?redis_cluster=1'],
-            ['redis://localhost/123?redis_cluster=1'],
-        ];
+        self::$redis = new \RedisCluster(null, explode(' ', $hosts));
     }
 }

vendor/symfony/cache/Tests/Adapter/RedisTagAwareAdapterTest.php

@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Symfony\Component\Cache\Adapter\RedisTagAwareAdapter;
-use Symfony\Component\Cache\Tests\Traits\TagAwareTestTrait;
-use Symfony\Component\Cache\Traits\RedisProxy;
-
-class RedisTagAwareAdapterTest extends RedisAdapterTest
-{
-    use TagAwareTestTrait;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        $this->skippedTests['testTagItemExpiry'] = 'Testing expiration slows down the test suite';
-    }
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        $this->assertInstanceOf(RedisProxy::class, self::$redis);
-        $adapter = new RedisTagAwareAdapter(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime);
-
-        return $adapter;
-    }
-}

vendor/symfony/cache/Tests/Adapter/RedisTagAwareArrayAdapterTest.php

@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Symfony\Component\Cache\Adapter\RedisTagAwareAdapter;
-use Symfony\Component\Cache\Tests\Traits\TagAwareTestTrait;
-
-class RedisTagAwareArrayAdapterTest extends RedisArrayAdapterTest
-{
-    use TagAwareTestTrait;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        $this->skippedTests['testTagItemExpiry'] = 'Testing expiration slows down the test suite';
-    }
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        $this->assertInstanceOf(\RedisArray::class, self::$redis);
-        $adapter = new RedisTagAwareAdapter(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime);
-
-        return $adapter;
-    }
-}

vendor/symfony/cache/Tests/Adapter/RedisTagAwareClusterAdapterTest.php

@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Symfony\Component\Cache\Adapter\RedisTagAwareAdapter;
-use Symfony\Component\Cache\Tests\Traits\TagAwareTestTrait;
-use Symfony\Component\Cache\Traits\RedisClusterProxy;
-
-class RedisTagAwareClusterAdapterTest extends RedisClusterAdapterTest
-{
-    use TagAwareTestTrait;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        $this->skippedTests['testTagItemExpiry'] = 'Testing expiration slows down the test suite';
-    }
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        $this->assertInstanceOf(RedisClusterProxy::class, self::$redis);
-        $adapter = new RedisTagAwareAdapter(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime);
-
-        return $adapter;
-    }
-}

vendor/symfony/cache/Tests/Adapter/SimpleCacheAdapterTest.php

@@ -17,7 +17,6 @@ use Symfony\Component\Cache\Simple\FilesystemCache;
 
 /**
  * @group time-sensitive
- * @group legacy
  */
 class SimpleCacheAdapterTest extends AdapterTestCase
 {

vendor/symfony/cache/Tests/Adapter/TagAwareAdapterTest.php

@@ -14,31 +14,71 @@ namespace Symfony\Component\Cache\Tests\Adapter;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Cache\CacheItemInterface;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Adapter\TagAwareAdapter;
-use Symfony\Component\Cache\Tests\Traits\TagAwareTestTrait;
 
 /**
  * @group time-sensitive
  */
 class TagAwareAdapterTest extends AdapterTestCase
 {
-    use TagAwareTestTrait;
-
     public function createCachePool($defaultLifetime = 0)
     {
         return new TagAwareAdapter(new FilesystemAdapter('', $defaultLifetime));
     }
 
-    public static function tearDownAfterClass(): void
+    public static function tearDownAfterClass()
     {
         FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
     }
 
-    /**
-     * Test feature specific to TagAwareAdapter as it implicit needs to save deferred when also saving expiry info.
-     */
-    public function testInvalidateCommitsSeperatePools()
+    public function testInvalidTag()
+    {
+        $this->expectException('Psr\Cache\InvalidArgumentException');
+        $pool = $this->createCachePool();
+        $item = $pool->getItem('foo');
+        $item->tag(':');
+    }
+
+    public function testInvalidateTags()
+    {
+        $pool = $this->createCachePool();
+
+        $i0 = $pool->getItem('i0');
+        $i1 = $pool->getItem('i1');
+        $i2 = $pool->getItem('i2');
+        $i3 = $pool->getItem('i3');
+        $foo = $pool->getItem('foo');
+
+        $pool->save($i0->tag('bar'));
+        $pool->save($i1->tag('foo'));
+        $pool->save($i2->tag('foo')->tag('bar'));
+        $pool->save($i3->tag('foo')->tag('baz'));
+        $pool->save($foo);
+
+        $pool->invalidateTags(['bar']);
+
+        $this->assertFalse($pool->getItem('i0')->isHit());
+        $this->assertTrue($pool->getItem('i1')->isHit());
+        $this->assertFalse($pool->getItem('i2')->isHit());
+        $this->assertTrue($pool->getItem('i3')->isHit());
+        $this->assertTrue($pool->getItem('foo')->isHit());
+
+        $pool->invalidateTags(['foo']);
+
+        $this->assertFalse($pool->getItem('i1')->isHit());
+        $this->assertFalse($pool->getItem('i3')->isHit());
+        $this->assertTrue($pool->getItem('foo')->isHit());
+
+        $anotherPoolInstance = $this->createCachePool();
+
+        $this->assertFalse($anotherPoolInstance->getItem('i1')->isHit());
+        $this->assertFalse($anotherPoolInstance->getItem('i3')->isHit());
+        $this->assertTrue($anotherPoolInstance->getItem('foo')->isHit());
+    }
+
+    public function testInvalidateCommits()
     {
         $pool1 = $this->createCachePool();
 
@@ -54,6 +94,62 @@ class TagAwareAdapterTest extends AdapterTestCase
         $this->assertTrue($foo->isHit());
     }
 
+    public function testTagsAreCleanedOnSave()
+    {
+        $pool = $this->createCachePool();
+
+        $i = $pool->getItem('k');
+        $pool->save($i->tag('foo'));
+
+        $i = $pool->getItem('k');
+        $pool->save($i->tag('bar'));
+
+        $pool->invalidateTags(['foo']);
+        $this->assertTrue($pool->getItem('k')->isHit());
+    }
+
+    public function testTagsAreCleanedOnDelete()
+    {
+        $pool = $this->createCachePool();
+
+        $i = $pool->getItem('k');
+        $pool->save($i->tag('foo'));
+        $pool->deleteItem('k');
+
+        $pool->save($pool->getItem('k'));
+        $pool->invalidateTags(['foo']);
+
+        $this->assertTrue($pool->getItem('k')->isHit());
+    }
+
+    public function testTagItemExpiry()
+    {
+        $pool = $this->createCachePool(10);
+
+        $item = $pool->getItem('foo');
+        $item->tag(['baz']);
+        $item->expiresAfter(100);
+
+        $pool->save($item);
+        $pool->invalidateTags(['baz']);
+        $this->assertFalse($pool->getItem('foo')->isHit());
+
+        sleep(20);
+
+        $this->assertFalse($pool->getItem('foo')->isHit());
+    }
+
+    public function testGetPreviousTags()
+    {
+        $pool = $this->createCachePool();
+
+        $i = $pool->getItem('k');
+        $pool->save($i->tag('foo'));
+
+        $i = $pool->getItem('k');
+        $this->assertSame(['foo' => 'foo'], $i->getPreviousTags());
+    }
+
     public function testPrune()
     {
         $cache = new TagAwareAdapter($this->getPruneableMock());
@@ -160,6 +256,25 @@ class TagAwareAdapterTest extends AdapterTestCase
         $this->assertFalse($anotherPool->hasItem($itemKey));
     }
 
+    public function testInvalidateTagsWithArrayAdapter()
+    {
+        $adapter = new TagAwareAdapter(new ArrayAdapter());
+
+        $item = $adapter->getItem('foo');
+
+        $this->assertFalse($item->isHit());
+
+        $item->tag('bar');
+        $item->expiresAfter(100);
+        $adapter->save($item);
+
+        $this->assertTrue($adapter->getItem('foo')->isHit());
+
+        $adapter->invalidateTags(['bar']);
+
+        $this->assertFalse($adapter->getItem('foo')->isHit());
+    }
+
     public function testGetItemReturnsCacheMissWhenPoolDoesNotHaveItemAndOnlyHasTags()
     {
         $pool = $this->createCachePool();