Merge 4.1

Author: soyuka

Eloquent/Metadata/ModelMetadata.php

@@ -101,12 +101,12 @@ public function getAttributes(Model $model): Collection
     }
 
     /**
-     * @param array<int, array{columns: string[]}> $indexes
+     * @param array<int, array{columns: string[], primary?: bool}> $indexes
      */
     private function isColumnPrimaryKey(array $indexes, string $column): bool
     {
         foreach ($indexes as $index) {
-            if (\in_array($column, $index['columns'], true)) {
+            if (\in_array($column, $index['columns'], true) && (true === ($index['primary'] ?? false))) {
                 return true;
             }
         }

Eloquent/State/PersistProcessor.php

@@ -18,8 +18,11 @@
 use ApiPlatform\Metadata\HttpOperation;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProcessorInterface;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**
  * @implements ProcessorInterface<\Illuminate\Database\Eloquent\Model, \Illuminate\Database\Eloquent\Model>
@@ -45,7 +48,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
                 continue;
             }
 
-            if (BelongsTo::class === $relation['type']) {
+            if (BelongsTo::class === $relation['type'] || MorphTo::class === $relation['type']) {
                 $rel = $data->{$relation['name']};
 
                 if (!$rel->exists) {
@@ -57,10 +60,10 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
                 $this->relations[$relation['method_name']] = $relation['name'];
             }
 
-            if (HasMany::class === $relation['type']) {
+            if (HasMany::class === $relation['type'] || MorphMany::class === $relation['type']) {
                 $rel = $data->{$relation['name']};
 
-                if (!\is_array($rel)) {
+                if (!\is_array($rel) && !$rel instanceof Collection) {
                     throw new RuntimeException('To-Many relationship is not a collection.');
                 }
 

State/AccessCheckerProvider.php

@@ -21,7 +21,7 @@
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
 /**
- * Allows access based on the ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface.
+ * Allows access based on the ApiPlatform\Metadata\ResourceAccessCheckerInterface.
  * This implementation covers GraphQl and HTTP.
  *
  * @see ResourceAccessCheckerInterface

Tests/EloquentTest.php

@@ -523,4 +523,19 @@ public function testRelationIsHandledOnCreateWithNestedDataToMany(): void
             ],
         ]);
     }
+
+    public function testPostWithEmptyMorphMany(): void
+    {
+        $response = $this->postJson('/api/post_with_morph_manies', [
+            'title' => 'My first post',
+            'content' => 'This is the content of my first post.',
+            'comments' => [['content' => 'hello']],
+        ], ['accept' => 'application/ld+json', 'content-type' => 'application/ld+json']);
+        $response->assertStatus(201);
+        $response->assertJson([
+            'title' => 'My first post',
+            'content' => 'This is the content of my first post.',
+            'comments' => [['content' => 'hello']],
+        ]);
+    }
 }

Tests/ValidationTest.php

@@ -57,4 +57,12 @@ public function testValidationSnakeCase(): void
         $response = $this->postJson('/api/issue_6932', $data, ['accept' => 'application/ld+json', 'content-type' => 'application/ld+json']);
         $response->assertStatus(422);
     }
+
+    public function testRouteWithRequirements(): void
+    {
+        $response = $this->get('api/issue_7194_requirements/test', ['accept' => 'application/ld+json']);
+        $response->assertStatus(404);
+        $response = $this->get('api/issue_7194_requirements/1', ['accept' => 'application/ld+json']);
+        $response->assertStatus(200);
+    }
 }

composer.json

@@ -86,7 +86,8 @@
         },
         "branch-alias": {
             "dev-main": "4.2.x-dev",
-            "dev-3.4": "3.4.x-dev"
+            "dev-3.4": "3.4.x-dev",
+            "dev-4.1": "4.1.x-dev"
         },
         "symfony": {
             "require": "^6.4 || ^7.1"
@@ -126,5 +127,6 @@
             "type": "vcs",
             "url": "https://github.com/soyuka/phpunit"
         }
-    ]
+    ],
+    "version": "v4.1.15"
 }