Merge branch '1.1' into 1.2

pimcore · Sep 27, 2024 · ca70b28 · ca70b28
2 parents 1757342 + a266675
commit ca70b28
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml
@@ -60,7 +60,7 @@ jobs:
 
             - name: "Upload baseline file"
               if: ${{ failure() }}
-              uses: actions/upload-artifact@v2
+              uses: actions/upload-artifact@v4
               with:
                   name: phpstan-baseline.neon
                   path: phpstan-baseline.neon
diff --git a/composer.json b/composer.json
@@ -26,7 +26,6 @@
     "symfony/messenger": "^6.4"
   },
   "require-dev": {
-    "roave/security-advisories": "dev-latest",
     "codeception/codeception": "^5.0.10",
     "codeception/phpunit-wrapper": "^9",
     "codeception/module-asserts": "^2",

diff --git a/src/Service/Serializer/Denormalizer/Search/AssetSearchResultDenormalizer.php b/src/Service/Serializer/Denormalizer/Search/AssetSearchResultDenormalizer.php
@@ -92,12 +92,11 @@ private function hydrateMetadata(array $standardFields): array
     {
         $result = [];
 
-        foreach ($standardFields as $language => $fields) {
-            foreach ($fields as $fieldName => $fieldData) {
-
+        foreach ($standardFields as $fieldName => $data) {
+            foreach ($data as $languageKey => $fieldData) {
                 $result[] = new AssetMetaData(
                     name: $fieldName,
-                    language: $language !== MappingProperty::NOT_LOCALIZED_KEY ? $language : null,
+                    language: $languageKey !== MappingProperty::NOT_LOCALIZED_KEY ? $languageKey : null,
                     data: $fieldData,
                 );
             }