1.1.39 Release

- Added metatdata - Fixed conflicts for ACSD-54106
magento · Oct 4, 2023 · 04fb33c · 04fb33c
1 parent 98f7bd8
commit 04fb33c
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 21 deletions.
diff --git a/patches-info.json b/patches-info.json
diff --git a/patches/os/ACSD-54106_2.4.4-p3.patch → patches/os/ACSD-54106_2.4.1.patch b/patches/os/ACSD-54106_2.4.4-p3.patch → patches/os/ACSD-54106_2.4.1.patch
diff --git a/patches/os/ACSD-54106_2.4.3.patch b/patches/os/ACSD-54106_2.4.3.patch
@@ -0,0 +1,62 @@
+diff --git a/vendor/magento/module-elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php b/vendor/magento/module-elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
+index f1ba54bf7e5..e927aee01aa 100644
+--- a/vendor/magento/module-elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
++++ b/vendor/magento/module-elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
+@@ -150,7 +150,7 @@ class StaticField implements FieldProviderInterface
+             $fieldMapping[$fieldName]['index'] = $index;
+         }
+
+-        if ($attributeAdapter->isSortable()) {
++        if ($attributeAdapter->isSortable() && !$attributeAdapter->isComplexType()) {
+             $sortFieldName = $this->fieldNameResolver->getFieldName(
+                 $attributeAdapter,
+                 ['type' => FieldMapperInterface::TYPE_SORT]
+@@ -161,7 +161,8 @@ class StaticField implements FieldProviderInterface
+                 ),
+                 'index' => $this->indexTypeConverter->convert(
+                     IndexTypeConverterInterface::INTERNAL_NO_ANALYZE_VALUE
+-                )
++                ),
++                'normalizer' => 'folding',
+             ];
+         }
+
+@@ -188,6 +189,21 @@ class StaticField implements FieldProviderInterface
+             $fieldMapping[$childFieldName] = [
+                 'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING)
+             ];
++            if ($attributeAdapter->isSortable()) {
++                $sortFieldName = $this->fieldNameResolver->getFieldName(
++                    $attributeAdapter,
++                    ['type' => FieldMapperInterface::TYPE_SORT]
++                );
++                $fieldMapping[$childFieldName]['fields'][$sortFieldName] = [
++                    'type' => $this->fieldTypeConverter->convert(
++                        FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD
++                    ),
++                    'index' => $this->indexTypeConverter->convert(
++                        IndexTypeConverterInterface::INTERNAL_NO_ANALYZE_VALUE
++                    ),
++                    'normalizer' => 'folding',
++                ];
++            }
+         }
+
+         return $fieldMapping;
+diff --git a/vendor/magento/module-elasticsearch/Model/Adapter/Index/Builder.php b/vendor/magento/module-elasticsearch/Model/Adapter/Index/Builder.php
+index 26ced6c8361..7e6d50b4a04 100644
+--- a/vendor/magento/module-elasticsearch/Model/Adapter/Index/Builder.php
++++ b/vendor/magento/module-elasticsearch/Model/Adapter/Index/Builder.php
+@@ -105,6 +105,12 @@ class Builder implements BuilderInterface
+                 'tokenizer' => $tokenizer,
+                 'filter' => array_merge($filter, $synonymFilter),
+                 'char_filter' => $charFilter,
++                'normalizer' => [
++                    'folding' => [
++                        'type' => 'custom',
++                        'filter' => ['asciifolding', 'lowercase'],
++                    ],
++                ],
+             ],
+         ];
+
diff --git a/support-patches.json b/support-patches.json
@@ -8620,7 +8620,7 @@
         "title": "Fixes the issue where the order item status is incorrectly set to \"Backordered\".",
         "packages": {
             "magento/magento2-base": {
-                ">=2.3.7 < 2.4.7": {
+                ">=2.3.7 <2.4.7": {
                     "file": "os/ACSD-51408_2.4.4.patch"
                 }
             }
@@ -9497,6 +9497,22 @@
             }
         }
     },
+    "ACSD-51574-V2": {
+        "categories": [
+            "Cache", "Catalog/Product"
+        ],
+        "title": "Fixes the issue where the image is not updated on the frontend after replacing it with another image with the same name.",
+        "packages": {
+            "magento/magento2-base": {
+                ">=2.4.2 <2.4.4": {
+                    "file": "os/ACSD-54501_2.4.3-p3.patch"
+                },
+                ">=2.4.4 <2.4.7": {
+                    "file": "os/ACSD-51574_2.4.5-p1.patch"
+                }
+            }
+        }
+    },
     "ACSD-53728": {
         "categories": [
             "Performance"
@@ -9769,6 +9785,15 @@
                     "file": "commerce/ACSD-54026_1.3.5.patch"
                 }
             }
+        },
+        "metadata": {
+            "and": [
+                {
+                    "type": "log",
+                    "path": "var/log/exception.log",
+                    "match": "GraphQlInputException(code: 0): Customer is not a company user. *vendor/magento/module-company-graph-ql/Model/Company/ResolverAccess.php"
+                }
+            ]
         }
     },
     "ACSD-54106": {
@@ -9778,8 +9803,14 @@
         "title": "Fixes the issue where category product sorting by name for Turkish accented characters is incorrect.",
         "packages": {
             "magento/magento2-base": {
-                ">=2.4.1 < 2.4.5": {
-                    "file": "os/ACSD-54106_2.4.4-p3.patch"
+                ">=2.4.1 <2.4.3": {
+                    "file": "os/ACSD-54106_2.4.1.patch"
+                },
+                ">=2.4.3 <2.4.5": {
+                    "file": "os/ACSD-54106_2.4.3.patch",
+                    "require": [
+                        "MDVA-43731"
+                    ]
                 }
             }
         }
@@ -9848,7 +9879,7 @@
         "title": "Fixes the issue where a Dynamic Block based on a Customer Segment doesn't work correctly after logging out from a customer account.",
         "packages": {
             "magento/magento2-base": {
-                ">=2.4.4-p2 <2.4.5 || >=2.4.5-p1 < 2.4.7": {
+                ">=2.4.4-p2 <2.4.5 || >=2.4.5-p1 <2.4.7": {
                     "file": "os/ACSD-53998_2.4.5-p2.patch"
                 }
             }
@@ -9865,6 +9896,15 @@
                     "file": "os/ACSD-53204_2.4.6.patch"
                 }
             }
+        },
+        "metadata": {
+            "and": [
+                {
+                    "type": "log",
+                    "path": "var/log/exception.log",
+                    "match": "report.CRITICAL: Magento\\Framework\\Exception\\FileSystemException: File *media/catalog/product/* does not exist. in *vendor/magento/framework/Image/Adapter/Gd2.php"
+                }
+            ]
         }
     },
     "ACSD-47657": {
@@ -9888,21 +9928,5 @@
                 }
             ]
         }
-    },
-    "ACSD-51574-V2": {
-        "categories": [
-            "Cache", "Catalog/Product"
-        ],
-        "title": "Fixes the issue where the image is not updated on the frontend after replacing it with another image with the same name.",
-        "packages": {
-            "magento/magento2-base": {
-                ">=2.4.2 <2.4.4": {
-                    "file": "os/ACSD-54501_2.4.3-p3.patch"
-                },
-                ">=2.4.4 <2.4.7": {
-                    "file": "os/ACSD-51574_2.4.5-p1.patch"
-                }
-            }
-        }
     }
 }
diff --git a/tests/metadata/ACSD-53204/var/log/exception.log b/tests/metadata/ACSD-53204/var/log/exception.log
@@ -0,0 +1 @@
+report.CRITICAL: Magento\Framework\Exception\FileSystemException: File "/app/pub/media/catalog/product/_/o/_object_Object_.jpg" does not exist. in /app/vendor/magento/framework/Image/Adapter/Gd2.php:65
diff --git a/tests/metadata/ACSD-54026/var/log/exception.log b/tests/metadata/ACSD-54026/var/log/exception.log
@@ -0,0 +1 @@
+[previous exception] [object] (Magento\\Framework\\GraphQl\\Exception\\GraphQlInputException(code: 0): Customer is not a company user. at /app/vendor/magento/module-company-graph-ql/Model/Company/ResolverAccess.php:55)"} []