[FrameworkBundle] Make APP_*_DIR relative to the project directory

Author: nicolas-grekas

Kernel/MicroKernelTrait.php

@@ -108,30 +108,30 @@ private function getBundlesPath(): string
 
     public function getCacheDir(): string
     {
-        if (isset($_SERVER['APP_CACHE_DIR'])) {
-            return $_SERVER['APP_CACHE_DIR'].'/'.$this->environment;
+        if (null !== $dir = $_SERVER['APP_CACHE_DIR'] ?? null) {
+            return $this->getEnvDir($dir);
         }
 
         return parent::getCacheDir();
     }
 
     public function getBuildDir(): string
     {
-        if (isset($_SERVER['APP_BUILD_DIR'])) {
-            return $_SERVER['APP_BUILD_DIR'].'/'.$this->environment;
+        if (null !== $dir = $_SERVER['APP_BUILD_DIR'] ?? null) {
+            return $this->getEnvDir($dir);
         }
 
         return parent::getBuildDir();
     }
 
     public function getShareDir(): ?string
     {
-        if (isset($_SERVER['APP_SHARE_DIR'])) {
-            if (false === $dir = filter_var($_SERVER['APP_SHARE_DIR'], \FILTER_VALIDATE_BOOL, \FILTER_NULL_ON_FAILURE) ?? $_SERVER['APP_SHARE_DIR']) {
+        if (null !== $dir = $_SERVER['APP_SHARE_DIR'] ?? null) {
+            if (false === $dir = filter_var($dir, \FILTER_VALIDATE_BOOL, \FILTER_NULL_ON_FAILURE) ?? $dir) {
                 return null;
             }
             if (\is_string($dir)) {
-                return $dir.'/'.$this->environment;
+                return $this->getEnvDir($dir);
             }
         }
 
@@ -267,4 +267,16 @@ protected function getKernelParameters(): array
 
         return $parameters;
     }
+
+    private function getEnvDir(string $dir): string
+    {
+        if ('' !== $dir && \in_array($dir[0], ['/', '\\'], true)) {
+            return $dir.'/'.$this->environment;
+        }
+        if ('\\' === \DIRECTORY_SEPARATOR && ':' === ($dir[1] ?? '') && 65 <= \ord($dir[0]) && \ord($dir[0]) <= 122 && !\in_array($dir[0], ['[', ']', '^', '_', '`'], true)) {
+            return $dir.'/'.$this->environment;
+        }
+
+        return $this->getProjectDir().'/'.$dir.'/'.$this->environment;
+    }
 }

Tests/Kernel/MicroKernelTraitTest.php

@@ -15,6 +15,7 @@
 use PHPUnit\Framework\TestCase;
 use Psr\Log\NullLogger;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\BufferedOutput;
@@ -245,4 +246,33 @@ public function testGetKernelParametersWithBundlesFile()
             'TestBundle' => ['test' => true, 'dev' => true],
         ], $parameters['.kernel.bundles_definition']);
     }
+
+    public function testRelativeEnvDirsAreResolvedFromProjectDir()
+    {
+        $_SERVER['APP_CACHE_DIR'] = 'var/custom-cache';
+        $_SERVER['APP_BUILD_DIR'] = 'var/custom-build';
+        $_SERVER['APP_SHARE_DIR'] = 'var/custom-share';
+
+        $projectDir = sys_get_temp_dir().'/sf_env_dir_kernel';
+        $kernel = new EnvDirKernel($projectDir);
+
+        $this->assertSame($projectDir.'/var/custom-cache/test', $kernel->getCacheDir());
+        $this->assertSame($projectDir.'/var/custom-build/test', $kernel->getBuildDir());
+        $this->assertSame($projectDir.'/var/custom-share/test', $kernel->getShareDir());
+    }
+}
+
+class EnvDirKernel extends Kernel
+{
+    use MicroKernelTrait;
+
+    public function __construct(private readonly string $projectDir)
+    {
+        parent::__construct('test', false);
+    }
+
+    public function getProjectDir(): string
+    {
+        return $this->projectDir;
+    }
 }