Merge 4.1

Author: soyuka

CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## v4.1.18
+
+### Bug fixes
+
+* [0e712d969](https://github.com/api-platform/core/commit/0e712d9692f018b9816764ada9fa4c7b02b5e028) fix(symfony): catch InvalidUriVariableException in IriConverter (#7271)
+* [221e5d97f](https://github.com/api-platform/core/commit/221e5d97f9e1114d642c834e29392a35967a9960) fix(openapi): command options mode (`InputOption::VALUE_REQUIRED`) (#7266)
+* [3ed6f30f5](https://github.com/api-platform/core/commit/3ed6f30f5ce60ac45a1a1df6bac9372a7b712d51) fix(symfony): fix resolving groups in ValidationGroupsExtractorTrait when GroupSequence (#7272)
+* [6e4e46bfe](https://github.com/api-platform/core/commit/6e4e46bfef0aaa87b2bdc56a1b28510fcdaa2914) fix(json-schema): Rebuild sub-schema definition without `@id` property when `genId` is `false` (#7162) (#7251)
+* [803165228](https://github.com/api-platform/core/commit/80316522807be2af25657f2936341ce2f527c364) fix(symfony): missing GroupSequence type for validation groups
+* [85e18a2d6](https://github.com/api-platform/core/commit/85e18a2d665baf791027a93106d6a6c293464883) fix(metadata): support stateOptions in YAML and XML for Doctrine ORM/ODM (#7217)
+* [88e0073bf](https://github.com/api-platform/core/commit/88e0073bf2eb9c27a35d6a04a32919908cdae704) fix(validator): error xml format output
+* [bf271d139](https://github.com/api-platform/core/commit/bf271d139aa6cd6c74d2dd0ee5a482d03a1afca4) fix(validator): parameter validation list<string>|string (#7245)
+* [d3e73f09a](https://github.com/api-platform/core/commit/d3e73f09afd6bde5763e0c2c7a4a0203f857d7c3) fix(metadata): read every OpenApiOperation attributes in Xml instead of only "deprecated" (#7189)
+* [e40bb19a6](https://github.com/api-platform/core/commit/e40bb19a6d80d60e5f06ac02b5bbf1aaac08e46a) fix(laravel): decorate error handler (#7247)
+* [f0604a07e](https://github.com/api-platform/core/commit/f0604a07e79ba2ee6a47cee20fcdaebbb68bbcaf) fix: getcontainer return type (#7230)
+* [f46c0a3f4](https://github.com/api-platform/core/commit/f46c0a3f47265d48d2863860d0e274f83367c929) fix(jsonld): reset gen_id configuration (#7264)
+* [f82464431](https://github.com/api-platform/core/commit/f8246443134b07fe6a2b591642af1ed3a5f40b44)  fix(state): depend only on translation contracts (#7262)
+* [fa37c1eba](https://github.com/api-platform/core/commit/fa37c1eba871c533c2e3436a915d0f02dd2baa78) fix(state): error xml format output (#7273)
+
+### Experimental Features
+
+* [8885000db](https://github.com/api-platform/core/commit/8885000dbfa610146ff8f3187d41a0dde9b22e26) feat(state): cast parameter values to validate with the Type constraint (#7240)
+
 ## v4.1.17
 
 ### Bug fixes

src/Doctrine/Odm/phpunit.baseline.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <files version="1">
- <file path="vendor/symfony/contracts/Deprecation/function.php">
-     <line number="25" hash="c6af5d66288d0667e424978000f29571e4954b81">
-       <issue><![CDATA[Since symfony/property-info 7.3: The "Symfony\Component\PropertyInfo\Type" class is deprecated. Use "Symfony\Component\TypeInfo\Type" class from "symfony/type-info" instead.]]></issue>
-     </line>
+ <file path="vendor/symfony/deprecation-contracts/function.php">
+  <line number="25" hash="c6af5d66288d0667e424978000f29571e4954b81">
+   <issue><![CDATA[Since symfony/property-info 7.3: The "Symfony\Component\PropertyInfo\Type" class is deprecated. Use "Symfony\Component\TypeInfo\Type" class from "symfony/type-info" instead.]]></issue>
+  </line>
  </file>
 </files>

src/GraphQl/phpunit.baseline.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <files version="1">
- <file path="vendor/symfony/contracts/Deprecation/function.php">
-     <line number="25" hash="c6af5d66288d0667e424978000f29571e4954b81">
-         <issue><![CDATA[Since symfony/property-info 7.3: The "Symfony\Component\PropertyInfo\Type" class is deprecated. Use "Symfony\Component\TypeInfo\Type" class from "symfony/type-info" instead.]]></issue>
-     </line>
+ <file path="vendor/symfony/deprecation-contracts/function.php">
+  <line number="25" hash="c6af5d66288d0667e424978000f29571e4954b81">
+   <issue><![CDATA[Since symfony/property-info 7.3: The "Symfony\Component\PropertyInfo\Type" class is deprecated. Use "Symfony\Component\TypeInfo\Type" class from "symfony/type-info" instead.]]></issue>
+  </line>
  </file>
 </files>

src/JsonLd/Serializer/ItemNormalizer.php

@@ -119,9 +119,9 @@ public function normalize(mixed $object, ?string $format = null, array $context
             $metadata = $this->createJsonLdContext($this->contextBuilder, $object, $context);
         }
 
-        // maybe not needed anymore
-        if (isset($context['operation']) && $previousResourceClass !== $resourceClass) {
-            unset($context['operation'], $context['operation_name']);
+        // Special case: non-resource got serialized and contains a resource therefore we need to reset part of the context
+        if ($previousResourceClass !== $resourceClass) {
+            unset($context['operation'], $context['operation_name'], $context['output']);
         }
 
         if (true === ($context['output']['gen_id'] ?? true) && true === ($context['force_iri_generation'] ?? true) && $iri = $this->iriConverter->getIriFromResource($object, UrlGeneratorInterface::ABS_PATH, $context['operation'] ?? null, $context)) {
@@ -136,9 +136,12 @@ public function normalize(mixed $object, ?string $format = null, array $context
             return $data;
         }
 
-        if (!isset($metadata['@type']) && $isResourceClass) {
-            $operation = $context['operation'] ?? $this->resourceMetadataCollectionFactory->create($resourceClass)->getOperation();
+        $operation = $context['operation'] ?? null;
+        if ($isResourceClass && !$operation) {
+            $operation = $this->resourceMetadataCollectionFactory->create($resourceClass)->getOperation();
+        }
 
+        if (!isset($metadata['@type']) && $operation) {
             $types = $operation instanceof HttpOperation ? $operation->getTypes() : null;
             if (null === $types) {
                 $types = [$operation->getShortName()];

src/Laravel/ApiPlatformDeferredProvider.php

@@ -83,7 +83,7 @@
 use ApiPlatform\State\Provider\ParameterProvider;
 use ApiPlatform\State\Provider\SecurityParameterProvider;
 use ApiPlatform\State\ProviderInterface;
-use Illuminate\Contracts\Debug\ExceptionHandler as ExceptionHandlerInterface;
+use Illuminate\Contracts\Debug\ExceptionHandler;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Support\ServiceProvider;
@@ -252,9 +252,9 @@ public function register(): void
             );
         });
 
-        $this->app->singleton(
-            ExceptionHandlerInterface::class,
-            function (Application $app) {
+        $this->app->extend(
+            ExceptionHandler::class,
+            function (ExceptionHandler $decorated, Application $app) {
                 /** @var ConfigRepository */
                 $config = $app['config'];
 
@@ -267,7 +267,8 @@ function (Application $app) {
                     $app->make(Negotiator::class),
                     $config->get('api-platform.exception_to_status'),
                     $config->get('app.debug'),
-                    $config->get('api-platform.error_formats')
+                    $config->get('api-platform.error_formats'),
+                    $decorated
                 );
             }
         );

src/Laravel/Exception/ErrorHandler.php

@@ -27,6 +27,7 @@
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Contracts\Container\Container;
+use Illuminate\Contracts\Debug\ExceptionHandler;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionsHandler;
 use Negotiation\Negotiator;
 use Symfony\Component\HttpFoundation\Exception\RequestExceptionInterface;
@@ -54,6 +55,7 @@ public function __construct(
         private readonly ?array $exceptionToStatus = null,
         private readonly ?bool $debug = false,
         private readonly ?array $errorFormats = null,
+        private readonly ?ExceptionHandler $decorated = null,
     ) {
         $this->resourceMetadataCollectionFactory = $resourceMetadataCollectionFactory;
         $this->negotiator = $negotiator;
@@ -65,7 +67,7 @@ public function render($request, \Throwable $exception)
         $apiOperation = $this->initializeOperation($request);
 
         if (!$apiOperation) {
-            return parent::render($request, $exception);
+            return $this->decorated ? $this->decorated->render($request, $exception) : parent::render($request, $exception);
         }
 
         $formats = $this->errorFormats ?? ['jsonproblem' => ['application/problem+json']];
@@ -157,9 +159,12 @@ public function render($request, \Throwable $exception)
         }
 
         try {
-            return $this->apiPlatformController->__invoke($dup);
+            $response = $this->apiPlatformController->__invoke($dup);
+            $this->decorated->render($dup, $exception);
+
+            return $response;
         } catch (\Throwable $e) {
-            return parent::render($dup, $e);
+            return $this->decorated ? $this->decorated->render($request, $exception) : parent::render($request, $exception);
         }
     }
 

src/Laravel/workbench/app/Models/Book.php

@@ -37,6 +37,8 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Symfony\Component\TypeInfo\Type\BuiltinType;
+use Symfony\Component\TypeInfo\TypeIdentifier;
 use Workbench\App\Http\Requests\BookFormRequest;
 
 #[ApiResource(
@@ -79,7 +81,7 @@
     property: 'name'
 )]
 #[QueryParameter(key: 'properties', filter: PropertyFilter::class)]
-#[QueryParameter(key: 'published', filter: BooleanFilter::class)]
+#[QueryParameter(key: 'published', filter: BooleanFilter::class, nativeType: new BuiltinType(TypeIdentifier::BOOL))]
 class Book extends Model
 {
     use HasFactory;

src/Metadata/Parameter.php

@@ -27,10 +27,12 @@ abstract class Parameter
      * @param (array<string, mixed>&array{type?: string, default?: string})|null $schema
      * @param array<string, mixed>                                               $extraProperties
      * @param ParameterProviderInterface|callable|string|null                    $provider
-     * @param list<string>                                                       $properties      a list of properties this parameter applies to (works with the :property placeholder)
+     * @param list<string>                                                       $properties       a list of properties this parameter applies to (works with the :property placeholder)
      * @param FilterInterface|string|null                                        $filter
-     * @param mixed                                                              $constraints     an array of Symfony constraints, or an array of Laravel rules
-     * @param Type                                                               $nativeType      the PHP native type, we cast values to an array if its a CollectionType, if not and it's an array with a single value we use it (eg: HTTP Header)
+     * @param mixed                                                              $constraints      an array of Symfony constraints, or an array of Laravel rules
+     * @param Type                                                               $nativeType       the PHP native type, we cast values to an array if its a CollectionType, if not and it's an array with a single value we use it (eg: HTTP Header)
+     * @param ?bool                                                              $castToNativeType whether API Platform should cast your parameter to the nativeType declared
+     * @param ?callable(mixed): mixed                                            $castFn           the closure used to cast your parameter, this gets called only when $castToNativeType is set
      */
     public function __construct(
         protected ?string $key = null,
@@ -51,6 +53,8 @@ public function __construct(
         protected array|string|null $filterContext = null,
         protected ?Type $nativeType = null,
         protected ?bool $castToArray = null,
+        protected ?bool $castToNativeType = null,
+        protected mixed $castFn = null,
     ) {
     }
 
@@ -332,4 +336,33 @@ public function withCastToArray(bool $castToArray): self
 
         return $self;
     }
+
+    public function getCastToNativeType(): ?bool
+    {
+        return $this->castToNativeType;
+    }
+
+    public function withCastToNativeType(bool $castToNativeType): self
+    {
+        $self = clone $this;
+        $self->castToNativeType = $castToNativeType;
+
+        return $self;
+    }
+
+    public function getCastFn(): ?callable
+    {
+        return $this->castFn;
+    }
+
+    /**
+     * @param callable(mixed): mixed $castFn
+     */
+    public function withCastFn(mixed $castFn): self
+    {
+        $self = clone $this;
+        $self->castFn = $castFn;
+
+        return $self;
+    }
 }

src/Metadata/Resource/Factory/ParameterResourceMetadataCollectionFactory.php

@@ -28,11 +28,13 @@
 use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
 use ApiPlatform\OpenApi\Model\Parameter as OpenApiParameter;
 use ApiPlatform\Serializer\Filter\FilterInterface as SerializerFilterInterface;
+use ApiPlatform\State\Parameter\ValueCaster;
 use ApiPlatform\State\Util\StateOptionsTrait;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\TypeIdentifier;
 
 /**
  * Prepares Parameters documentation by reading its filter details and declaring an OpenApi parameter.
@@ -158,11 +160,27 @@ private function getDefaultParameters(Operation $operation, string $resourceClas
                     $parameter = $parameter->withNativeType(Type::string());
                 } elseif ('boolean' === ($parameter->getSchema()['type'] ?? null)) {
                     $parameter = $parameter->withNativeType(Type::bool());
+                } elseif ('integer' === ($parameter->getSchema()['type'] ?? null)) {
+                    $parameter = $parameter->withNativeType(Type::int());
+                } elseif ('number' === ($parameter->getSchema()['type'] ?? null)) {
+                    $parameter = $parameter->withNativeType(Type::float());
                 } else {
                     $parameter = $parameter->withNativeType(Type::union(Type::string(), Type::list(Type::string())));
                 }
             }
 
+            if ($parameter->getCastToNativeType() && null === $parameter->getCastFn() && ($nativeType = $parameter->getNativeType())) {
+                if ($nativeType->isIdentifiedBy(TypeIdentifier::BOOL)) {
+                    $parameter = $parameter->withCastFn([ValueCaster::class, 'toBool']);
+                }
+                if ($nativeType->isIdentifiedBy(TypeIdentifier::INT)) {
+                    $parameter = $parameter->withCastFn([ValueCaster::class, 'toInt']);
+                }
+                if ($nativeType->isIdentifiedBy(TypeIdentifier::FLOAT)) {
+                    $parameter = $parameter->withCastFn([ValueCaster::class, 'toFloat']);
+                }
+            }
+
             $priority = $parameter->getPriority() ?? $internalPriority--;
             $parameters->add($key, $parameter->withPriority($priority));
         }

src/Metadata/UriVariablesConverterInterface.php

@@ -14,6 +14,7 @@
 namespace ApiPlatform\Metadata;
 
 use ApiPlatform\Metadata\Exception\InvalidIdentifierException;
+use ApiPlatform\Metadata\Exception\InvalidUriVariableException;
 
 /**
  * Identifier converter.
@@ -29,6 +30,7 @@ interface UriVariablesConverterInterface
      * @param string $class The class to which the URI variables belong to
      *
      * @throws InvalidIdentifierException
+     * @throws InvalidUriVariableException
      *
      * @return array Array indexed by identifiers properties with their values denormalized
      */