Merge branch 'hotfix/2.0.3'

Author: Toflar

src/Psr6Store.php

@@ -135,7 +135,7 @@ public function __construct(array $options = [])
 
         $resolver->setDefault('lock_factory', function (Options $options) {
             if (!isset($options['cache_directory'])) {
-                throw new MissingOptionsException('The cache_directory option is required unless you set the cache explicitly');
+                throw new MissingOptionsException('The cache_directory option is required unless you set the lock_factory explicitly as by default locks are also stored in the configured cache_directory.');
             }
 
             return new Factory(
@@ -395,7 +395,14 @@ public function prune()
             return;
         }
 
-        $this->cache->prune();
+        // Make sure we do not have multiple pruning processes running
+        $lock = $this->lockFactory->createLock('prune-lock');
+
+        if ($lock->acquire()) {
+            $this->cache->prune();
+
+            $lock->release();
+        }
     }
 
     /**

tests/Psr6StoreTest.php

@@ -44,6 +44,18 @@ protected function tearDown()
         $this->store->cleanup();
     }
 
+    public function testCustomCacheWithoutLockFactory()
+    {
+        $this->expectException(MissingOptionsException::class);
+        $this->expectExceptionMessage('The cache_directory option is required unless you set the lock_factory explicitly as by default locks are also stored in the configured cache_directory.');
+
+        $cache = $this->createMock(TagAwareAdapterInterface::class);
+
+        new Psr6Store([
+            'cache' => $cache,
+        ]);
+    }
+
     public function testCustomCacheAndLockFactory()
     {
         $cache = $this->createMock(TagAwareAdapterInterface::class);
@@ -494,10 +506,27 @@ public function testAutoPruneExpiredEntries()
             ->expects($this->exactly(3))
             ->method('prune');
 
+        $lock = $this->createMock(LockInterface::class);
+        $lock
+            ->expects($this->exactly(3))
+            ->method('acquire')
+            ->willReturn(true);
+        $lock
+            ->expects($this->exactly(3))
+            ->method('release')
+            ->willReturn(true);
+
+        $lockFactory = $this->createMock(Factory::class);
+        $lockFactory
+            ->expects($this->any())
+            ->method('createLock')
+            ->with('prune-lock')
+            ->willReturn($lock);
+
         $store = new Psr6Store([
-            'cache_directory' => sys_get_temp_dir(),
             'cache' => $cache,
             'prune_threshold' => 5,
+            'lock_factory' => $lockFactory,
         ]);
 
         foreach (range(1, 21) as $entry) {
@@ -538,6 +567,47 @@ public function testAutoPruneIsSkippedIfThresholdDisabled()
         $store->cleanup();
     }
 
+    public function testAutoPruneIsSkippedIfPruningIsAlreadyInProgress()
+    {
+        $innerCache = new ArrayAdapter();
+        $cache = $this->getMockBuilder(TagAwareAdapter::class)
+            ->setConstructorArgs([$innerCache])
+            ->setMethods(['prune'])
+            ->getMock();
+
+        $cache
+            ->expects($this->never())
+            ->method('prune');
+
+        $lock = $this->createMock(LockInterface::class);
+        $lock
+            ->expects($this->exactly(3))
+            ->method('acquire')
+            ->willReturn(false);
+
+        $lockFactory = $this->createMock(Factory::class);
+        $lockFactory
+            ->expects($this->any())
+            ->method('createLock')
+            ->with('prune-lock')
+            ->willReturn($lock);
+
+        $store = new Psr6Store([
+            'cache' => $cache,
+            'prune_threshold' => 5,
+            'lock_factory' => $lockFactory,
+        ]);
+
+        foreach (range(1, 21) as $entry) {
+            $request = Request::create('https://foobar.com/'.$entry);
+            $response = new Response('hello world', 200);
+
+            $store->write($request, $response);
+        }
+
+        $store->cleanup();
+    }
+
     public function testItFailsWithoutCacheDirectoryForCache()
     {
         $this->expectException(MissingOptionsException::class);