Merge 4.0

Author: soyuka

.php-cs-fixer.dist.php

@@ -29,6 +29,7 @@
     ]);
 
 return (new PhpCsFixer\Config())
+    ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
     ->setRiskyAllowed(true)
     ->setRules([
         '@DoctrineAnnotation' => true,

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## v4.0.11
+
+### Bug fixes
+
+* [af66075fd](https://github.com/api-platform/core/commit/af66075fdd6b83bdebc1c4ca33cc0ab7e1a7f8af) fix(laravel): fix foregin keys (relations) beeing in attributes (#6843)
+
+
+### Features
+
+* [2d59c6369](https://github.com/api-platform/core/commit/2d59c63699b4602cfe4d62504896c6d4121c1be4) feat(laravel): belongs to many relations (#6818)
+
+Also contains [v3.4.8 changes](#v348).
+
 ## v4.0.10
 
 ### Bug fixes
@@ -211,6 +224,16 @@ Notes:
 
 * [0d5f35683](https://github.com/api-platform/core/commit/0d5f356839eb6aa9f536044abe4affa736553e76) feat(laravel): laravel component (#5882)
 
+## v3.4.8
+
+### Bug fixes
+
+* [4d7deeaf7](https://github.com/api-platform/core/commit/4d7deeaf794178b5496ae989520095831a86df8a) fix(jsonld): check if supportedTypes exists (#6825)
+* [5111935d4](https://github.com/api-platform/core/commit/5111935d4f917920c6f3d24b828f9d59fd0e3520) fix(symfony): object typed property schema collection restriction (#6823)
+* [6bf894f6f](https://github.com/api-platform/core/commit/6bf894f6f0ead0751936aeddcfc527f017498bb3) fix(serializer): use attribute denormalization context for constructor arguments (#6821)
+* [86c97cac3](https://github.com/api-platform/core/commit/86c97cac3b8d45b6190e2999b99a02e88dd4e527) fix(symfony): symfony 7.2 deprecations (#6835)
+* [d312eae7e](https://github.com/api-platform/core/commit/d312eae7ef590ec05139c09bfaf2d3c7668a3f22) fix(doctrine): fixed orm datefilter applying inner join when no filtering values have been provided (#6849)
+
 ## v3.4.7
 
 ### Bug fixes

features/security/strong_typing.feature

@@ -89,6 +89,19 @@ Feature: Handle properly invalid data submitted to the API
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/problem+json; charset=utf-8"
 
+  Scenario: Ignore date with wrong format
+    When I add "Content-Type" header equal to "application/ld+json"
+    And I send a "POST" request to "/dummies" with body:
+    """
+    {
+      "name": "Invalid date format",
+      "dummyDateWithFormat": "2020-01-01T00:00:00+00:00"
+    }
+    """
+    Then the response status code should be 400
+    And the response should be in JSON
+    And the header "Content-Type" should be equal to "application/problem+json; charset=utf-8"
+
   Scenario: Send non-array data when an array is expected
     When I add "Content-Type" header equal to "application/ld+json"
     And I send a "POST" request to "/dummies" with body:

src/Doctrine/Orm/Filter/DateFilter.php

@@ -153,7 +153,7 @@ protected function filterProperty(string $property, $values, QueryBuilder $query
         $alias = $queryBuilder->getRootAliases()[0];
         $field = $property;
 
-        if ($this->isPropertyNested($property, $resourceClass)) {
+        if ($this->isPropertyNested($property, $resourceClass) && \count($values) > 0) {
             [$alias, $field] = $this->addJoinsForNestedProperty($property, $alias, $queryBuilder, $queryNameGenerator, $resourceClass, Join::INNER_JOIN);
         }
 

src/Elasticsearch/Serializer/NameConverter/InnerFieldsNameConverter.php

@@ -24,7 +24,7 @@
  *
  * @author Baptiste Meyer <[email protected]>
  */
-final class InnerFieldsNameConverter implements AdvancedNameConverterInterface
+final class InnerFieldsNameConverter implements NameConverterInterface, AdvancedNameConverterInterface
 {
     public function __construct(private readonly NameConverterInterface $inner = new CamelCaseToSnakeCaseNameConverter())
     {

src/JsonApi/Serializer/ReservedAttributeNameConverter.php

@@ -22,7 +22,7 @@
  *
  * @author Baptiste Meyer <[email protected]>
  */
-final class ReservedAttributeNameConverter implements AdvancedNameConverterInterface
+final class ReservedAttributeNameConverter implements NameConverterInterface, AdvancedNameConverterInterface
 {
     public const JSON_API_RESERVED_ATTRIBUTES = [
         'id' => '_id',

src/JsonLd/Serializer/ErrorNormalizer.php

@@ -57,6 +57,10 @@ public function supportsNormalization(mixed $data, ?string $format = null, array
 
     public function getSupportedTypes(?string $format): array
     {
-        return $this->inner->getSupportedTypes($format);
+        if (method_exists($this->inner, 'getSupportedTypes')) {
+            return $this->inner->getSupportedTypes($format);
+        }
+
+        return [];
     }
 }

src/Laravel/ApiPlatformMiddleware.php

@@ -26,7 +26,7 @@ public function __construct(
     }
 
     /**
-     * @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
+     * @param \Closure(Request): (Response) $next
      */
     public function handle(Request $request, \Closure $next, ?string $operationName = null): Response
     {

src/Laravel/Eloquent/Metadata/ModelMetadata.php

@@ -67,8 +67,14 @@ public function getAttributes(Model $model): Collection
         $table = $model->getTable();
         $columns = $schema->getColumns($table);
         $indexes = $schema->getIndexes($table);
+        $relations = $this->getRelations($model);
 
         return collect($columns)
+            ->reject(
+                fn ($column) => $relations->contains(
+                    fn ($relation) => $relation['foreign_key'] === $column['name']
+                )
+            )
             ->map(fn ($column) => [
                 'name' => $column['name'],
                 'type' => $column['type'],

src/Laravel/Eloquent/State/CollectionProvider.php

@@ -58,6 +58,29 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
             $query = $extension->apply($query, $uriVariables, $operation, $context);
         }
 
+        if ($order = $operation->getOrder()) {
+            $isList = array_is_list($order);
+            foreach ($order as $property => $direction) {
+                if ($isList) {
+                    $property = $direction;
+                    $direction = 'ASC';
+                }
+
+                if (str_contains($property, '.')) {
+                    [$table, $property] = explode('.', $property);
+
+                    // Relation Order by, we need to do laravel eager loading
+                    $query->with([
+                        $table => fn ($query) => $query->orderBy($property, $direction),
+                    ]);
+
+                    continue;
+                }
+
+                $query->orderBy($property, $direction);
+            }
+        }
+
         if (false === $this->pagination->isEnabled($operation, $context)) {
             return $query->get();
         }