From aea2f42b2346f96c5657b1d9a066f8a39499740c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Kukli=C5=84ski?= Date: Thu, 9 Nov 2023 08:38:17 +0100 Subject: [PATCH 1/2] fix(metadata): fix issues with extending {XML,Yaml} -> {XML,Yaml} resources --- src/Metadata/Extractor/YamlResourceExtractor.php | 3 ++- .../Factory/ExtractorResourceMetadataCollectionFactory.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Metadata/Extractor/YamlResourceExtractor.php b/src/Metadata/Extractor/YamlResourceExtractor.php index 841dbc3033f..a0afdcea2e8 100644 --- a/src/Metadata/Extractor/YamlResourceExtractor.php +++ b/src/Metadata/Extractor/YamlResourceExtractor.php @@ -75,6 +75,7 @@ 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 = []; @@ -82,7 +83,7 @@ private function buildResources(array $resourcesYaml, string $path): void 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), ]); diff --git a/src/Metadata/Resource/Factory/ExtractorResourceMetadataCollectionFactory.php b/src/Metadata/Resource/Factory/ExtractorResourceMetadataCollectionFactory.php index e15764ff642..235090287b6 100644 --- a/src/Metadata/Resource/Factory/ExtractorResourceMetadataCollectionFactory.php +++ b/src/Metadata/Resource/Factory/ExtractorResourceMetadataCollectionFactory.php @@ -60,7 +60,7 @@ public function create(string $resourceClass): ResourceMetadataCollection } } - $resourceMetadataCollection[$i] = $resource; + $resourceMetadataCollection[] = $resource; } return $resourceMetadataCollection; From 1250cb464eda19c8a90e82deb3c1e178124af4ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Kukli=C5=84ski?= Date: Thu, 9 Nov 2023 09:37:16 +0100 Subject: [PATCH 2/2] fix(metadata): apply cs fixer issues --- src/Metadata/Extractor/YamlResourceExtractor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Metadata/Extractor/YamlResourceExtractor.php b/src/Metadata/Extractor/YamlResourceExtractor.php index a0afdcea2e8..cfc9a6978eb 100644 --- a/src/Metadata/Extractor/YamlResourceExtractor.php +++ b/src/Metadata/Extractor/YamlResourceExtractor.php @@ -75,7 +75,7 @@ private function buildResources(array $resourcesYaml, string $path): void $resourceYaml = [$resourceYaml]; } - $resourcesCount = isset($this->resources[$resourceName]) ? count($this->resources[$resourceName]) : 0; + $resourcesCount = isset($this->resources[$resourceName]) ? \count($this->resources[$resourceName]) : 0; foreach ($resourceYaml as $key => $resourceYamlDatum) { if (null === $resourceYamlDatum) { $resourceYamlDatum = []; @@ -83,7 +83,7 @@ private function buildResources(array $resourcesYaml, string $path): void try { $base = $this->buildExtendedBase($resourceYamlDatum); - $this->resources[$resourceName][$resourcesCount+$key] = array_merge($base, [ + $this->resources[$resourceName][$resourcesCount + $key] = array_merge($base, [ 'operations' => $this->buildOperations($resourceYamlDatum, $base), 'graphQlOperations' => $this->buildGraphQlOperations($resourceYamlDatum, $base), ]);