8000 [Serializer] fix upper camel case conversion (see #21399) by markusu49 · Pull Request #21400 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 16, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
}
}

Expand Down
21 changes: 12 additions & 9 deletions ...ymfony/Component/Serializer/Tests/NameConverter/CamelCaseToSnakeCaseNameConverterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
);
}
}
0