Fix kernel.project_dir extensibility

chalasr · chalasr · commit 9c1312eb2bc1 · 2017-05-17T11:38:34.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -604,7 +604,7 @@ protected function getKernelParameters()
         return array_merge(
             array(
                 'kernel.root_dir' => realpath($this->rootDir) ?: $this->rootDir,
-                'kernel.project_dir' => realpath($this->projectDir) ?: $this->projectDir,
+                'kernel.project_dir' => realpath($this->getProjectDir()) ?: $this->getProjectDir(),
                 'kernel.environment' => $this->environment,
                 'kernel.debug' => $this->debug,
                 'kernel.name' => $this->name,
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpKernel\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 use Symfony\Component\HttpKernel\Config\EnvParametersResource;
@@ -761,6 +762,21 @@ public function testSymfonyEnvironmentVariables()
         unset($_SERVER['SYMFONY__FOO__BAR']);
     }
 
+    public function testProjectDirExtension()
+    {
+        $kernel = $this->getKernel(array('initializeBundles', 'initializeContainer', 'getProjectDir'));
+        $kernel
+            ->expects($this->atLeastOnce())
+            ->method('getProjectDir')
+            ->willReturn('foo');
+        $kernel->boot();
+
+        $r = new \ReflectionMethod($kernel, 'getKernelParameters');
+        $r->setAccessible(true);
+        $kernelParameters = $r->invoke($kernel);
+        $this->assertSame('foo', $kernelParameters['kernel.project_dir']);
+    }
+
     /**
      * Returns a mock for the BundleInterface.
      *
