diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
markusu49 2017-01-25 09:09:50 +01:00
parent dd4e78c96d
commit 81e771ca1a
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php
View File

@ -44,14 +44,15 @@ class CamelCaseToSnakeCaseNameConverter implements NameConverterInterface
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]);
}
}

21
src/Symfony/Component/Serializer/Tests/NameConverter/CamelCaseToSnakeCaseNameConverterTest.php
View File

@ -27,27 +27,30 @@ class CamelCaseToSnakeCaseNameConverterTest extends \PHPUnit_Framework_TestCase
/**
* @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),
);
}
}