[FrameworkBundle] Fix cache warmers tests

Author: MatTheCat

Tests/CacheWarmer/SerializerCacheWarmerTest.php

@@ -21,6 +21,23 @@
 
 class SerializerCacheWarmerTest extends TestCase
 {
+    private PhpArrayAdapter $arrayPool;
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        if (isset($this->arrayPool)) {
+            $this->arrayPool->clear();
+            unset($this->arrayPool);
+        }
+    }
+
+    private function getArrayPool(string $file): PhpArrayAdapter
+    {
+        return $this->arrayPool = new PhpArrayAdapter($file, new NullAdapter());
+    }
+
     /**
      * @dataProvider loaderProvider
      */
@@ -34,7 +51,7 @@ public function testWarmUp(array $loaders)
 
         $this->assertFileExists($file);
 
-        $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
+        $arrayPool = $this->getArrayPool($file);
 
         $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Person')->isHit());
         $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Author')->isHit());
@@ -56,7 +73,7 @@ public function testWarmUpAbsoluteFilePath(array $loaders)
         $this->assertFileExists($file);
         $this->assertFileDoesNotExist($cacheDir.'/cache-serializer.php');
 
-        $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
+        $arrayPool = $this->getArrayPool($file);
 
         $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Person')->isHit());
         $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Author')->isHit());
@@ -75,10 +92,10 @@ public function testWarmUpWithoutBuildDir(array $loaders)
 
         $this->assertFileDoesNotExist($file);
 
-        $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
+        $arrayPool = $this->getArrayPool($file);
 
-        $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Person')->isHit());
-        $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Author')->isHit());
+        $this->assertFalse($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Person')->isHit());
+        $this->assertFalse($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Author')->isHit());
     }
 
     public static function loaderProvider(): array

Tests/CacheWarmer/ValidatorCacheWarmerTest.php

@@ -20,6 +20,23 @@
 
 class ValidatorCacheWarmerTest extends TestCase
 {
+    private PhpArrayAdapter $arrayPool;
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        if (isset($this->arrayPool)) {
+            $this->arrayPool->clear();
+            unset($this->arrayPool);
+        }
+    }
+
+    private function getArrayPool(string $file): PhpArrayAdapter
+    {
+        return $this->arrayPool = new PhpArrayAdapter($file, new NullAdapter());
+    }
+
     public function testWarmUp()
     {
         $validatorBuilder = new ValidatorBuilder();
@@ -36,7 +53,7 @@ public function testWarmUp()
 
         $this->assertFileExists($file);
 
-        $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
+        $arrayPool = $this->getArrayPool($file);
 
         $this->assertTrue($arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Person')->isHit());
         $this->assertTrue($arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Author')->isHit());
@@ -61,7 +78,7 @@ public function testWarmUpAbsoluteFilePath()
         $this->assertFileExists($file);
         $this->assertFileDoesNotExist($cacheDir.'/cache-validator.php');
 
-        $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
+        $arrayPool = $this->getArrayPool($file);
 
         $this->assertTrue($arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Person')->isHit());
         $this->assertTrue($arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Author')->isHit());
@@ -83,10 +100,10 @@ public function testWarmUpWithoutBuilDir()
 
         $this->assertFileDoesNotExist($file);
 
-        $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
+        $arrayPool = $this->getArrayPool($file);
 
-        $this->assertTrue($arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Person')->isHit());
-        $this->assertTrue($arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Author')->isHit());
+        $this->assertFalse($arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Person')->isHit());
+        $this->assertFalse($arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Author')->isHit());
     }
 
     public function testWarmUpWithAnnotations()
@@ -103,7 +120,7 @@ public function testWarmUpWithAnnotations()
 
         $this->assertFileExists($file);
 
-        $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
+        $arrayPool = $this->getArrayPool($file);
 
         $item = $arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Category');
         $this->assertTrue($item->isHit());