[HttpKernel] fixed Kernel name when stored in a directory starting with a number

fabpot · fabpot · commit f244eb84144c · 2017-03-05T14:37:48.000-08:00
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -302,6 +302,9 @@ public function getName()
     {
         if (null === $this->name) {
             $this->name = preg_replace('/[^a-zA-Z0-9_]+/', '', basename($this->rootDir));
+            if (ctype_digit($this->name[0])) {
+                $this->name = '_'.$this->name;
+            }
         }
 
         return $this->name;
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/123/Kernel123.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/123/Kernel123.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\Fixtures\_123;
+
+use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\Config\Loader\LoaderInterface;
+
+class Kernel123 extends Kernel
+{
+    public function registerBundles()
+    {
+        return array();
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+    }
+
+    public function getCacheDir()
+    {
+        return sys_get_temp_dir().'/'.Kernel::VERSION.'/kernel123/cache/'.$this->environment;
+    }
+
+    public function getLogDir()
+    {
+        return sys_get_temp_dir().'/'.Kernel::VERSION.'/kernel123/logs';
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -762,6 +762,14 @@ public function testTerminateDelegatesTerminationOnlyForTerminableInterface()
         $kernel->terminate(Request::create('/'), new Response());
     }
 
+    public function testKernelRootDirNameStartingWithANumber()
+    {
+        $dir = __DIR__.'/Fixtures/123';
+        require_once $dir.'/Kernel123.php';
+        $kernel = new \Symfony\Component\HttpKernel\Tests\Fixtures\_123\Kernel123('dev', true);
+        $this->assertEquals('_123', $kernel->getName());
+    }
+
     /**
      * Returns a mock for the BundleInterface.
      *

Original file line number	Diff line number	Diff line change
`@@ -302,6 +302,9 @@ public function getName()`
`302`	`302`	`{`
`303`	`303`	`if (null === $this->name) {`
`304`	`304`	`$this->name = preg_replace('/[^a-zA-Z0-9_]+/', '', basename($this->rootDir));`
	`305`	`+ if (ctype_digit($this->name[0])) {`
	`306`	`+ $this->name = '_'.$this->name;`
	`307`	`+ }`
`305`	`308`	`}`
`306`	`309`
`307`	`310`	`return $this->name;`
Original file line number	Diff line number	Diff line change
`@@ -762,6 +762,14 @@ public function testTerminateDelegatesTerminationOnlyForTerminableInterface()`
`762`	`762`	`$kernel->terminate(Request::create('/'), new Response());`
`763`	`763`	`}`
`764`	`764`
	`765`	`+ public function testKernelRootDirNameStartingWithANumber()`
	`766`	`+ {`
	`767`	`+ $dir = __DIR__.'/Fixtures/123';`
	`768`	`+ require_once $dir.'/Kernel123.php';`
	`769`	`+ $kernel = new \Symfony\Component\HttpKernel\Tests\Fixtures\_123\Kernel123('dev', true);`
	`770`	`+ $this->assertEquals('_123', $kernel->getName());`
	`771`	`+ }`
	`772`	`+`
`765`	`773`	`/**`
`766`	`774`	`* Returns a mock for the BundleInterface.`
`767`	`775`	`*`