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

MetadataAwareNameConverter: Do not assume that property names are strings

Browse Source
This commit is contained in:
soyuka 2019-04-09 10:07:40 +02:00
parent 75b1157633
commit af1e136ca0
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/Serializer/NameConverter/MetadataAwareNameConverter.php
View File

@ -69,7 +69,7 @@ final class MetadataAwareNameConverter implements AdvancedNameConverterInterface
return self::$denormalizeCache[$class][$propertyName] ?? $this->denormalizeFallback($propertyName, $class, $format, $context); return self::$denormalizeCache[$class][$propertyName] ?? $this->denormalizeFallback($propertyName, $class, $format, $context);
} }
private function getCacheValueForNormalization(string $propertyName, string $class): ?string private function getCacheValueForNormalization($propertyName, string $class)
{ {
if (!$this->metadataFactory->hasMetadataFor($class)) { if (!$this->metadataFactory->hasMetadataFor($class)) {
return null; return null;
@ -83,12 +83,12 @@ final class MetadataAwareNameConverter implements AdvancedNameConverterInterface
return $attributesMetadata[$propertyName]->getSerializedName() ?? null; return $attributesMetadata[$propertyName]->getSerializedName() ?? null;
} }
private function normalizeFallback(string $propertyName, string $class = null, string $format = null, array $context = []): string private function normalizeFallback($propertyName, string $class = null, string $format = null, array $context = [])
{ {
return $this->fallbackNameConverter ? $this->fallbackNameConverter->normalize($propertyName, $class, $format, $context) : $propertyName; return $this->fallbackNameConverter ? $this->fallbackNameConverter->normalize($propertyName, $class, $format, $context) : $propertyName;
} }
private function getCacheValueForDenormalization(string $propertyName, string $class): ?string private function getCacheValueForDenormalization($propertyName, string $class)
{ {
if (!isset(self::$attributesMetadataCache[$class])) { if (!isset(self::$attributesMetadataCache[$class])) {
self::$attributesMetadataCache[$class] = $this->getCacheValueForAttributesMetadata($class); self::$attributesMetadataCache[$class] = $this->getCacheValueForAttributesMetadata($class);
@ -97,7 +97,7 @@ final class MetadataAwareNameConverter implements AdvancedNameConverterInterface
return self::$attributesMetadataCache[$class][$propertyName] ?? null; return self::$attributesMetadataCache[$class][$propertyName] ?? null;
} }
private function denormalizeFallback(string $propertyName, string $class = null, string $format = null, array $context = []): string private function denormalizeFallback($propertyName, string $class = null, string $format = null, array $context = [])
{ {
return $this->fallbackNameConverter ? $this->fallbackNameConverter->denormalize($propertyName, $class, $format, $context) : $propertyName; return $this->fallbackNameConverter ? $this->fallbackNameConverter->denormalize($propertyName, $class, $format, $context) : $propertyName;
} }

2
src/Symfony/Component/Serializer/Tests/NameConverter/MetadataAwareNameConverterTest.php
View File

@ -102,6 +102,7 @@ final class MetadataAwareNameConverterTest extends TestCase
['foo', 'baz'], ['foo', 'baz'],
['bar', 'qux'], ['bar', 'qux'],
['quux', 'quux'], ['quux', 'quux'],
[0, 0],
]; ];
} }
@ -111,6 +112,7 @@ final class MetadataAwareNameConverterTest extends TestCase
['foo', 'baz'], ['foo', 'baz'],
['bar', 'qux'], ['bar', 'qux'],
['quux', 'QUUX'], ['quux', 'QUUX'],
[0, 0],
]; ];
} }
} }