bug #21400 [Serializer] fix upper camel case conversion (see #21399) (markusu49)

fabpot · fabpot · commit d1f4cb27fd69 · 2017-02-16T05:20:16.000-08:00
This PR was merged into the 2.7 branch. Discussion ---------- [Serializer] fix upper camel case conversion (see #21399) | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | ? | Deprecations? | no | Tests pass? | yes | Fixed tickets | #21399 | License | MIT Improve upper camel case support of CamelCaseToSnakeCaseConverter (`ThisIsATest` now converts to `this_is_a_test` instead of `_this_is_a_test`). Commits ------- 81e771c [Serializer] fix upper camel case conversion (see #21399)
diff --git a/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php b/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php
@@ -44,14 +44,15 @@ public function __construct(array $attributes = null, $lowerCamelCase = true)
     public function normalize($propertyName)
     {
         if (null === $this->attributes || in_array($propertyName, $this->attributes)) {
+            $lcPropertyName = lcfirst($propertyName);
             $snakeCasedName = '';
 
-            $len = strlen($propertyName);
+            $len = strlen($lcPropertyName);
             for ($i = 0; $i < $len; ++$i) {
-                if (ctype_upper($propertyName[$i])) {
-                    $snakeCasedName .= '_'.strtolower($propertyName[$i]);
+                if (ctype_upper($lcPropertyName[$i])) {
+                    $snakeCasedName .= '_'.strtolower($lcPropertyName[$i]);
                 } else {
-                    $snakeCasedName .= strtolower($propertyName[$i]);
+                    $snakeCasedName .= strtolower($lcPropertyName[$i]);
                 }
             }
 
diff --git a/src/Symfony/Component/Serializer/Tests/NameConverter/CamelCaseToSnakeCaseNameConverterTest.php b/src/Symfony/Component/Serializer/Tests/NameConverter/CamelCaseToSnakeCaseNameConverterTest.php
@@ -27,27 +27,30 @@ public function testInterface()
     /**
      * @dataProvider attributeProvider
      */
-    public function testNormalize($underscored, $lowerCamelCased)
+    public function testNormalize($underscored, $camelCased, $useLowerCamelCase)
     {
-        $nameConverter = new CamelCaseToSnakeCaseNameConverter();
-        $this->assertEquals($nameConverter->normalize($lowerCamelCased), $underscored);
+        $nameConverter = new CamelCaseToSnakeCaseNameConverter(null, $useLowerCamelCase);
+        $this->assertEquals($nameConverter->normalize($camelCased), $underscored);
     }
 
     /**
      * @dataProvider attributeProvider
      */
-    public function testDenormalize($underscored, $lowerCamelCased)
+    public function testDenormalize($underscored, $camelCased, $useLowerCamelCase)
     {
-        $nameConverter = new CamelCaseToSnakeCaseNameConverter();
-        $this->assertEquals($nameConverter->denormalize($underscored), $lowerCamelCased);
+        $nameConverter = new CamelCaseToSnakeCaseNameConverter(null, $useLowerCamelCase);
+        $this->assertEquals($nameConverter->denormalize($underscored), $camelCased);
     }
 
     public function attributeProvider()
     {
         return array(
-            array('coop_tilleuls', 'coopTilleuls'),
-            array('_kevin_dunglas', '_kevinDunglas'),
-            array('this_is_a_test', 'thisIsATest'),
+            array('coop_tilleuls', 'coopTilleuls', true),
+            array('_kevin_dunglas', '_kevinDunglas', true),
+            array('this_is_a_test', 'thisIsATest', true),
+            array('coop_tilleuls', 'CoopTilleuls', false),
+            array('_kevin_dunglas', '_kevinDunglas', false),
+            array('this_is_a_test', 'ThisIsATest', false),
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -44,14 +44,15 @@ public function __construct(array $attributes = null, $lowerCamelCase = true)`
`44`	`44`	`public function normalize($propertyName)`
`45`	`45`	`{`
`46`	`46`	`if (null === $this->attributes \|\| in_array($propertyName, $this->attributes)) {`
	`47`	`+ $lcPropertyName = lcfirst($propertyName);`
`47`	`48`	`$snakeCasedName = '';`
`48`	`49`
`49`		`- $len = strlen($propertyName);`
	`50`	`+ $len = strlen($lcPropertyName);`
`50`	`51`	`for ($i = 0; $i < $len; ++$i) {`
`51`		`- if (ctype_upper($propertyName[$i])) {`
`52`		`- $snakeCasedName .= '_'.strtolower($propertyName[$i]);`
	`52`	`+ if (ctype_upper($lcPropertyName[$i])) {`
	`53`	`+ $snakeCasedName .= '_'.strtolower($lcPropertyName[$i]);`
`53`	`54`	`} else {`
`54`		`- $snakeCasedName .= strtolower($propertyName[$i]);`
	`55`	`+ $snakeCasedName .= strtolower($lcPropertyName[$i]);`
`55`	`56`	`}`
`56`	`57`	`}`
`57`	`58`
Original file line number	Diff line number	Diff line change
`@@ -27,27 +27,30 @@ public function testInterface()`
`27`	`27`	`/**`
`28`	`28`	`* @dataProvider attributeProvider`
`29`	`29`	`*/`
`30`		`- public function testNormalize($underscored, $lowerCamelCased)`
	`30`	`+ public function testNormalize($underscored, $camelCased, $useLowerCamelCase)`
`31`	`31`	`{`
`32`		`- $nameConverter = new CamelCaseToSnakeCaseNameConverter();`
`33`		`- $this->assertEquals($nameConverter->normalize($lowerCamelCased), $underscored);`
	`32`	`+ $nameConverter = new CamelCaseToSnakeCaseNameConverter(null, $useLowerCamelCase);`
	`33`	`+ $this->assertEquals($nameConverter->normalize($camelCased), $underscored);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`/**`
`37`	`37`	`* @dataProvider attributeProvider`
`38`	`38`	`*/`
`39`		`- public function testDenormalize($underscored, $lowerCamelCased)`
	`39`	`+ public function testDenormalize($underscored, $camelCased, $useLowerCamelCase)`
`40`	`40`	`{`
`41`		`- $nameConverter = new CamelCaseToSnakeCaseNameConverter();`
`42`		`- $this->assertEquals($nameConverter->denormalize($underscored), $lowerCamelCased);`
	`41`	`+ $nameConverter = new CamelCaseToSnakeCaseNameConverter(null, $useLowerCamelCase);`
	`42`	`+ $this->assertEquals($nameConverter->denormalize($underscored), $camelCased);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`public function attributeProvider()`
`46`	`46`	`{`
`47`	`47`	`return array(`
`48`		`- array('coop_tilleuls', 'coopTilleuls'),`
`49`		`- array('_kevin_dunglas', '_kevinDunglas'),`
`50`		`- array('this_is_a_test', 'thisIsATest'),`
	`48`	`+ array('coop_tilleuls', 'coopTilleuls', true),`
	`49`	`+ array('_kevin_dunglas', '_kevinDunglas', true),`
	`50`	`+ array('this_is_a_test', 'thisIsATest', true),`
	`51`	`+ array('coop_tilleuls', 'CoopTilleuls', false),`
	`52`	`+ array('_kevin_dunglas', '_kevinDunglas', false),`
	`53`	`+ array('this_is_a_test', 'ThisIsATest', false),`
`51`	`54`	`);`
`52`	`55`	`}`
`53`	`56`	`}`