[FrameworkBundle] Make SerializeCacheWarmer use kernel.build_dir instead of cache_dir

okhoshi · okhoshi · commit 5a11934cd721 · 2024-03-23T21:38:35.000+01:00
Signed-off-by: Quentin Devos &lt;4972091+Okhoshi@users.noreply.github.com&gt;
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -11,6 +11,7 @@ CHANGELOG
  * Deprecate the `router.cache_dir` config option
  * Remove `AbstractPhpFileCacheWarmer`'s constructor argument, override new `getPhpArrayFile` method instead
  * Make `ValidatorCacheWarmer` use `kernel.build_dir` instead of `cache_dir`
+ * Make `SerializeCacheWarmer` use `kernel.build_dir` instead of `cache_dir`
  * Add `rate_limiter` tags to rate limiter services
  * Add `secrets:reveal` command
  * Add `rate_limiter` option to `http_client.default_options` and `http_client.scoped_clients`
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;
 
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Filesystem\Path;
 use Symfony\Component\Serializer\Mapping\Factory\CacheClassMetadataFactory;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
 use Symfony\Component\Serializer\Mapping\Loader\LoaderChain;
@@ -34,13 +35,16 @@ class SerializerCacheWarmer extends AbstractPhpFileCacheWarmer
      */
     public function __construct(
         private array $loaders,
-        string $phpArrayFile,
+        private string $phpArrayFile,
     ) {
-        parent::__construct($phpArrayFile);
+        parent::__construct();
     }
 
     protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, ?string $buildDir = null): bool
     {
+        if (!$buildDir) {
+            return false;
+        }
         if (!$this->loaders) {
             return true;
         }
@@ -60,6 +64,19 @@ protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, ?strin
         return true;
     }
 
+    protected function getPhpArrayFile(string $cacheDir, ?string $buildDir = null): ?string
+    {
+        if (!$buildDir) {
+            return null;
+        }
+
+        if (Path::isRelative($this->phpArrayFile)) {
+            return Path::join($buildDir, $this->phpArrayFile);
+        }
+
+        return $this->phpArrayFile;
+    }
+
     /**
      * @param LoaderInterface[] $loaders
      *
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php
@@ -54,7 +54,7 @@
 
 return static function (ContainerConfigurator $container) {
     $container->parameters()
-        ->set('serializer.mapping.cache.file', '%kernel.cache_dir%/serialization.php')
+        ->set('serializer.mapping.cache.file', 'serialization.php')
     ;
 
     $container->services()
@@ -160,7 +160,10 @@
 
         ->set('serializer.mapping.cache.symfony', CacheItemPoolInterface::class)
             ->factory([PhpArrayAdapter::class, 'create'])
-            ->args([param('serializer.mapping.cache.file'), service('cache.serializer')])
+            ->args([
+                param('kernel.build_dir').'/'.param('serializer.mapping.cache.file'),
+                service('cache.serializer'),
+            ])
 
         ->set('serializer.mapping.cache_class_metadata_factory', CacheClassMetadataFactory::class)
             ->decorate('serializer.mapping.class_metadata_factory')
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/SerializerCacheWarmerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/SerializerCacheWarmerTest.php
@@ -29,10 +29,51 @@ public function testWarmUp(array $loaders)
         $file = sys_get_temp_dir().'/cache-serializer.php';
         @unlink($file);
 
+        $warmer = new SerializerCacheWarmer($loaders, basename($file));
+        $warmer->warmUp(\dirname($file), \dirname($file));
+
+        $this->assertFileExists($file);
+
+        $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
+
+        $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Person')->isHit());
+        $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Author')->isHit());
+    }
+
+    /**
+     * @dataProvider loaderProvider
+     */
+    public function testWarmUpAbsoluteFilePath(array $loaders)
+    {
+        $file = sys_get_temp_dir().'/0/cache-serializer.php';
+        @unlink($file);
+
+        $cacheDir = sys_get_temp_dir().'/1';
+
         $warmer = new SerializerCacheWarmer($loaders, $file);
-        $warmer->warmUp(\dirname($file));
+        $warmer->warmUp($cacheDir, $cacheDir);
 
         $this->assertFileExists($file);
+        $this->assertFileDoesNotExist($cacheDir.'/cache-serializer.php');
+
+        $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
+
+        $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Person')->isHit());
+        $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Author')->isHit());
+    }
+
+    /**
+     * @dataProvider loaderProvider
+     */
+    public function testWarmUpWithoutBuildDir(array $loaders)
+    {
+        $file = sys_get_temp_dir().'/cache-serializer.php';
+        @unlink($file);
+
+        $warmer = new SerializerCacheWarmer($loaders, basename($file));
+        $warmer->warmUp(\dirname($file));
+
+        $this->assertFileDoesNotExist($file);
 
         $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
 
@@ -65,8 +106,8 @@ public function testWarmUpWithoutLoader()
         $file = sys_get_temp_dir().'/cache-serializer-without-loader.php';
         @unlink($file);
 
-        $warmer = new SerializerCacheWarmer([], $file);
-        $warmer->warmUp(\dirname($file));
+        $warmer = new SerializerCacheWarmer([], basename($file));
+        $warmer->warmUp(\dirname($file), \dirname($file));
 
         $this->assertFileExists($file);
     }
@@ -79,15 +120,19 @@ public function testClassAutoloadException()
     {
         $this->assertFalse(class_exists($mappedClass = 'AClassThatDoesNotExist_FWB_CacheWarmer_SerializerCacheWarmerTest', false));
 
-        $warmer = new SerializerCacheWarmer([new YamlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/does_not_exist.yaml')], tempnam(sys_get_temp_dir(), __FUNCTION__));
+        $file = tempnam(sys_get_temp_dir(), __FUNCTION__);
+        @unlink($file);
+
+        $warmer = new SerializerCacheWarmer([new YamlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/does_not_exist.yaml')], basename($file));
 
         spl_autoload_register($classLoader = function ($class) use ($mappedClass) {
             if ($class === $mappedClass) {
                 throw new \DomainException('This exception should be caught by the warmer.');
             }
         }, true, true);
 
-        $warmer->warmUp('foo');
+        $warmer->warmUp(\dirname($file), \dirname($file));
+        $this->assertFileExists($file);
 
         spl_autoload_unregister($classLoader);
     }
@@ -103,7 +148,10 @@ public function testClassAutoloadExceptionWithUnrelatedException()
 
         $this->assertFalse(class_exists($mappedClass = 'AClassThatDoesNotExist_FWB_CacheWarmer_SerializerCacheWarmerTest', false));
 
-        $warmer = new SerializerCacheWarmer([new YamlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/does_not_exist.yaml')], tempnam(sys_get_temp_dir(), __FUNCTION__));
+        $file = tempnam(sys_get_temp_dir(), __FUNCTION__);
+        @unlink($file);
+
+        $warmer = new SerializerCacheWarmer([new YamlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/does_not_exist.yaml')], basename($file));
 
         spl_autoload_register($classLoader = function ($class) use ($mappedClass) {
             if ($class === $mappedClass) {
@@ -112,8 +160,12 @@ public function testClassAutoloadExceptionWithUnrelatedException()
             }
         }, true, true);
 
-        $warmer->warmUp('foo');
+        try {
+            $warmer->warmUp(\dirname($file), \dirname($file));
+        } finally {
+            $this->assertFileDoesNotExist($file);
 
-        spl_autoload_unregister($classLoader);
+            spl_autoload_unregister($classLoader);
+        }
     }
 }
