[HttpKernel] Fixed name resolution when the parent directory contain fordidden char for a class name

lyrixx · lyrixx · commit 819d10484c1f · 2015-01-14T20:04:43.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -308,7 +308,7 @@ public function locateResource($name, $dir = null, $first = true)
     public function getName()
     {
         if (null === $this->name) {
-            $this->name = preg_replace('/[^a-zA-Z0-9_]+/', '', basename($this->rootDir));
+            $this->name = preg_replace('/(^[0-9]*|[^a-zA-Z0-9_]+)/', '', basename($this->rootDir)) ?: 'app';
         }
 
         return $this->name;
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -386,6 +386,31 @@ public function testGetName()
         $this->assertEquals('Fixtures', $kernel->getName());
     }
 
+    public function getGetNameWithWeirdDirectoryTests()
+    {
+        return array(
+            array('app', 12345),
+            array('Application', '12345Application'),
+            array('Application12345', 'Application12345'),
+            array('Application12345', '12345Application12345'),
+        );
+    }
+
+    /** @dataProvider getGetNameWithWeirdDirectoryTests */
+    public function testGetNameWithWeirdDirectory($expected, $rootDir)
+    {
+        $kernel = new KernelForTest('test', true);
+        $p = new \ReflectionProperty($kernel, 'rootDir');
+        $p->setAccessible(true);
+        $p->setValue($kernel, $rootDir);
+
+        $p = new \ReflectionProperty($kernel, 'name');
+        $p->setAccessible(true);
+        $p->setValue($kernel, null);
+
+        $this->assertEquals($expected, $kernel->getName());
+    }
+
     public function testOverrideGetName()
     {
         $kernel = new KernelForOverrideName('test', true);

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ public function locateResource($name, $dir = null, $first = true)`
`308`	`308`	`public function getName()`
`309`	`309`	`{`
`310`	`310`	`if (null === $this->name) {`
`311`		`- $this->name = preg_replace('/[^a-zA-Z0-9_]+/', '', basename($this->rootDir));`
	`311`	`+ $this->name = preg_replace('/(^[0-9]*\|[^a-zA-Z0-9_]+)/', '', basename($this->rootDir)) ?: 'app';`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`return $this->name;`