Merge 4.1

Author: soyuka

CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## v4.1.9
+
+### Bug fixes
+
+* [4dd0cdfc4](https://github.com/api-platform/core/commit/4dd0cdfc4a7f4cc73e7e67a49ee790ed1aaf5707) fix(doctrine): support integer-backed enums in BackedEnumFilter (#7127)
+* [70a922573](https://github.com/api-platform/core/commit/70a9225737bece18ad4b66b8ac636c38b2a1008a) fix: error formats (#7148)
+* [723d041c4](https://github.com/api-platform/core/commit/723d041c47467d8be0d8a0f20431da9de0a87c5a) fix(metadata): xml PHPize HTTP cache headers (#7140)
+* [d3d0ca21b](https://github.com/api-platform/core/commit/d3d0ca21bd45a8383e3e51166a65162be93655bf) fix(serializer): invalid uri variable 400 response (#7135)
+
+## v4.1.8
+
+### Bug fixes
+
+* [0cd9b9f70](https://github.com/api-platform/core/commit/0cd9b9f7002829a6238ed4a1731c3a123c4a91c4) fix: backport handling of union/intersection type in item normalizer (#7106)
+* [0fc0904b9](https://github.com/api-platform/core/commit/0fc0904b9409e81041d4d5ae48d699f3360208fc) fix(metadata): correct class to exclude defaults (#7088)
+* [5145a8383](https://github.com/api-platform/core/commit/5145a8383c8e234012b957a36701ec824774a817) fix: filtering not using strategy set in attribute when strategy not set per property (#7136)
+* [613bb5b75](https://github.com/api-platform/core/commit/613bb5b75fe6cbc79c99e06bcbd664fc3f25c167) fix(doctrine): filters schema for dates and numbers (#7131)
+* [ed1ef2594](https://github.com/api-platform/core/commit/ed1ef2594e72180e5fe153e762809e3c22b29e7f) fix(state): specify :property parameter properties (#7110)
+* [f55606b01](https://github.com/api-platform/core/commit/f55606b01179703fb4be44f1b66a36136852f154) fix(serializer): throw NotNormalizableValueException when resource not found or invalid IRI on denormalization
+* [3faf5d4b4](https://github.com/api-platform/core/commit/3faf5d4b44f7c39d7a9d6ecbcfdf90f7061f1b6f) fix(doctrine): order filter instance service
+* [0ff950f37](https://github.com/api-platform/core/commit/0ff950f376345ff6a6d39a202b8bef15c3e423d2) fix: type info deprecations to baseline
+* [d93d580a1](https://github.com/api-platform/core/commit/d93d580a1dbaf6a1af5f05f0ebde2f7b68d75d25) fix: command name deprecation
+
 ## v4.1.7
 
 ### Bug fixes

composer.json

@@ -115,7 +115,7 @@
         "symfony/serializer": "^6.4 || ^7.0",
         "symfony/translation-contracts": "^3.3",
         "symfony/type-info": "v7.3.0-BETA1",
-        "symfony/web-link": "^6.4 || ^7.0",
+        "symfony/web-link": "^6.4 || ^7.1",
         "willdurand/negotiation": "^3.1"
     },
     "require-dev": {

phpunit.xml.dist

@@ -38,6 +38,7 @@
       <directory>.</directory>
     </include>
     <exclude>
+      <directory>tests</directory>
       <directory>features</directory>
       <directory>vendor</directory>
       <file>.php-cs-fixer.dist.php</file>

src/Doctrine/Common/Filter/BackedEnumFilterTrait.php

@@ -32,7 +32,7 @@ trait BackedEnumFilterTrait
     use PropertyHelperTrait;
 
     /**
-     * @var array<string, string>
+     * @var array<string, class-string>
      */
     private array $enumTypes;
 
@@ -80,6 +80,14 @@ abstract protected function isBackedEnumField(string $property, string $resource
 
     private function normalizeValue($value, string $property): mixed
     {
+        $firstCase = $this->enumTypes[$property]::cases()[0] ?? null;
+        if (
+            \is_int($firstCase?->value)
+            && false !== filter_var($value, \FILTER_VALIDATE_INT)
+        ) {
+            $value = (int) $value;
+        }
+
         $values = array_map(fn (\BackedEnum $case) => $case->value, $this->enumTypes[$property]::cases());
 
         if (\in_array($value, $values, true)) {

src/Doctrine/Common/composer.json

@@ -25,7 +25,7 @@
     "require": {
         "php": ">=8.2",
         "api-platform/metadata": "^4.1",
-        "api-platform/state": "^4.1",
+        "api-platform/state": "^4.1.8",
         "doctrine/collections": "^2.1",
         "doctrine/common": "^3.2.2",
         "doctrine/persistence": "^3.2"

src/Doctrine/Odm/composer.json

@@ -27,7 +27,7 @@
         "php": ">=8.2",
         "api-platform/doctrine-common": "^4.1",
         "api-platform/metadata": "^4.1",
-        "api-platform/state": "^4.1",
+        "api-platform/state": "^4.1.8",
         "doctrine/mongodb-odm": "^2.10",
         "symfony/property-info": "^6.4 || ^7.1",
         "symfony/type-info": "v7.3.0-BETA1"

src/Doctrine/Orm/composer.json

@@ -26,7 +26,7 @@
         "php": ">=8.2",
         "api-platform/doctrine-common": "^4.1",
         "api-platform/metadata": "^4.1",
-        "api-platform/state": "^4.1",
+        "api-platform/state": "^4.1.8",
         "doctrine/orm": "^2.17 || ^3.0",
         "symfony/property-info": "^6.4 || ^7.1"
     },

src/Laravel/Eloquent/Extension/FilterQueryExtension.php

@@ -53,6 +53,11 @@ public function apply(Builder $builder, array $uriVariables, Operation $operatio
                 continue;
             }
 
+            // most eloquent filters work with only a single value
+            if (\is_array($values) && array_is_list($values) && 1 === \count($values)) {
+                $values = current($values);
+            }
+
             $filter = $filterId instanceof FilterInterface ? $filterId : ($this->filterLocator->has($filterId) ? $this->filterLocator->get($filterId) : null);
             if ($filter instanceof FilterInterface) {
                 $builder = $filter->apply($builder, $values, $parameter, $context + ($parameter->getFilterContext() ?? []));

src/Laravel/Eloquent/Filter/JsonApi/SortFilterParameterProvider.php

@@ -28,6 +28,12 @@ public function provide(Parameter $parameter, array $parameters = [], array $con
         $parameters = $operation->getParameters();
         $properties = $parameter->getExtraProperties()['_properties'] ?? [];
         $value = $parameter->getValue();
+
+        // most eloquent filters work with only a single value
+        if (\is_array($value) && array_is_list($value) && 1 === \count($value)) {
+            $value = current($value);
+        }
+
         if (!\is_string($value)) {
             return $operation;
         }

src/Laravel/Exception/ErrorHandler.php

@@ -15,6 +15,7 @@
 
 use ApiPlatform\Laravel\ApiResource\Error;
 use ApiPlatform\Laravel\Controller\ApiPlatformController;
+use ApiPlatform\Metadata\Exception\InvalidUriVariableException;
 use ApiPlatform\Metadata\Exception\ProblemExceptionInterface;
 use ApiPlatform\Metadata\Exception\StatusAwareExceptionInterface;
 use ApiPlatform\Metadata\HttpOperation;
@@ -192,7 +193,7 @@ private function getStatusCode(?HttpOperation $apiOperation, ?HttpOperation $err
             return $exception->getStatusCode();
         }
 
-        if ($exception instanceof RequestExceptionInterface) {
+        if ($exception instanceof RequestExceptionInterface || $exception instanceof InvalidUriVariableException) {
             return 400;
         }