Merge pull request #137 from magento-commerce/develop

MCLOUD-13605: 1.1.5 release

Author: prateek-karanpuria-adobe

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento-cloud-patches",
     "description": "Provides critical fixes for Magento 2 Enterprise Edition",
     "type": "magento2-component",
-    "version": "1.1.2",
+    "version": "1.1.5",
     "license": "OSL-3.0",
     "repositories": {
         "repo.magento.com": {
@@ -13,15 +13,15 @@
     "require": {
         "php": "^8.0",
         "ext-json": "*",
-        "composer/composer": "^1.9 || ^2.0",
+        "composer/composer": "^1.9 || ^2.8 || !=2.2.16",
         "composer/semver": "@stable",
-        "monolog/monolog": "^1.25||^2.3||^2.7|| ^3.6",
-        "symfony/config": "^3.3||^4.4||^5.0||^6.0",
-        "symfony/console": "^2.8 || ^4.0 || ^5.1 || ^5.4 || ^6.4",
-        "symfony/dependency-injection": "^3.3||^4.3||^5.0||^6.0",
-        "symfony/process": "^2.1 || ^4.1 || ^5.1 || ^5.4 || ^6.4",
+        "monolog/monolog": "^2.3 || ^2.7 || ^3.6",
+        "symfony/config": "^4.4 || ^5.1 || ^5.4 || ^6.4",
+        "symfony/console": "^4.4 || ^5.1 || ^5.4 || ^6.4",
+        "symfony/dependency-injection": "^4.4 || ^5.1 || ^5.4 || ^6.4",
+        "symfony/process": "^4.4 || ^5.1 || ^5.4 || ^6.4",
         "symfony/proxy-manager-bridge": "^3.3||^4.3||^5.0||^6.0",
-        "symfony/yaml": "^3.3||^4.0||^5.0||^6.0||^7.0",
+        "symfony/yaml": "^4.4 || ^5.1 || ^5.4 || ^6.4",
         "magento/quality-patches": "^1.1.0"
     },
     "require-dev": {
@@ -32,7 +32,7 @@
         "codeception/module-rest": "^1.2 || ^3.0",
         "consolidation/robo": "^1.2 || ^3.0 || ^5.0",
         "phpmd/phpmd": "@stable",
-        "phpunit/phpunit": "^8.5 || ^9.5",
+        "phpunit/phpunit": "^10.0",
         "squizlabs/php_codesniffer": "^3.0"
     },
     "bin": [

patches.json

@@ -292,6 +292,12 @@
       ">=2.4.5 <2.4.5-p9": "MCLOUD-12969__Patch_for_CVE_2024_34102_KeyRotation__2.4.5.patch",
       ">=2.4.6 <2.4.6-p7": "MCLOUD-12969__Patch_for_CVE_2024_34102_KeyRotation__2.4.6.patch",
       ">=2.4.7 <2.4.7-p2": "MCLOUD-12969__Patch_for_CVE_2024_34102_KeyRotation__2.4.7.patch"
+    },
+    "Patch for CVE-2025-24434 - Improve-web-api-async": {
+      ">=2.4.4 <2.4.4-p12": "MCLOUD-13240__Patch_for_CVE_2025_24434_improve_web_api_async__2.4.4.patch",
+      ">=2.4.5 <2.4.5-p11": "MCLOUD-13240__Patch_for_CVE_2025_24434_improve_web_api_async__2.4.5.patch",
+      ">=2.4.6 <2.4.6-p9": "MCLOUD-13240__Patch_for_CVE_2025_24434_improve_web_api_async__2.4.6.patch",
+      ">=2.4.7 <2.4.7-p4": "MCLOUD-13240__Patch_for_CVE_2025_24434_improve_web_api_async__2.4.7.patch"
     }
   },
   "magento/module-paypal": {
@@ -385,6 +391,12 @@
     },
     "Fields hydration on company account create request": {
       ">=1.3.3 <1.3.3-p11 || >=1.3.4 <1.3.4-p10 || >=1.3.5 <1.3.5-p8 || >=1.4.2 <1.4.2-p3": "B2B-4051__fields_hydration_company_account_create_request__1.3.3.patch"
+    },
+    "Fixes the issue where the file generated after Requisition List export is not removed from the var/ directory": {
+      ">=1.3.1 <1.3.6": "MCLOUD-11623__requisition_list_exports_saved_to_var_directory__2.4.5-p1.patch"
+    },
+    "Fixes the issue where an SQL syntax error occurs due to the non-existence of the REGEXP_LIKE function when attempting to update the company_structure table.": {
+      "1.5.2": "MCLOUD-13605__B2B_SQL_syntax_error_due_to_the_REGEXP_LIKE_function__1.5.2.patch"
     }
   },
   "magento/magento2-ee-base": {

patches/MCLOUD-11623__requisition_list_exports_saved_to_var_directory__2.4.5-p1.patch

@@ -0,0 +1,22 @@
+diff --git a/vendor/magento/module-requisition-list/Controller/Requisition/Export.php b/vendor/magento/module-requisition-list/Controller/Requisition/Export.php
+index e8332a7f1091..7eee2f51b7f4 100644
+--- a/vendor/magento/module-requisition-list/Controller/Requisition/Export.php
++++ b/vendor/magento/module-requisition-list/Controller/Requisition/Export.php
+@@ -101,9 +101,15 @@ public function execute()
+ 
+         $fileName = "{$requisitionList->getName()}.{$writer->getFileExtension()}";
+ 
++        $content = [
++            'type'  => "string",
++            'value' => $this->requisitionListExport->export(),
++            'rm'    => true,
++        ];
++
+         return $this->fileFactory->create(
+             $fileName,
+-            $this->requisitionListExport->export(),
++            $content,
+             DirectoryList::VAR_DIR,
+             $writer->getContentType()
+         );
+