fix(state): allow to skip parameter validator provider (api-platform#6452)

Author: soyuka

src/Metadata/ApiResource.php

@@ -960,7 +960,7 @@ public function __construct(
         $provider = null,
         $processor = null,
         protected ?OptionsInterface $stateOptions = null,
-        protected array|Parameters|null $parameters = null,
+        array|Parameters|null $parameters = null,
         protected array $extraProperties = [],
     ) {
         parent::__construct(
@@ -1389,19 +1389,6 @@ public function withExceptionToStatus(array $exceptionToStatus): self
         return $self;
     }
 
-    public function getQueryParameterValidationEnabled(): ?bool
-    {
-        return $this->queryParameterValidationEnabled;
-    }
-
-    public function withQueryParameterValidationEnabled(bool $queryParameterValidationEnabled): self
-    {
-        $self = clone $this;
-        $self->queryParameterValidationEnabled = $queryParameterValidationEnabled;
-
-        return $self;
-    }
-
     /**
      * @return GraphQlOperation[]
      */

src/Metadata/Extractor/schema/resources.xsd

@@ -66,6 +66,7 @@
         <xsd:attributeGroup ref="base"/>
         <xsd:attribute type="xsd:string" name="resolver"/>
         <xsd:attribute type="xsd:string" name="class" use="required"/>
+        <xsd:attribute type="xsd:boolean" name="queryParameterValidationEnabled"/>
         <xsd:attribute type="xsd:boolean" name="read"/>
         <xsd:attribute type="xsd:boolean" name="deserialize"/>
         <xsd:attribute type="xsd:boolean" name="validate"/>

src/Metadata/GraphQl/Operation.php

@@ -89,6 +89,7 @@ public function __construct(
         $processor = null,
         ?OptionsInterface $stateOptions = null,
         array|Parameters|null $parameters = null,
+        ?bool $queryParameterValidationEnabled = null,
         array $extraProperties = []
     ) {
         parent::__construct(
@@ -137,6 +138,7 @@ class: $class,
             processor: $processor,
             stateOptions: $stateOptions,
             parameters: $parameters,
+            queryParameterValidationEnabled: $queryParameterValidationEnabled,
             extraProperties: $extraProperties
         );
     }

src/Metadata/GraphQl/Query.php

@@ -72,6 +72,7 @@ public function __construct(
         $processor = null,
         ?OptionsInterface $stateOptions = null,
         array|Parameters|null $parameters = null,
+        ?bool $queryParameterValidationEnabled = null,
         array $extraProperties = [],
 
         protected ?bool $nested = null,
@@ -128,6 +129,7 @@ class: $class,
             processor: $processor,
             stateOptions: $stateOptions,
             parameters: $parameters,
+            queryParameterValidationEnabled: $queryParameterValidationEnabled,
             extraProperties: $extraProperties
         );
     }

src/Metadata/GraphQl/QueryCollection.php

@@ -73,6 +73,7 @@ public function __construct(
         $processor = null,
         protected ?OptionsInterface $stateOptions = null,
         array|Parameters|null $parameters = null,
+        ?bool $queryParameterValidationEnabled = null,
         array $extraProperties = [],
 
         ?bool $nested = null,
@@ -128,6 +129,7 @@ class: $class,
             provider: $provider,
             processor: $processor,
             parameters: $parameters,
+            queryParameterValidationEnabled: $queryParameterValidationEnabled,
             extraProperties: $extraProperties,
             nested: $nested,
         );

src/Metadata/GraphQl/Subscription.php

@@ -72,6 +72,7 @@ public function __construct(
         $processor = null,
         ?OptionsInterface $stateOptions = null,
         array|Parameters|null $parameters = null,
+        ?bool $queryParameterValidationEnabled = null,
         array $extraProperties = [],
     ) {
         parent::__construct(
@@ -126,6 +127,7 @@ class: $class,
             processor: $processor,
             stateOptions: $stateOptions,
             parameters: $parameters,
+            queryParameterValidationEnabled: $queryParameterValidationEnabled,
             extraProperties: $extraProperties,
         );
     }

src/Metadata/HttpOperation.php

@@ -153,7 +153,6 @@ public function __construct(
         protected ?array $openapiContext = null, // TODO Remove in 4.0
         protected bool|OpenApiOperation|Webhook|null $openapi = null,
         protected ?array $exceptionToStatus = null,
-        protected ?bool $queryParameterValidationEnabled = null,
         protected ?array $links = null,
 
         ?string $shortName = null,
@@ -201,6 +200,7 @@ public function __construct(
         $processor = null,
         ?OptionsInterface $stateOptions = null,
         array|Parameters|null $parameters = null,
+        ?bool $queryParameterValidationEnabled = null,
         array $extraProperties = [],
     ) {
         parent::__construct(
@@ -249,6 +249,7 @@ class: $class,
             processor: $processor,
             stateOptions: $stateOptions,
             parameters: $parameters,
+            queryParameterValidationEnabled: $queryParameterValidationEnabled,
             extraProperties: $extraProperties
         );
     }
@@ -607,19 +608,6 @@ public function withExceptionToStatus(array $exceptionToStatus): self
         return $self;
     }
 
-    public function getQueryParameterValidationEnabled(): ?bool
-    {
-        return $this->queryParameterValidationEnabled;
-    }
-
-    public function withQueryParameterValidationEnabled(bool $queryParameterValidationEnabled): self
-    {
-        $self = clone $this;
-        $self->queryParameterValidationEnabled = $queryParameterValidationEnabled;
-
-        return $self;
-    }
-
     public function getLinks(): ?array
     {
         return $this->links;

src/Metadata/Metadata.php

@@ -20,6 +20,8 @@
  */
 abstract class Metadata
 {
+    protected ?Parameters $parameters = null;
+
     /**
      * @param string|null                         $deprecationReason       https://api-platform.com/docs/core/deprecations/#deprecating-resource-classes-operations-and-properties
      * @param string|\Stringable|null             $security                https://api-platform.com/docs/core/security
@@ -70,12 +72,18 @@ public function __construct(
         protected $provider = null,
         protected $processor = null,
         protected ?OptionsInterface $stateOptions = null,
-        /**
+        /*
          * @experimental
          */
-        protected array|Parameters|null $parameters = [],
+        array|Parameters|null $parameters = null,
+        protected ?bool $queryParameterValidationEnabled = null,
         protected array $extraProperties = []
     ) {
+        if (\is_array($parameters) && $parameters) {
+            $parameters = new Parameters($parameters);
+        }
+
+        $this->parameters = $parameters;
     }
 
     public function getShortName(): ?string
@@ -571,18 +579,28 @@ public function withStateOptions(?OptionsInterface $stateOptions): static
         return $self;
     }
 
-    /**
-     * @return array<string, Parameter>
-     */
-    public function getParameters(): array|Parameters|null
+    public function getParameters(): ?Parameters
     {
         return $this->parameters;
     }
 
     public function withParameters(array|Parameters $parameters): static
     {
         $self = clone $this;
-        $self->parameters = $parameters;
+        $self->parameters = \is_array($parameters) ? new Parameters($parameters) : $parameters;
+
+        return $self;
+    }
+
+    public function getQueryParameterValidationEnabled(): ?bool
+    {
+        return $this->queryParameterValidationEnabled;
+    }
+
+    public function withQueryParameterValidationEnabled(bool $queryParameterValidationEnabled): static
+    {
+        $self = clone $this;
+        $self->queryParameterValidationEnabled = $queryParameterValidationEnabled;
 
         return $self;
     }

src/Metadata/Operation.php

@@ -806,7 +806,8 @@ public function __construct(
         protected $provider = null,
         protected $processor = null,
         protected ?OptionsInterface $stateOptions = null,
-        protected array|Parameters|null $parameters = [],
+        array|Parameters|null $parameters = null,
+        ?bool $queryParameterValidationEnabled = null,
         protected array $extraProperties = [],
     ) {
         parent::__construct(
@@ -848,6 +849,7 @@ class: $class,
             processor: $processor,
             stateOptions: $stateOptions,
             parameters: $parameters,
+            queryParameterValidationEnabled: $queryParameterValidationEnabled,
             extraProperties: $extraProperties,
         );
     }

src/Metadata/Parameters.php

@@ -23,7 +23,7 @@ final class Parameters implements \IteratorAggregate, \Countable
     private array $parameters = [];
 
     /**
-     * @param array<string, Parameter> $parameters
+     * @param array<int|string, Parameter> $parameters
      */
     public function __construct(array $parameters = [])
     {