Fixing without flag :D

Author: soyuka

features/json/input_output.feature

@@ -37,3 +37,4 @@ Feature: JSON DTO input and output
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/problem+json; charset=utf-8"
     And the JSON node "detail" should be equal to "User does not exist."
+

src/Core/Metadata/Property/Factory/SerializerPropertyMetadataFactory.php

@@ -168,6 +168,10 @@ private function getEffectiveSerializerGroups(array $options, string $resourceCl
             return [$groups, $groups];
         }
 
+        if (\array_key_exists('normalization_groups', $options) && \array_key_exists('denormalization_groups', $options)) {
+            return [$options['normalization_groups'] ?? null, $options['denormalization_groups'] ?? null];
+        }
+
         $resourceMetadata = $this->resourceMetadataFactory->create($resourceClass);
         if (isset($options['collection_operation_name'])) {
             $normalizationContext = $resourceMetadata->getCollectionOperationAttribute($options['collection_operation_name'], 'normalization_context', null, true);

src/Doctrine/Orm/State/ItemProvider.php

@@ -87,6 +87,6 @@ public function supports(string $resourceClass, array $identifiers = [], ?string
 
         $operation = $context['operation'] ?? $this->resourceMetadataCollectionFactory->create($resourceClass)->getOperation($operationName);
 
-        return !($operation->isCollection() ?? false);
+        return !($operation->getExtraProperties()['is_legacy_subresource'] ?? false) && !($operation->isCollection() ?? false);
     }
 }

src/GraphQl/Type/FieldsBuilder.php

@@ -24,6 +24,7 @@
 use ApiPlatform\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\State\Pagination\Pagination;
+use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyGroup;
 use ApiPlatform\Util\Inflector;
 use GraphQL\Type\Definition\InputObjectType;
 use GraphQL\Type\Definition\NullableType;

src/Metadata/Property/Factory/LegacyPropertyMetadataFactory.php

@@ -13,6 +13,7 @@
 
 namespace ApiPlatform\Metadata\Property\Factory;
 
+use ApiPlatform\Core\Exception\ResourceClassNotFoundException;
 use ApiPlatform\Core\Metadata\Property\PropertyMetadata;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface as LegacyPropertyMetadataFactoryInterface;
 use ApiPlatform\Core\Annotation\ApiProperty as ApiPropertyAnnotation;
@@ -51,7 +52,7 @@ public function create(string $resourceClass, string $property, array $options =
 
         try {
             $legacyPropertyMetadata = $this->legacyPropertyMetadataFactory->create($resourceClass, $property, $options);
-        } catch (PropertyNotFoundException $propertyNotFoundException) {
+        } catch (PropertyNotFoundException|ResourceClassNotFoundException $propertyNotFoundException) {
             return $propertyMetadata;
         }
 

src/Metadata/Property/Factory/PropertyInfoPropertyMetadataFactory.php

@@ -49,12 +49,8 @@ public function create(string $resourceClass, string $property, array $options =
             }
         }
 
-        if ($propertyMetadata instanceof ApiProperty) {
-            if (!$propertyMetadata->getBuiltinTypes()) {
-                $propertyMetadata = $propertyMetadata->withBuiltinTypes($this->propertyInfo->getTypes($resourceClass, $property, $options) ?? []);
-            }
-        } elseif (null === $propertyMetadata->getType()) {
-            $propertyMetadata = $propertyMetadata->withType($this->propertyInfo->getTypes($resourceClass, $property, $options)[0] ?? null);
+        if (!$propertyMetadata->getBuiltinTypes()) {
+            $propertyMetadata = $propertyMetadata->withBuiltinTypes($this->propertyInfo->getTypes($resourceClass, $property, $options) ?? []);
         }
 
         if (null === $propertyMetadata->getDescription() && null !== $description = $this->propertyInfo->getShortDescription($resourceClass, $property, $options)) {

src/Metadata/Property/Factory/SerializerPropertyMetadataFactory.php

@@ -16,6 +16,7 @@
 use ApiPlatform\Api\ResourceClassResolverInterface;
 use ApiPlatform\Exception\ResourceClassNotFoundException;
 use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Tests\Fixtures\TestBundle\Entity\DummyGroup;
 use ApiPlatform\Util\ResourceClassInfoTrait;
 use Symfony\Component\PropertyInfo\Type;
 use Symfony\Component\Serializer\Mapping\AttributeMetadataInterface;

src/Symfony/EventListener/QueryParameterValidateListener.php

@@ -13,7 +13,8 @@
 
 namespace ApiPlatform\Symfony\EventListener;
 
-use ApiPlatform\Core\Filter\QueryParameterValidator;
+use ApiPlatform\Core\Filter\QueryParameterValidator as LegacyQueryParameterValidator;
+use ApiPlatform\Api\QueryParameterValidator\QueryParameterValidator;
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
 use ApiPlatform\Core\Metadata\Resource\ToggleableOperationAttributeTrait;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
@@ -39,8 +40,12 @@ final class QueryParameterValidateListener
     private $queryParameterValidator;
 
     private $enabled;
-
-    public function __construct($resourceMetadataFactory, QueryParameterValidator $queryParameterValidator, bool $enabled = true)
+    
+    /** 
+     * @param ResourceMetadataCollectionFactoryInterface|ResourceMetadataFactoryInterface $resourceMetadataFactory
+     * @param QueryParameterValidator|LegacyQueryParameterValidator $queryParameterValidator 
+     */
+    public function __construct($resourceMetadataFactory, $queryParameterValidator, bool $enabled = true)
     {
         if (!$resourceMetadataFactory instanceof ResourceMetadataCollectionFactoryInterface) {
             trigger_deprecation('api-platform/core', '2.7', sprintf('Use "%s" instead of "%s".', ResourceMetadataCollectionFactoryInterface::class, ResourceMetadataFactoryInterface::class));