[DependencyInjection] Fix a limitation of the PhpDumper

GuilhemN · GuilhemN · commit 9f45283ef55b · 2016-03-14T20:21:02.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -58,6 +58,7 @@ class PhpDumper extends Dumper
     private $targetDirRegex;
     private $targetDirMaxMatches;
     private $docStar;
+    private $allocatedNames = array();
 
     /**
      * @var \Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface
@@ -1349,13 +1350,21 @@ private function getServiceCall($id, Reference $reference = null)
      */
     private function camelize($id)
     {
+        if (isset($this->allocatedNames[$id])) {
+            return $this->allocatedNames[$id];
+        }
+
         $name = Container::camelize($id);
+        $finalName = $name = preg_replace('/[^a-zA-Z0-9_\x7f-\xff]/', '', $name);
+        $prefix = 1;
 
-        if (!preg_match('/^[a-zA-Z0-9_\x7f-\xff]+$/', $name)) {
-            throw new InvalidArgumentException(sprintf('Service id "%s" cannot be converted to a valid PHP method name.', $id));
+        while (in_array($finalName, $this->allocatedNames)) {
+            $prefix++;
+            $finalName = $name.$prefix;
         }
+        $this->allocatedNames[$id] = $finalName;
 
-        return $name;
+        return $finalName;
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -132,16 +132,17 @@ public function testServicesWithAnonymousFactories()
         $this->assertStringEqualsFile(self::$fixturesPath.'/php/services19.php', $dumper->dump(), '->dump() dumps services with anonymous factories');
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Service id "bar$" cannot be converted to a valid PHP method name.
-     */
-    public function testAddServiceInvalidServiceId()
+    public function testAddServiceIdWithUnsupportedCharacters()
     {
         $container = new ContainerBuilder();
         $container->register('bar$', 'FooClass');
+        $container->register('bar$!', 'FooClass');
         $dumper = new PhpDumper($container);
-        $dumper->dump();
+        eval('?>'.$dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Unsupported_Characters')));
+
+        $container = new \Symfony_DI_PhpDumper_Test_Unsupported_Characters();
+        $this->assertTrue(method_exists($container, 'getBarService'));
+        $this->assertTrue(method_exists($container, 'getBar2Service'));
     }
 
     /**
