Merge branch '5.x' into 6.x

Author: jasonvarga

src/Stache/Duplicates.php

@@ -79,13 +79,17 @@ public function getItems()
 
     public function find()
     {
+        $lock = tap($this->stache->lock('stache-warming'))->acquire(true);
+
         $this->stache->stores()->flatMap(function ($store) {
             return $store instanceof AggregateStore ? $store->discoverStores() : [$store];
         })->each(function ($store) {
             $store->clearCachedPaths();
             $store->paths();
         });
 
+        $lock->release();
+
         return $this;
     }
 

tests/Stache/DuplicatesTest.php

@@ -192,8 +192,13 @@ public function it_finds_all_the_duplicates()
         $store3 = $this->mock(AggregateStore::class);
         $store3->shouldReceive('discoverStores')->once()->andReturn([$childStore]);
 
+        $lock = $this->mock(\Symfony\Component\Lock\LockInterface::class);
+        $lock->shouldReceive('acquire')->with(true)->once()->andReturnTrue();
+        $lock->shouldReceive('release')->once();
+
         $stache = $this->mock(Stache::class);
         $stache->shouldReceive('stores')->andReturn(collect([$store1, $store2, $store3]));
+        $stache->shouldReceive('lock')->with('stache-warming')->once()->andReturn($lock);
 
         $duplicates = (new Duplicates($stache));