ignore leading underscores in base normalizer

In #1267, a new normalizer class was introduced that ignores underscores
when converting snake case to camel case. However, the same change was
made to the base class. This means that both classes act in exactly the
same way. Furthermore, this change was a BC break as the behavior of the
base normalizer class was changed without fixing an actual bug.

Author: xabbuh

Normalizer/CamelKeysNormalizer.php

@@ -39,27 +39,30 @@ public function normalize(array $data)
      */
     private function normalizeArray(array &$data)
     {
+        $normalizedData = array();
+
         foreach ($data as $key => $val) {
             $normalizedKey = $this->normalizeString($key);
 
             if ($normalizedKey !== $key) {
-                if (array_key_exists($normalizedKey, $data)) {
+                if (array_key_exists($normalizedKey, $normalizedData)) {
                     throw new NormalizationException(sprintf(
                         'The key "%s" is invalid as it will override the existing key "%s"',
                         $key,
                         $normalizedKey
                     ));
                 }
-
-                unset($data[$key]);
-                $data[$normalizedKey] = $val;
-                $key = $normalizedKey;
             }
 
+            $normalizedData[$normalizedKey] = $val;
+            $key = $normalizedKey;
+
             if (is_array($val)) {
-                $this->normalizeArray($data[$key]);
+                $this->normalizeArray($normalizedData[$key]);
             }
         }
+
+        $data = $normalizedData;
     }
 
     /**
@@ -75,17 +78,8 @@ protected function normalizeString($string)
             return $string;
         }
 
-        if (preg_match('/^(_+)(.*)/', $string, $matches)) {
-            $underscorePrefix = $matches[1];
-            $string = $matches[2];
-        } else {
-            $underscorePrefix = '';
-        }
-
-        $string = preg_replace_callback('/_([a-zA-Z0-9])/', function ($matches) {
+        return preg_replace_callback('/_([a-zA-Z0-9])/', function ($matches) {
             return strtoupper($matches[1]);
         }, $string);
-
-        return $underscorePrefix.$string;
     }
 }

Tests/Normalizer/CamelKeysNormalizerTest.php

@@ -41,21 +41,14 @@ public function testNormalize(array $array, array $expected)
 
     public function normalizeProvider()
     {
-        return array(
-            array(array(), array()),
-            array(
-                array('foo' => array('Foo_bar_baz' => array('foo_Bar' => array('foo_bar' => 'foo_bar'))),
-                    'foo_1ar' => array('foo_bar'),
-                ),
-                array('foo' => array('FooBarBaz' => array('fooBar' => array('fooBar' => 'foo_bar'))),
-                    'foo1ar' => array('foo_bar'),
-                ),
-            ),
-        );
+        $array = $this->normalizeProviderCommon();
+        $array[] = array(array('__username' => 'foo', '_password' => 'bar', '_foo_bar' => 'foobar'), array('_Username' => 'foo', 'Password' => 'bar', 'FooBar' => 'foobar'));
+
+        return $array;
     }
 
     /**
-     * @dataProvider normalizeProvider
+     * @dataProvider normalizeProviderLeadingUnderscore
      */
     public function testNormalizeLeadingUnderscore(array $array, array $expected)
     {
@@ -65,9 +58,24 @@ public function testNormalizeLeadingUnderscore(array $array, array $expected)
 
     public function normalizeProviderLeadingUnderscore()
     {
-        $array = $this->normalizeProvider();
+        $array = $this->normalizeProviderCommon();
         $array[] = array(array('__username' => 'foo', '_password' => 'bar', '_foo_bar' => 'foobar'), array('__username' => 'foo', '_password' => 'bar', '_fooBar' => 'foobar'));
 
         return $array;
     }
+
+    private function normalizeProviderCommon()
+    {
+        return array(
+            array(array(), array()),
+            array(
+                array('foo' => array('Foo_bar_baz' => array('foo_Bar' => array('foo_bar' => 'foo_bar'))),
+                    'foo_1ar' => array('foo_bar'),
+                ),
+                array('foo' => array('FooBarBaz' => array('fooBar' => array('fooBar' => 'foo_bar'))),
+                    'foo1ar' => array('foo_bar'),
+                ),
+            ),
+        );
+    }
 }