[PropertyInfo] Support using the SerializerExtractor with no group check

GuilhemN · fabpot · commit 4190bfaf4851 · 2020-06-10T03:48:06.000+02:00
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/SerializerExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/SerializerExtractor.php
@@ -35,7 +35,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory)
      */
     public function getProperties(string $class, array $context = []): ?array
     {
-        if (!isset($context['serializer_groups']) || !\is_array($context['serializer_groups'])) {
+        if (!\array_key_exists('serializer_groups', $context) || (null !== $context['serializer_groups'] && !\is_array($context['serializer_groups']))) {
             return null;
         }
 
@@ -48,7 +48,7 @@ public function getProperties(string $class, array $context = []): ?array
 
         foreach ($serializerClassMetadata->getAttributesMetadata() as $serializerAttributeMetadata) {
             $ignored = method_exists($serializerClassMetadata, 'isIgnored') && $serializerAttributeMetadata->isIgnored();
-            if (!$ignored && array_intersect($context['serializer_groups'], $serializerAttributeMetadata->getGroups())) {
+            if (!$ignored && (null === $context['serializer_groups'] || array_intersect($context['serializer_groups'], $serializerAttributeMetadata->getGroups()))) {
                 $properties[] = $serializerAttributeMetadata->getName();
             }
         }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/SerializerExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/SerializerExtractorTest.php
@@ -40,4 +40,9 @@ public function testGetProperties()
             $this->extractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', ['serializer_groups' => ['a']])
         );
     }
+
+    public function testGetPropertiesWithAnyGroup()
+    {
+        $this->assertSame(['analyses', 'feet'], $this->extractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\AdderRemoverDummy', ['serializer_groups' => null]));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory)`
`35`	`35`	`*/`
`36`	`36`	`public function getProperties(string $class, array $context = []): ?array`
`37`	`37`	`{`
`38`		`- if (!isset($context['serializer_groups']) \|\| !\is_array($context['serializer_groups'])) {`
	`38`	`+ if (!\array_key_exists('serializer_groups', $context) \|\| (null !== $context['serializer_groups'] && !\is_array($context['serializer_groups']))) {`
`39`	`39`	`return null;`
`40`	`40`	`}`
`41`	`41`
`@@ -48,7 +48,7 @@ public function getProperties(string $class, array $context = []): ?array`
`48`	`48`
`49`	`49`	`foreach ($serializerClassMetadata->getAttributesMetadata() as $serializerAttributeMetadata) {`
`50`	`50`	`$ignored = method_exists($serializerClassMetadata, 'isIgnored') && $serializerAttributeMetadata->isIgnored();`
`51`		`- if (!$ignored && array_intersect($context['serializer_groups'], $serializerAttributeMetadata->getGroups())) {`
	`51`	`+ if (!$ignored && (null === $context['serializer_groups'] \|\| array_intersect($context['serializer_groups'], $serializerAttributeMetadata->getGroups()))) {`
`52`	`52`	`$properties[] = $serializerAttributeMetadata->getName();`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,9 @@ public function testGetProperties()`
`40`	`40`	`$this->extractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', ['serializer_groups' => ['a']])`
`41`	`41`	`);`
`42`	`42`	`}`
	`43`	`+`
	`44`	`+ public function testGetPropertiesWithAnyGroup()`
	`45`	`+ {`
	`46`	`+ $this->assertSame(['analyses', 'feet'], $this->extractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\AdderRemoverDummy', ['serializer_groups' => null]));`
	`47`	`+ }`
`43`	`48`	`}`