fix(metadata): issues with extending xml/yaml resources (api-platform#5956)

Author: senghe

src/Metadata/Extractor/YamlResourceExtractor.php

@@ -80,14 +80,15 @@ private function buildResources(array $resourcesYaml, string $path): void
                 $resourceYaml = [$resourceYaml];
             }
 
+            $resourcesCount = isset($this->resources[$resourceName]) ? \count($this->resources[$resourceName]) : 0;
             foreach ($resourceYaml as $key => $resourceYamlDatum) {
                 if (null === $resourceYamlDatum) {
                     $resourceYamlDatum = [];
                 }
 
                 try {
                     $base = $this->buildExtendedBase($resourceYamlDatum);
-                    $this->resources[$resourceName][$key] = array_merge($base, [
+                    $this->resources[$resourceName][$resourcesCount + $key] = array_merge($base, [
                         'operations' => $this->buildOperations($resourceYamlDatum, $base),
                         'graphQlOperations' => $this->buildGraphQlOperations($resourceYamlDatum, $base),
                     ]);

src/Metadata/Tests/Extractor/YamlExtractorTest.php

@@ -551,6 +551,29 @@ public function testInputAndOutputAreStrings(): void
         $this->assertSame(Program::class.'Output', $resources[Program::class][0]['operations'][0]['output']);
     }
 
+    public function testExtendingYamlResourcesByMultipleYamlFiles(): void
+    {
+        $extractor = new YamlResourceExtractor([
+            __DIR__.'/yaml/extending-base.yaml',
+            __DIR__.'/yaml/extending-additional.yaml',
+        ]);
+        $resources = $extractor->getResources();
+
+        $this->assertArrayHasKey(User::class, $resources);
+        $this->assertCount(2, $resources[User::class], 'Expected two resource definitions for User class');
+
+        $this->assertSame('/users{._format}', $resources[User::class][0]['uriTemplate']);
+        $this->assertSame('Base user resource', $resources[User::class][0]['description']);
+        $this->assertArrayHasKey('operations', $resources[User::class][0]);
+        $this->assertCount(2, $resources[User::class][0]['operations']);
+
+        $this->assertSame('/admin/users{._format}', $resources[User::class][1]['uriTemplate']);
+        $this->assertSame('Admin user resource', $resources[User::class][1]['description']);
+        $this->assertSame('is_granted("ROLE_ADMIN")', $resources[User::class][1]['security']);
+        $this->assertArrayHasKey('operations', $resources[User::class][1]);
+        $this->assertCount(1, $resources[User::class][1]['operations']);
+    }
+
     #[\PHPUnit\Framework\Attributes\DataProvider('getInvalidPaths')]
     public function testInvalidYaml(string $path, string $error): void
     {

src/Metadata/Tests/Extractor/yaml/extending-additional.yaml

@@ -0,0 +1,8 @@
+resources:
+    ApiPlatform\Metadata\Tests\Fixtures\ApiResource\User:
+        -   uriTemplate: /admin/users{._format}
+            description: Admin user resource
+            security: 'is_granted("ROLE_ADMIN")'
+            operations:
+                ApiPlatform\Metadata\GetCollection:
+                    uriTemplate: /admin/users{._format}

src/Metadata/Tests/Extractor/yaml/extending-base.yaml

@@ -0,0 +1,9 @@
+resources:
+    ApiPlatform\Metadata\Tests\Fixtures\ApiResource\User:
+        -   uriTemplate: /users{._format}
+            description: Base user resource
+            operations:
+                ApiPlatform\Metadata\GetCollection:
+                    uriTemplate: /users{._format}
+                ApiPlatform\Metadata\Get:
+                    uriTemplate: /users/{id}{._format}