merged branch GromNaN/dic-camelize (PR #8536)

fabpot · fabpot · commit d8b42aa750fe · 2013-07-21T14:07:55.000+02:00
This PR was merged into the 2.2 branch. Discussion ---------- [DependencyInjection] Fix Container::camelize to convert beginning and ending . and _ | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #7431 | License | MIT | Doc PR | n/a I'm using strtr to make the conversion in order to ensure that the behavior is the same as `Container::get`. From the test cases I've added, the following were not passing: Commits ------- 485d53a [DependencyInjection] Fix Container::camelize to convert beginning and ending chars
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -471,7 +471,7 @@ public function isScopeActive($name)
      */
     public static function camelize($id)
     {
-        return preg_replace_callback('/(^|_|\.)+(.)/', function ($match) { return ('.' === $match[1] ? '_' : '').strtoupper($match[2]); }, $id);
+        return strtr(ucwords(strtr($id, array('_' => ' ', '.' => '_ '))), array(' ' => ''));
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
@@ -30,6 +30,29 @@ public function testConstructor()
         $this->assertEquals(array('foo' => 'bar'), $sc->getParameterBag()->all(), '__construct() takes an array of parameters as its first argument');
     }
 
+    /**
+     * @dataProvider dataForTestCamelize
+     */
+    public function testCamelize($id, $expected)
+    {
+        $this->assertEquals($expected, Container::camelize($id), sprintf('Container::camelize("%s")', $id));
+    }
+
+    public function dataForTestCamelize()
+    {
+        return array(
+            array('foo_bar', 'FooBar'),
+            array('foo.bar', 'Foo_Bar'),
+            array('foo.bar_baz', 'Foo_BarBaz'),
+            array('foo._bar', 'Foo_Bar'),
+            array('foo_.bar', 'Foo_Bar'),
+            array('_foo', 'Foo'),
+            array('.foo', '_Foo'),
+            array('foo_', 'Foo'),
+            array('foo.', 'Foo_'),
+        );
+    }
+
     /**
      * @covers Symfony\Component\DependencyInjection\Container::compile
      */

Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,7 @@ public function isScopeActive($name)`
`471`	`471`	`*/`
`472`	`472`	`public static function camelize($id)`
`473`	`473`	`{`
`474`		`- return preg_replace_callback('/(^\|_\|\.)+(.)/', function ($match) { return ('.' === $match[1] ? '_' : '').strtoupper($match[2]); }, $id);`
	`474`	`+ return strtr(ucwords(strtr($id, array('_' => ' ', '.' => '_ '))), array(' ' => ''));`
`475`	`475`	`}`
`476`	`476`
`477`	`477`	`/**`