symfony
diff --git a/‎src/Symfony/Component/Cache/Simple/Psr6Cache.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Simple/Psr6Cache.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Cache/Simple/Psr6Cache.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Simple/Psr6Cache.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Cache/Tests/Fixtures/ExternalAdapter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Fixtures/ExternalAdapter.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Cache/Tests/Fixtures/ExternalAdapter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Fixtures/ExternalAdapter.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Cache/Tests/Simple/Psr6CacheTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Simple/Psr6CacheTest.php
+4-6Lines changed: 4 additions & 6 deletions b/‎src/Symfony/Component/Cache/Tests/Simple/Psr6CacheTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Simple/Psr6CacheTest.php
+4-6Lines changed: 4 additions & 6 deletions
diff --git a/‎src/Symfony/Component/Cache/Tests/Simple/Psr6CacheWithAdapterTest.php
Copy file name to clipboard
+25Lines changed: 25 additions & 0 deletions b/‎src/Symfony/Component/Cache/Tests/Simple/Psr6CacheWithAdapterTest.php
Copy file name to clipboard
+25Lines changed: 25 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Cache/Tests/Simple/Psr6CacheWithoutAdapterTest.php
Copy file name to clipboard
+25Lines changed: 25 additions & 0 deletions b/‎src/Symfony/Component/Cache/Tests/Simple/Psr6CacheWithoutAdapterTest.php
Copy file name to clipboard
+25Lines changed: 25 additions & 0 deletions
@@ -154,7 +154,7 @@ public function getMultiple($keys, $default = null)
                 $values[$key] = $item->isHit() ? $item->get() : $default;
             }
 
-            return $value;
+            return $values;
         }
 
         foreach ($items as $key => $item) {
 
@@ -24,9 +24,9 @@ class ExternalAdapter implements CacheItemPoolInterface
 {
     private $cache;
 
-    public function __construct()
+    public function __construct(int $defaultLifetime = 0)
     {
-        $this->cache = new ArrayAdapter();
+        $this->cache = new ArrayAdapter($defaultLifetime);
     }
 
     public function getItem($key)
 
@@ -11,20 +11,18 @@
 
 namespace Symfony\Component\Cache\Tests\Simple;
 
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Simple\Psr6Cache;
 
-/**
- * @group time-sensitive
- */
-class Psr6CacheTest extends CacheTestCase
+abstract class Psr6CacheTest extends CacheTestCase
 {
     protected $skippedTests = [
         'testPrune' => 'Psr6Cache just proxies',
     ];
 
     public function createSimpleCache($defaultLifetime = 0)
     {
-        return new Psr6Cache(new FilesystemAdapter('', $defaultLifetime));
+        return new Psr6Cache($this->createCacheItemPool($defaultLifetime));
     }
+
+    abstract protected function createCacheItemPool($defaultLifetime = 0);
 }
@@ -0,0 +1,25 @@
+<?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\Simple;
+
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+
+/**
+ * @group time-sensitive
+ */
+class Psr6CacheWithAdapterTest extends Psr6CacheTest
+{
+    protected function createCacheItemPool($defaultLifetime = 0)
+    {
+        return new FilesystemAdapter('', $defaultLifetime);
+    }
+}
@@ -0,0 +1,25 @@
+<?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\Simple;
+
+use Symfony\Component\Cache\Tests\Fixtures\ExternalAdapter;
+
+/**
+ * @group time-sensitive
+ */
+class Psr6CacheWithoutAdapterTest extends Psr6CacheTest
+{
+    protected function createCacheItemPool($defaultLifetime = 0)
+    {
+        return new ExternalAdapter($defaultLifetime);
+    }
+}
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public function getMultiple($keys, $default = null)`
`154`	`154`	`$values[$key] = $item->isHit() ? $item->get() : $default;`
`155`	`155`	`}`
`156`	`156`
`157`		`- return $value;`
	`157`	`+ return $values;`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`foreach ($items as $key => $item) {`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ class ExternalAdapter implements CacheItemPoolInterface`
`24`	`24`	`{`
`25`	`25`	`private $cache;`
`26`	`26`
`27`		`- public function __construct()`
	`27`	`+ public function __construct(int $defaultLifetime = 0)`
`28`	`28`	`{`
`29`		`- $this->cache = new ArrayAdapter();`
	`29`	`+ $this->cache = new ArrayAdapter($defaultLifetime);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public function getItem($key)`
Original file line number	Diff line number	Diff line change
`@@ -11,20 +11,18 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Cache\Tests\Simple;`
`13`	`13`
`14`		`-use Symfony\Component\Cache\Adapter\FilesystemAdapter;`
`15`	`14`	`use Symfony\Component\Cache\Simple\Psr6Cache;`
`16`	`15`
`17`		`-/**`
`18`		`- * @group time-sensitive`
`19`		`- */`
`20`		`-class Psr6CacheTest extends CacheTestCase`
	`16`	`+abstract class Psr6CacheTest extends CacheTestCase`
`21`	`17`	`{`
`22`	`18`	`protected $skippedTests = [`
`23`	`19`	`'testPrune' => 'Psr6Cache just proxies',`
`24`	`20`	`];`
`25`	`21`
`26`	`22`	`public function createSimpleCache($defaultLifetime = 0)`
`27`	`23`	`{`
`28`		`- return new Psr6Cache(new FilesystemAdapter('', $defaultLifetime));`
	`24`	`+ return new Psr6Cache($this->createCacheItemPool($defaultLifetime));`
`29`	`25`	`}`
	`26`	`+`
	`27`	`+ abstract protected function createCacheItemPool($defaultLifetime = 0);`
`30`	`28`	`}`