Merge pull request #4807 from soyuka/merge-2.7

soyuka · web-flow · commit 5752f9173fa0 · 2022-07-01T11:59:46.000+02:00
Merge 2.7
diff --git a/src/Doctrine/Common/Filter/BooleanFilterTrait.php b/src/Doctrine/Common/Filter/BooleanFilterTrait.php
@@ -65,7 +65,7 @@ abstract protected function getProperties(): ?array;
 
     abstract protected function getLogger(): LoggerInterface;
 
-    abstract protected function normalizePropertyName($property);
+    abstract protected function normalizePropertyName($property): string;
 
     /**
      * Determines whether the given property refers to a boolean field.
diff --git a/src/Doctrine/Common/Filter/DateFilterTrait.php b/src/Doctrine/Common/Filter/DateFilterTrait.php
@@ -55,7 +55,7 @@ public function getDescription(string $resourceClass): array
 
     abstract protected function getProperties(): ?array;
 
-    abstract protected function normalizePropertyName($property);
+    abstract protected function normalizePropertyName($property): string;
 
     /**
      * Determines whether the given property refers to a date field.
diff --git a/src/Doctrine/Common/Filter/ExistsFilterTrait.php b/src/Doctrine/Common/Filter/ExistsFilterTrait.php
@@ -68,7 +68,7 @@ abstract protected function getProperties(): ?array;
 
     abstract protected function getLogger(): LoggerInterface;
 
-    abstract protected function normalizePropertyName($property);
+    abstract protected function normalizePropertyName($property): string;
 
     private function normalizeValue($value, string $property): ?bool
     {
diff --git a/src/Doctrine/Common/Filter/NumericFilterTrait.php b/src/Doctrine/Common/Filter/NumericFilterTrait.php
@@ -69,7 +69,7 @@ abstract protected function getProperties(): ?array;
 
     abstract protected function getLogger(): LoggerInterface;
 
-    abstract protected function normalizePropertyName($property);
+    abstract protected function normalizePropertyName($property): string;
 
     /**
      * Determines whether the given property refers to a numeric field.
diff --git a/src/Doctrine/Common/Filter/OrderFilterTrait.php b/src/Doctrine/Common/Filter/OrderFilterTrait.php
@@ -67,7 +67,7 @@ public function getDescription(string $resourceClass): array
 
     abstract protected function getProperties(): ?array;
 
-    abstract protected function normalizePropertyName($property);
+    abstract protected function normalizePropertyName($property): string;
 
     private function normalizeValue($value, string $property): ?string
     {
diff --git a/src/Doctrine/Common/Filter/RangeFilterTrait.php b/src/Doctrine/Common/Filter/RangeFilterTrait.php
@@ -58,7 +58,7 @@ abstract protected function getProperties(): ?array;
 
     abstract protected function getLogger(): LoggerInterface;
 
-    abstract protected function normalizePropertyName($property);
+    abstract protected function normalizePropertyName($property): string;
 
     /**
      * Gets filter description.
diff --git a/src/Doctrine/Common/Filter/SearchFilterTrait.php b/src/Doctrine/Common/Filter/SearchFilterTrait.php
@@ -113,7 +113,7 @@ abstract protected function getIriConverter(): IriConverterInterface;
 
     abstract protected function getPropertyAccessor(): PropertyAccessorInterface;
 
-    abstract protected function normalizePropertyName($property);
+    abstract protected function normalizePropertyName($property): string;
 
     /**
      * Gets the ID from an IRI or a raw ID.
diff --git a/src/Doctrine/Odm/Filter/SearchFilter.php b/src/Doctrine/Odm/Filter/SearchFilter.php
@@ -49,8 +49,8 @@ public function __construct(ManagerRegistry $managerRegistry, IriConverterInterf
         parent::__construct($managerRegistry, $logger, $properties, $nameConverter);
 
         $this->iriConverter = $iriConverter;
-        $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
         $this->identifiersExtractor = $identifiersExtractor;
+        $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
     }
 
     protected function getIriConverter(): IriConverterInterface
diff --git a/src/Metadata/Extractor/ResourceExtractorTrait.php b/src/Metadata/Extractor/ResourceExtractorTrait.php
@@ -97,19 +97,16 @@ private function buildArgs(SimpleXMLElement $resource): ?array
         return $data;
     }
 
-    /**
-     * @return string[]
-     */
     private function buildValues(SimpleXMLElement $resource): array
     {
         $data = [];
         foreach ($resource->value as $value) {
             if (null !== $value->attributes()->name) {
-                $data[(string) $value->attributes()->name] = isset($value->values) ? $this->buildValues($value->values) : (string) $value;
+                $data[(string) $value->attributes()->name] = isset($value->values) ? $this->buildValues($value->values) : XmlUtils::phpize($value->__toString());
                 continue;
             }
 
-            $data[] = isset($value->values) ? $this->buildValues($value->values) : (string) $value;
+            $data[] = isset($value->values) ? $this->buildValues($value->values) : XmlUtils::phpize($value->__toString());
         }
 
         return $data;
diff --git a/src/Serializer/AbstractItemNormalizer.php b/src/Serializer/AbstractItemNormalizer.php
@@ -364,12 +364,13 @@ protected function getAllowedAttributes($classOrObject, array $context, $attribu
             return parent::getAllowedAttributes($classOrObject, $context, $attributesAsString);
         }
 
+        $resourceClass = $this->resourceClassResolver->getResourceClass(null, $context['resource_class']); // fix for abstract classes and interfaces
         $options = $this->getFactoryOptions($context);
-        $propertyNames = $this->propertyNameCollectionFactory->create($context['resource_class'], $options);
+        $propertyNames = $this->propertyNameCollectionFactory->create($resourceClass, $options);
 
         $allowedAttributes = [];
         foreach ($propertyNames as $propertyName) {
-            $propertyMetadata = $this->propertyMetadataFactory->create($context['resource_class'], $propertyName, $options);
+            $propertyMetadata = $this->propertyMetadataFactory->create($resourceClass, $propertyName, $options);
 
             if (
                 $this->isAllowedAttribute($classOrObject, $propertyName, null, $context) &&
diff --git a/src/Symfony/Bundle/Resources/config/legacy/elasticsearch.xml b/src/Symfony/Bundle/Resources/config/legacy/elasticsearch.xml
diff --git a/tests/Api/QueryParameterValidator/QueryParameterValidatorTest.php b/tests/Api/QueryParameterValidator/QueryParameterValidatorTest.php
@@ -64,6 +64,7 @@ public function testOnKernelRequestWithWrongFilter()
     {
         $request = [];
 
+        $this->filterLocatorProphecy->has('some_inexistent_filter')->willReturn(false);
         $this->assertNull(
             $this->testedInstance->validateFilters(Dummy::class, ['some_inexistent_filter'], $request)
         );
diff --git a/tests/GraphQl/Serializer/ItemNormalizerTest.php b/tests/GraphQl/Serializer/ItemNormalizerTest.php
@@ -90,6 +90,7 @@ public function testNormalize()
 
         $resourceClassResolverProphecy = $this->prophesize(ResourceClassResolverInterface::class);
         $resourceClassResolverProphecy->getResourceClass($dummy, null)->willReturn(Dummy::class);
+        $resourceClassResolverProphecy->getResourceClass(null, Dummy::class)->willReturn(Dummy::class);
         $resourceClassResolverProphecy->isResourceClass(Dummy::class)->willReturn(true);
 
         $serializerProphecy = $this->prophesize(SerializerInterface::class);
@@ -137,6 +138,7 @@ public function testNormalizeNoResolverData(): void
 
         $resourceClassResolverProphecy = $this->prophesize(ResourceClassResolverInterface::class);
         $resourceClassResolverProphecy->getResourceClass($dummy, null)->willReturn(Dummy::class);
+        $resourceClassResolverProphecy->getResourceClass(null, Dummy::class)->willReturn(Dummy::class);
         $resourceClassResolverProphecy->isResourceClass(Dummy::class)->willReturn(true);
 
         $serializerProphecy = $this->prophesize(SerializerInterface::class);
diff --git a/tests/Hal/Serializer/ItemNormalizerTest.php b/tests/Hal/Serializer/ItemNormalizerTest.php
@@ -125,6 +125,7 @@ public function testNormalize()
         $resourceClassResolverProphecy->isResourceClass(RelatedDummy::class)->willReturn(true);
         $resourceClassResolverProphecy->isResourceClass(Dummy::class)->willReturn(true);
         $resourceClassResolverProphecy->getResourceClass($dummy, null)->willReturn(Dummy::class);
+        $resourceClassResolverProphecy->getResourceClass(null, Dummy::class)->willReturn(Dummy::class);
         $resourceClassResolverProphecy->getResourceClass($dummy, Dummy::class)->willReturn(Dummy::class);
         $resourceClassResolverProphecy->getResourceClass($relatedDummy, RelatedDummy::class)->willReturn(RelatedDummy::class);
 
@@ -186,6 +187,7 @@ public function testNormalizeWithoutCache()
         $resourceClassResolverProphecy = $this->prophesize(ResourceClassResolverInterface::class);
         $resourceClassResolverProphecy->getResourceClass($dummy, null)->willReturn(Dummy::class);
         $resourceClassResolverProphecy->getResourceClass($dummy, Dummy::class)->willReturn(Dummy::class);
+        $resourceClassResolverProphecy->getResourceClass(null, Dummy::class)->willReturn(Dummy::class);
         $resourceClassResolverProphecy->getResourceClass($relatedDummy, RelatedDummy::class)->willReturn(RelatedDummy::class);
         $resourceClassResolverProphecy->isResourceClass(RelatedDummy::class)->willReturn(true);
         $resourceClassResolverProphecy->isResourceClass(Dummy::class)->willReturn(true);
diff --git a/tests/Hydra/Serializer/CollectionFiltersNormalizerTest.php b/tests/Hydra/Serializer/CollectionFiltersNormalizerTest.php
@@ -251,11 +251,14 @@ public function testDoNothingIfNoRequestUri()
         $resourceClassResolverProphecy = $this->prophesize(ResourceClassResolverInterface::class);
         $resourceClassResolverProphecy->getResourceClass($dummy, Dummy::class)->willReturn(Dummy::class);
 
+        $filterLocatorProphecy = $this->prophesize(ContainerInterface::class);
+        $filterLocatorProphecy->has('foo')->willReturn(false);
+
         $normalizer = new CollectionFiltersNormalizer(
             $decoratedProphecy->reveal(),
             $resourceMetadataFactoryProphecy->reveal(),
             $resourceClassResolverProphecy->reveal(),
-            $this->prophesize(ContainerInterface::class)->reveal()
+            $filterLocatorProphecy->reveal()
         );
 
         $this->assertEquals(['name' => 'foo'], $normalizer->normalize($dummy, CollectionNormalizer::FORMAT, [
diff --git a/tests/JsonApi/Serializer/ItemNormalizerTest.php b/tests/JsonApi/Serializer/ItemNormalizerTest.php
@@ -68,6 +68,7 @@ public function testNormalize(): void
 
         $resourceClassResolverProphecy = $this->prophesize(ResourceClassResolverInterface::class);
         $resourceClassResolverProphecy->getResourceClass($dummy, null)->willReturn(Dummy::class);
+        $resourceClassResolverProphecy->getResourceClass(null, Dummy::class)->willReturn(Dummy::class);
         $resourceClassResolverProphecy->getResourceClass($dummy, Dummy::class)->willReturn(Dummy::class);
         $resourceClassResolverProphecy->getResourceClass(null, Dummy::class)->willReturn(Dummy::class);
         $resourceClassResolverProphecy->isResourceClass(Dummy::class)->willReturn(true);
@@ -132,6 +133,7 @@ public function testNormalizeCircularReference()
         $resourceClassResolverProphecy->isResourceClass(CircularReference::class)->willReturn(true);
         $resourceClassResolverProphecy->getResourceClass($circularReferenceEntity, null)->willReturn(CircularReference::class);
         $resourceClassResolverProphecy->getResourceClass($circularReferenceEntity, CircularReference::class)->willReturn(CircularReference::class);
+        $resourceClassResolverProphecy->isResourceClass(Argument::type('string'))->willReturn(true);
 
         $resourceMetadataCollectionFactoryProphecy = $this->prophesize(ResourceMetadataCollectionFactoryInterface::class);
         $resourceMetadataCollectionFactoryProphecy->create(CircularReference::class)->willReturn(new ResourceMetadataCollection('CircularReference'));
diff --git a/tests/JsonLd/Serializer/ItemNormalizerTest.php b/tests/JsonLd/Serializer/ItemNormalizerTest.php
@@ -65,6 +65,7 @@ public function testNormalize()
 
         $resourceClassResolverProphecy = $this->prophesize(ResourceClassResolverInterface::class);
         $resourceClassResolverProphecy->getResourceClass($dummy, null)->willReturn(Dummy::class);
+        $resourceClassResolverProphecy->getResourceClass(null, Dummy::class)->willReturn(Dummy::class);
         $resourceClassResolverProphecy->getResourceClass($dummy, Dummy::class)->willReturn(Dummy::class);
         $resourceClassResolverProphecy->getResourceClass(null, Dummy::class)->willReturn(Dummy::class);
         $resourceClassResolverProphecy->isResourceClass(Dummy::class)->willReturn(true);
diff --git a/tests/Metadata/Extractor/XmlExtractorTest.php b/tests/Metadata/Extractor/XmlExtractorTest.php
@@ -152,6 +152,7 @@ public function testValidXML(): void
                     ],
                     'normalizationContext' => [
                         'groups' => ['comment:read', 'comment:custom-read'],
+                        'enabled' => true,
                     ],
                     'denormalizationContext' => [
                         'groups' => 'comment:write',
@@ -229,6 +230,7 @@ public function testValidXML(): void
                             ],
                             'normalizationContext' => [
                                 'groups' => ['comment:read', 'comment:custom-read'],
+                                'enabled' => true,
                             ],
                             'denormalizationContext' => [
                                 'groups' => 'comment:write',
@@ -321,6 +323,7 @@ public function testValidXML(): void
                             ],
                             'normalizationContext' => [
                                 'groups' => ['comment:read', 'comment:custom-read'],
+                                'enabled' => true,
                             ],
                             'denormalizationContext' => [
                                 'groups' => 'comment:write',
diff --git a/tests/Metadata/Extractor/YamlExtractorTest.php b/tests/Metadata/Extractor/YamlExtractorTest.php
@@ -211,7 +211,10 @@ public function testValidYaml(): void
                     'status' => null,
                     'schemes' => null,
                     'cacheHeaders' => null,
-                    'normalizationContext' => null,
+                    'normalizationContext' => [
+                        'groups' => ['foo', 'bar'],
+                        'enabled' => false,
+                    ],
                     'denormalizationContext' => null,
                     'hydraContext' => null,
                     'openapiContext' => null,
@@ -272,7 +275,10 @@ public function testValidYaml(): void
                             'status' => null,
                             'schemes' => null,
                             'cacheHeaders' => null,
-                            'normalizationContext' => null,
+                            'normalizationContext' => [
+                                'groups' => ['foo', 'bar'],
+                                'enabled' => false,
+                            ],
                             'denormalizationContext' => null,
                             'hydraContext' => null,
                             'openapiContext' => null,
@@ -345,7 +351,10 @@ public function testValidYaml(): void
                             'status' => null,
                             'schemes' => null,
                             'cacheHeaders' => null,
-                            'normalizationContext' => null,
+                            'normalizationContext' => [
+                                'groups' => ['foo', 'bar'],
+                                'enabled' => false,
+                            ],
                             'denormalizationContext' => null,
                             'hydraContext' => null,
                             'openapiContext' => null,
diff --git a/tests/Metadata/Extractor/xml/valid.xml b/tests/Metadata/Extractor/xml/valid.xml
@@ -53,6 +53,7 @@
                         <value>comment:custom-read</value>
                     </values>
                 </value>
+                <value name="enabled">true</value>
             </values>
         </normalizationContext>
 
diff --git a/tests/Metadata/Extractor/yaml/valid.yaml b/tests/Metadata/Extractor/yaml/valid.yaml
@@ -7,6 +7,9 @@ resources:
             uriVariables: ['author']
             types: ['someirischema']
             description: User programs
+            normalizationContext:
+                groups: ['foo', 'bar']
+                enabled: false
             operations:
                 ApiPlatform\Metadata\GetCollection: ~
                 ApiPlatform\Metadata\Get:
diff --git a/tests/Serializer/AbstractItemNormalizerTest.php b/tests/Serializer/AbstractItemNormalizerTest.php
diff --git a/tests/Serializer/ItemNormalizerTest.php b/tests/Serializer/ItemNormalizerTest.php
diff --git a/tests/Symfony/Bundle/DataCollector/RequestDataCollectorTest.php b/tests/Symfony/Bundle/DataCollector/RequestDataCollectorTest.php

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ abstract protected function getProperties(): ?array;`
`68`	`68`
`69`	`69`	`abstract protected function getLogger(): LoggerInterface;`
`70`	`70`
`71`		`- abstract protected function normalizePropertyName($property);`
	`71`	`+ abstract protected function normalizePropertyName($property): string;`
`72`	`72`
`73`	`73`	`private function normalizeValue($value, string $property): ?bool`
`74`	`74`	`{`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function getDescription(string $resourceClass): array`
`67`	`67`
`68`	`68`	`abstract protected function getProperties(): ?array;`
`69`	`69`
`70`		`- abstract protected function normalizePropertyName($property);`
	`70`	`+ abstract protected function normalizePropertyName($property): string;`
`71`	`71`
`72`	`72`	`private function normalizeValue($value, string $property): ?string`
`73`	`73`	`{`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ public function __construct(ManagerRegistry $managerRegistry, IriConverterInterf`
`49`	`49`	`parent::__construct($managerRegistry, $logger, $properties, $nameConverter);`
`50`	`50`
`51`	`51`	`$this->iriConverter = $iriConverter;`
`52`		`- $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();`
`53`	`52`	`$this->identifiersExtractor = $identifiersExtractor;`
	`53`	`+ $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`protected function getIriConverter(): IriConverterInterface`
Original file line number	Diff line number	Diff line change
`@@ -97,19 +97,16 @@ private function buildArgs(SimpleXMLElement $resource): ?array`
`97`	`97`	`return $data;`
`98`	`98`	`}`
`99`	`99`
`100`		`- /**`
`101`		`- * @return string[]`
`102`		`- */`
`103`	`100`	`private function buildValues(SimpleXMLElement $resource): array`
`104`	`101`	`{`
`105`	`102`	`$data = [];`
`106`	`103`	`foreach ($resource->value as $value) {`
`107`	`104`	`if (null !== $value->attributes()->name) {`
`108`		`- $data[(string) $value->attributes()->name] = isset($value->values) ? $this->buildValues($value->values) : (string) $value;`
	`105`	`+ $data[(string) $value->attributes()->name] = isset($value->values) ? $this->buildValues($value->values) : XmlUtils::phpize($value->__toString());`
`109`	`106`	`continue;`
`110`	`107`	`}`
`111`	`108`
`112`		`- $data[] = isset($value->values) ? $this->buildValues($value->values) : (string) $value;`
	`109`	`+ $data[] = isset($value->values) ? $this->buildValues($value->values) : XmlUtils::phpize($value->__toString());`
`113`	`110`	`}`
`114`	`111`
`115`	`112`	`return $data;`