Merge pull request #139 from magento-commerce/1.1.36-release

1.1.36 Release
magento · Aug 10, 2023 · aa53034 · aa53034
2 parents c791d81 + d2ceaf6
commit aa53034
Show file tree

Hide file tree

Showing 30 changed files with 1,855 additions and 269 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/quality-patches",
     "description": "Provides quality patches for AdobeCommerce & Magento OpenSource",
     "type": "magento2-component",
-    "version": "1.1.35",
+    "version": "1.1.36",
     "license": "proprietary",
     "repositories": {
         "repo": {

diff --git a/patches-info.json b/patches-info.json
diff --git a/patches/commerce/ACSD-52419_2.4.5-p2.patch b/patches/commerce/ACSD-52419_2.4.5-p2.patch
@@ -0,0 +1,65 @@
+diff --git a/vendor/magento/module-customer-custom-attributes/view/frontend/layout/customer_account_edit.xml b/vendor/magento/module-customer-custom-attributes/view/frontend/layout/customer_account_edit.xml
+index 7824cbd91186..6b2b4869c893 100644
+--- a/vendor/magento/module-customer-custom-attributes/view/frontend/layout/customer_account_edit.xml
++++ b/vendor/magento/module-customer-custom-attributes/view/frontend/layout/customer_account_edit.xml
+@@ -23,6 +23,7 @@
+                     <argument name="code" xsi:type="string">Magento\Customer\Model\Customer</argument>
+                 </action>
+                 <arguments>
++                    <argument name="button_lock_manager" xsi:type="object">Magento\Framework\View\Element\ButtonLockManager</argument>
+                     <argument name="view_model" xsi:type="object">CustomerFileAttribute</argument>
+                 </arguments>
+             </block>
+diff --git a/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/edit.phtml b/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/edit.phtml
+index 7d2543c73854..97bb8fe08912 100644
+--- a/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/edit.phtml
++++ b/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/edit.phtml
+@@ -129,7 +129,10 @@ use Magento\Customer\Block\Widget\Taxvat;
+
+     <div class="actions-toolbar">
+         <div class="primary">
+-            <button type="submit" class="action save primary" title="<?= $block->escapeHtmlAttr(__('Save')) ?>">
++            <button type="submit" class="action save primary" title="<?= $block->escapeHtmlAttr(__('Save')) ?>"
++                <?php if ($block->getButtonLockManager()->isDisabled('customer_edit_form_submit')): ?>
++                    disabled="disabled"
++                <?php endif; ?>>
+                 <span><?= $block->escapeHtml(__('Save')) ?></span>
+             </button>
+         </div>
+diff --git a/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/register.phtml b/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/register.phtml
+index 70d10a3f1d16..30a495f6676a 100644
+--- a/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/register.phtml
++++ b/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/register.phtml
+@@ -25,8 +25,6 @@ $directoryHelper = $block->getData('directoryHelper');
+ $formData = $block->getFormData();
+ /** @var \Magento\CustomerCustomAttributes\ViewModel\Address\RegionProvider $regionProvider */
+ $regionProvider = $block->getRegionProvider();
+-/** @var \Magento\Customer\ViewModel\CreateAccountButton $createAccountButtonViewModel */
+-$createAccountButtonViewModel = $block->getData('create_account_button_view_model');
+ ?>
+ <form class="form create account form-create-account"
+       action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>"
+@@ -322,7 +320,9 @@ $createAccountButtonViewModel = $block->getData('create_account_button_view_mode
+                     class="action submit primary"
+                     title="<?= $block->escapeHtmlAttr(__('Create an Account')) ?>"
+                     id="send2"
+-                <?php if ($createAccountButtonViewModel->disabled()): ?> disabled="disabled" <?php endif; ?>>
++                <?php if ($block->getButtonLockManager()->isDisabled('customer_create_form_submit')): ?>
++                    disabled="disabled"
++                <?php endif; ?>>
+                 <span><?= $block->escapeHtml(__('Create an Account')) ?></span>
+             </button>
+         </div>
+diff --git a/vendor/magento/module-invitation/view/frontend/layout/magento_invitation_customer_account_create.xml b/vendor/magento/module-invitation/view/frontend/layout/magento_invitation_customer_account_create.xml
+index 6b7bba3fc6f9..00549d670255 100644
+--- a/vendor/magento/module-invitation/view/frontend/layout/magento_invitation_customer_account_create.xml
++++ b/vendor/magento/module-invitation/view/frontend/layout/magento_invitation_customer_account_create.xml
+@@ -12,7 +12,7 @@
+             <block class="Magento\Invitation\Block\Customer\Form\Register" name="customer_form_register_invitation" template="Magento_Customer::form/register.phtml" cacheable="false">
+                 <container name="form.additional.info" as="form_additional_info"/>
+                 <arguments>
+-                    <argument name="create_account_button_view_model" xsi:type="object">Magento\Customer\ViewModel\CreateAccountButton</argument>
++                    <argument name="button_lock_manager" xsi:type="object">Magento\Framework\View\Element\ButtonLockManager</argument>
+                 </arguments>
+             </block>
+             <block class="Magento\Cookie\Block\RequireCookie" name="require-cookie" template="Magento_Cookie::require_cookie.phtml">
diff --git a/patches/commerce/ACSD-52906_2.4.4-p3.patch b/patches/commerce/ACSD-52906_2.4.4-p3.patch
@@ -0,0 +1,13 @@
+diff --git a/vendor/magento/module-customer-segment/Model/Customer.php b/vendor/magento/module-customer-segment/Model/Customer.php
+index 9ac45f6facc8..5a115fc97cd7 100644
+--- a/vendor/magento/module-customer-segment/Model/Customer.php
++++ b/vendor/magento/module-customer-segment/Model/Customer.php
+@@ -349,7 +349,7 @@ public function addCustomerToWebsiteSegments(int $customerId, int $websiteId, ar
+         );
+
+         $value = array_filter($this->_customerWebsiteSegments[$websiteId][$customerId]);
+-        $this->_httpContext->setValue(Data::CONTEXT_SEGMENT, $value, $value);
++        $this->_httpContext->setValue(Data::CONTEXT_SEGMENT, $value, []);
+
+         $visitorCustomerSegmentIds = $this->_customerSession->getCustomerSegmentIds();
+
diff --git a/patches/commerce/ACSD-53176_2.4.4-p1.patch b/patches/commerce/ACSD-53176_2.4.4-p1.patch
@@ -0,0 +1,12 @@
+diff --git a/vendor/magento/module-target-rule/Model/Rule/Condition/Product/Attributes/SqlBuilder.php b/vendor/magento/module-target-rule/Model/Rule/Condition/Product/Attributes/SqlBuilder.php
+index f5032017822..4b833afaa67 100644
+--- a/vendor/magento/module-target-rule/Model/Rule/Condition/Product/Attributes/SqlBuilder.php
++++ b/vendor/magento/module-target-rule/Model/Rule/Condition/Product/Attributes/SqlBuilder.php
+@@ -364,6 +364,6 @@ class SqlBuilder
+      */
+     protected function normalizeConditionValue($condition)
+     {
+-        return $condition->getValue();
++        return $condition->getValueParsed();
+     }
+ }
diff --git a/patches/os/ACSD-47875_1.2.4-p1.patch b/patches/os/ACSD-47875_1.2.4-p1.patch
@@ -0,0 +1,55 @@
+diff --git a/vendor/magento/module-inventory-catalog/Model/GetStockIdForCurrentWebsite.php b/vendor/magento/module-inventory-catalog/Model/GetStockIdForCurrentWebsite.php
+index b5423333d25..c73203be8b6 100644
+--- a/vendor/magento/module-inventory-catalog/Model/GetStockIdForCurrentWebsite.php
++++ b/vendor/magento/module-inventory-catalog/Model/GetStockIdForCurrentWebsite.php
+@@ -7,9 +7,11 @@ declare(strict_types=1);
+
+ namespace Magento\InventoryCatalog\Model;
+
++use Magento\Framework\App\ObjectManager;
+ use Magento\InventorySalesApi\Api\Data\SalesChannelInterface;
+ use Magento\InventorySalesApi\Api\StockResolverInterface;
+ use Magento\Store\Model\StoreManagerInterface;
++use Magento\Framework\HTTP\PhpEnvironment\Request;
+
+ /**
+  * Service for get stock id for current website.
+@@ -26,24 +28,36 @@ class GetStockIdForCurrentWebsite
+      */
+     private $stockResolver;
+
++    /**
++     * @var Request
++     */
++    private Request $request;
++
+     /**
+      * @param StoreManagerInterface $storeManager
+      * @param StockResolverInterface $stockResolver
++     * @param Request|null $request
+      */
+     public function __construct(
+         StoreManagerInterface $storeManager,
+-        StockResolverInterface $stockResolver
++        StockResolverInterface $stockResolver,
++        Request $request = null
+     ) {
+         $this->storeManager = $storeManager;
+         $this->stockResolver = $stockResolver;
++        $this->request = $request ?: ObjectManager::getInstance()->get(Request::class);
+     }
+
+     /**
++     * Determine stock id in use based on current store context
++     *
+      * @return int
+      */
+     public function execute(): int
+     {
+-        $websiteCode = $this->storeManager->getWebsite()->getCode();
++        $storeId = $this->request->getParam('store');
++        $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
++        $websiteCode = $this->storeManager->getWebsite($websiteId)->getCode();
+
+         $stock = $this->stockResolver->execute(SalesChannelInterface::TYPE_WEBSITE, $websiteCode);
+         $stockId = (int)$stock->getStockId();
diff --git a/patches/os/ACSD-47875_2.4.4-p1.patch b/patches/os/ACSD-47875_2.4.4-p1.patch
@@ -0,0 +1,110 @@
+diff --git a/vendor/magento/module-store/App/FrontController/Plugin/DefaultStore.php b/vendor/magento/module-store/App/FrontController/Plugin/DefaultStore.php
+deleted file mode 100644
+index 58340c6cc35..00000000000
+--- a/vendor/magento/module-store/App/FrontController/Plugin/DefaultStore.php
++++ /dev/null
+@@ -1,73 +0,0 @@
+-<?php
+-/**
+- * Copyright © Magento, Inc. All rights reserved.
+- * See COPYING.txt for license details.
+- */
+-namespace Magento\Store\App\FrontController\Plugin;
+-
+-use \Magento\Store\Model\StoreResolver\ReaderList;
+-use \Magento\Store\Model\ScopeInterface;
+-
+-/**
+- * Plugin to set default store for admin area.
+- */
+-class DefaultStore
+-{
+-    /**
+-     * @var \Magento\Store\Model\StoreManagerInterface
+-     */
+-    protected $storeManager;
+-
+-    /**
+-     * @var ReaderList
+-     */
+-    protected $readerList;
+-
+-    /**
+-     * @var string
+-     */
+-    protected $runMode;
+-
+-    /**
+-     * @var string
+-     */
+-    protected $scopeCode;
+-
+-    /**
+-     * Initialize dependencies.
+-     *
+-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+-     * @param ReaderList $readerList
+-     * @param string $runMode
+-     * @param null $scopeCode
+-     */
+-    public function __construct(
+-        \Magento\Store\Model\StoreManagerInterface $storeManager,
+-        ReaderList $readerList,
+-        $runMode = ScopeInterface::SCOPE_STORE,
+-        $scopeCode = null
+-    ) {
+-        $this->runMode = $scopeCode ? $runMode : ScopeInterface::SCOPE_WEBSITE;
+-        $this->scopeCode = $scopeCode;
+-        $this->readerList = $readerList;
+-        $this->storeManager = $storeManager;
+-    }
+-
+-    /**
+-     * Set current store for admin area
+-     *
+-     * @param \Magento\Framework\App\FrontController $subject
+-     * @param \Magento\Framework\App\RequestInterface $request
+-     * @return void
+-     *
+-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+-     */
+-    public function beforeDispatch(
+-        \Magento\Framework\App\FrontController $subject,
+-        \Magento\Framework\App\RequestInterface $request
+-    ) {
+-        $reader = $this->readerList->getReader($this->runMode);
+-        $defaultStoreId = $reader->getDefaultStoreId($this->scopeCode);
+-        $this->storeManager->setCurrentStore($defaultStoreId);
+-    }
+-}
+diff --git a/vendor/magento/module-store/etc/adminhtml/di.xml b/vendor/magento/module-store/etc/adminhtml/di.xml
+index e6e21f6ec0a..26fcbad0ff1 100644
+--- a/vendor/magento/module-store/etc/adminhtml/di.xml
++++ b/vendor/magento/module-store/etc/adminhtml/di.xml
+@@ -6,9 +6,6 @@
+  */
+ -->
+ <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+-    <type name="Magento\Framework\App\FrontControllerInterface">
+-        <plugin name="default_store_setter" type="Magento\Store\App\FrontController\Plugin\DefaultStore" />
+-    </type>
+     <type name="Magento\Framework\Notification\MessageList">
+         <arguments>
+             <argument name="messages" xsi:type="array">
+diff --git a/vendor/magento/module-store/etc/di.xml b/vendor/magento/module-store/etc/di.xml
+index 984a16eb349..643550ac9f8 100644
+--- a/vendor/magento/module-store/etc/di.xml
++++ b/vendor/magento/module-store/etc/di.xml
+@@ -115,12 +115,6 @@
+             <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
+         </arguments>
+     </type>
+-    <type name="Magento\Store\App\FrontController\Plugin\DefaultStore">
+-        <arguments>
+-            <argument name="runMode" xsi:type="init_parameter">Magento\Store\Model\StoreManager::PARAM_RUN_TYPE</argument>
+-            <argument name="scopeCode" xsi:type="init_parameter">Magento\Store\Model\StoreManager::PARAM_RUN_CODE</argument>
+-        </arguments>
+-    </type>
+     <virtualType name="Magento\Store\Model\ResourceModel\Group\Collection\FetchStrategy" type="Magento\Framework\Data\Collection\Db\FetchStrategy\Cache">
+         <arguments>
+             <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Collection</argument>