minor #29032 [HttpKernel] Fix BC break in Kernel name (jvasseur)

Tobion · Tobion · commit 887af353a498 · 2018-10-31T02:48:42.000+01:00
This PR was merged into the 4.2-dev branch. Discussion ---------- [HttpKernel] Fix BC break in Kernel name | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Fix a BC break introduced by #28810 where the name of the kernel where change form the name of the folder containing the kernel class to the name of the folder containing the project. This introduced a bug with deployment processes where the cache warmup is done before moving the application to a folder with a different name and removing the possibility to compile the container (either by moving to a read-only filesystem or by removing the config directory). Commits ------- 872a772 Fix BC break in Kernel name
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -286,7 +286,7 @@ public function getName(/* $triggerDeprecation = true */)
         }
 
         if (null === $this->name) {
-            $this->name = preg_replace('/[^a-zA-Z0-9_]+/', '', basename($this->getProjectDir()));
+            $this->name = preg_replace('/[^a-zA-Z0-9_]+/', '', basename($this->rootDir));
             if (ctype_digit($this->name[0])) {
                 $this->name = '_'.$this->name;
             }
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -75,7 +75,7 @@ public function testInitializeContainerClearsOldContainers()
         $kernel->boot();
 
         $containerDir = __DIR__.'/Fixtures/var/cache/custom/'.substr(\get_class($kernel->getContainer()), 0, 16);
-        $this->assertTrue(unlink(__DIR__.'/Fixtures/var/cache/custom/FixturesSymfony_Component_HttpKernel_Tests_CustomProjectDirKernelCustomDebugContainer.php.meta'));
+        $this->assertTrue(unlink(__DIR__.'/Fixtures/var/cache/custom/TestsSymfony_Component_HttpKernel_Tests_CustomProjectDirKernelCustomDebugContainer.php.meta'));
         $this->assertFileExists($containerDir);
         $this->assertFileNotExists($containerDir.'.legacy');
 
@@ -312,7 +312,7 @@ public function testGetName()
     {
         $kernel = new KernelForTest('test', true);
 
-        $this->assertEquals('HttpKernel', $kernel->getName());
+        $this->assertEquals('Fixtures', $kernel->getName());
     }
 
     /**
@@ -533,14 +533,14 @@ public function testKernelReset()
 
         $containerClass = \get_class($kernel->getContainer());
         $containerFile = (new \ReflectionClass($kernel->getContainer()))->getFileName();
-        unlink(__DIR__.'/Fixtures/var/cache/custom/FixturesSymfony_Component_HttpKernel_Tests_CustomProjectDirKernelCustomDebugContainer.php.meta');
+        unlink(__DIR__.'/Fixtures/var/cache/custom/TestsSymfony_Component_HttpKernel_Tests_CustomProjectDirKernelCustomDebugContainer.php.meta');
 
         $kernel = new CustomProjectDirKernel();
         $kernel->boot();
 
         $this->assertInstanceOf($containerClass, $kernel->getContainer());
         $this->assertFileExists($containerFile);
-        unlink(__DIR__.'/Fixtures/var/cache/custom/FixturesSymfony_Component_HttpKernel_Tests_CustomProjectDirKernelCustomDebugContainer.php.meta');
+        unlink(__DIR__.'/Fixtures/var/cache/custom/TestsSymfony_Component_HttpKernel_Tests_CustomProjectDirKernelCustomDebugContainer.php.meta');
 
         $kernel = new CustomProjectDirKernel(function ($container) { $container->register('foo', 'stdClass')->setPublic(true); });
         $kernel->boot();

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ public function getName(/* $triggerDeprecation = true */)`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`if (null === $this->name) {`
`289`		`- $this->name = preg_replace('/[^a-zA-Z0-9_]+/', '', basename($this->getProjectDir()));`
	`289`	`+ $this->name = preg_replace('/[^a-zA-Z0-9_]+/', '', basename($this->rootDir));`
`290`	`290`	`if (ctype_digit($this->name[0])) {`
`291`	`291`	`$this->name = '_'.$this->name;`
`292`	`292`	`}`