Skip to content

Commit aa53034

Browse files
katmoonkatmoon
authored
Merge pull request #139 from magento-commerce/1.1.36-release
1.1.36 Release
2 parents c791d81 + d2ceaf6 commit aa53034

30 files changed

+1855
-269
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/quality-patches",
33
"description": "Provides quality patches for AdobeCommerce & Magento OpenSource",
44
"type": "magento2-component",
5-
"version": "1.1.35",
5+
"version": "1.1.36",
66
"license": "proprietary",
77
"repositories": {
88
"repo": {

‎patches-info.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎patches/commerce/ACSD-52419_2.4.5-p2.patch‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
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
2+
index 7824cbd91186..6b2b4869c893 100644
3+
--- a/vendor/magento/module-customer-custom-attributes/view/frontend/layout/customer_account_edit.xml
4+
+++ b/vendor/magento/module-customer-custom-attributes/view/frontend/layout/customer_account_edit.xml
5+
@@ -23,6 +23,7 @@
6+
<argument name="code" xsi:type="string">Magento\Customer\Model\Customer</argument>
7+
</action>
8+
<arguments>
9+
+ <argument name="button_lock_manager" xsi:type="object">Magento\Framework\View\Element\ButtonLockManager</argument>
10+
<argument name="view_model" xsi:type="object">CustomerFileAttribute</argument>
11+
</arguments>
12+
</block>
13+
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
14+
index 7d2543c73854..97bb8fe08912 100644
15+
--- a/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/edit.phtml
16+
+++ b/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/edit.phtml
17+
@@ -129,7 +129,10 @@ use Magento\Customer\Block\Widget\Taxvat;
18+
19+
<div class="actions-toolbar">
20+
<div class="primary">
21+
- <button type="submit" class="action save primary" title="<?= $block->escapeHtmlAttr(__('Save')) ?>">
22+
+ <button type="submit" class="action save primary" title="<?= $block->escapeHtmlAttr(__('Save')) ?>"
23+
+ <?php if ($block->getButtonLockManager()->isDisabled('customer_edit_form_submit')): ?>
24+
+ disabled="disabled"
25+
+ <?php endif; ?>>
26+
<span><?= $block->escapeHtml(__('Save')) ?></span>
27+
</button>
28+
</div>
29+
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
30+
index 70d10a3f1d16..30a495f6676a 100644
31+
--- a/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/register.phtml
32+
+++ b/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/register.phtml
33+
@@ -25,8 +25,6 @@ $directoryHelper = $block->getData('directoryHelper');
34+
$formData = $block->getFormData();
35+
/** @var \Magento\CustomerCustomAttributes\ViewModel\Address\RegionProvider $regionProvider */
36+
$regionProvider = $block->getRegionProvider();
37+
-/** @var \Magento\Customer\ViewModel\CreateAccountButton $createAccountButtonViewModel */
38+
-$createAccountButtonViewModel = $block->getData('create_account_button_view_model');
39+
?>
40+
<form class="form create account form-create-account"
41+
action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>"
42+
@@ -322,7 +320,9 @@ $createAccountButtonViewModel = $block->getData('create_account_button_view_mode
43+
class="action submit primary"
44+
title="<?= $block->escapeHtmlAttr(__('Create an Account')) ?>"
45+
id="send2"
46+
- <?php if ($createAccountButtonViewModel->disabled()): ?> disabled="disabled" <?php endif; ?>>
47+
+ <?php if ($block->getButtonLockManager()->isDisabled('customer_create_form_submit')): ?>
48+
+ disabled="disabled"
49+
+ <?php endif; ?>>
50+
<span><?= $block->escapeHtml(__('Create an Account')) ?></span>
51+
</button>
52+
</div>
53+
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
54+
index 6b7bba3fc6f9..00549d670255 100644
55+
--- a/vendor/magento/module-invitation/view/frontend/layout/magento_invitation_customer_account_create.xml
56+
+++ b/vendor/magento/module-invitation/view/frontend/layout/magento_invitation_customer_account_create.xml
57+
@@ -12,7 +12,7 @@
58+
<block class="Magento\Invitation\Block\Customer\Form\Register" name="customer_form_register_invitation" template="Magento_Customer::form/register.phtml" cacheable="false">
59+
<container name="form.additional.info" as="form_additional_info"/>
60+
<arguments>
61+
- <argument name="create_account_button_view_model" xsi:type="object">Magento\Customer\ViewModel\CreateAccountButton</argument>
62+
+ <argument name="button_lock_manager" xsi:type="object">Magento\Framework\View\Element\ButtonLockManager</argument>
63+
</arguments>
64+
</block>
65+
<block class="Magento\Cookie\Block\RequireCookie" name="require-cookie" template="Magento_Cookie::require_cookie.phtml">

‎patches/commerce/ACSD-52906_2.4.4-p3.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/vendor/magento/module-customer-segment/Model/Customer.php b/vendor/magento/module-customer-segment/Model/Customer.php
2+
index 9ac45f6facc8..5a115fc97cd7 100644
3+
--- a/vendor/magento/module-customer-segment/Model/Customer.php
4+
+++ b/vendor/magento/module-customer-segment/Model/Customer.php
5+
@@ -349,7 +349,7 @@ public function addCustomerToWebsiteSegments(int $customerId, int $websiteId, ar
6+
);
7+
8+
$value = array_filter($this->_customerWebsiteSegments[$websiteId][$customerId]);
9+
- $this->_httpContext->setValue(Data::CONTEXT_SEGMENT, $value, $value);
10+
+ $this->_httpContext->setValue(Data::CONTEXT_SEGMENT, $value, []);
11+
12+
$visitorCustomerSegmentIds = $this->_customerSession->getCustomerSegmentIds();
13+

‎patches/commerce/ACSD-53176_2.4.4-p1.patch‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
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
2+
index f5032017822..4b833afaa67 100644
3+
--- a/vendor/magento/module-target-rule/Model/Rule/Condition/Product/Attributes/SqlBuilder.php
4+
+++ b/vendor/magento/module-target-rule/Model/Rule/Condition/Product/Attributes/SqlBuilder.php
5+
@@ -364,6 +364,6 @@ class SqlBuilder
6+
*/
7+
protected function normalizeConditionValue($condition)
8+
{
9+
- return $condition->getValue();
10+
+ return $condition->getValueParsed();
11+
}
12+
}

‎patches/os/ACSD-47875_1.2.4-p1.patch‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
diff --git a/vendor/magento/module-inventory-catalog/Model/GetStockIdForCurrentWebsite.php b/vendor/magento/module-inventory-catalog/Model/GetStockIdForCurrentWebsite.php
2+
index b5423333d25..c73203be8b6 100644
3+
--- a/vendor/magento/module-inventory-catalog/Model/GetStockIdForCurrentWebsite.php
4+
+++ b/vendor/magento/module-inventory-catalog/Model/GetStockIdForCurrentWebsite.php
5+
@@ -7,9 +7,11 @@ declare(strict_types=1);
6+
7+
namespace Magento\InventoryCatalog\Model;
8+
9+
+use Magento\Framework\App\ObjectManager;
10+
use Magento\InventorySalesApi\Api\Data\SalesChannelInterface;
11+
use Magento\InventorySalesApi\Api\StockResolverInterface;
12+
use Magento\Store\Model\StoreManagerInterface;
13+
+use Magento\Framework\HTTP\PhpEnvironment\Request;
14+
15+
/**
16+
* Service for get stock id for current website.
17+
@@ -26,24 +28,36 @@ class GetStockIdForCurrentWebsite
18+
*/
19+
private $stockResolver;
20+
21+
+ /**
22+
+ * @var Request
23+
+ */
24+
+ private Request $request;
25+
+
26+
/**
27+
* @param StoreManagerInterface $storeManager
28+
* @param StockResolverInterface $stockResolver
29+
+ * @param Request|null $request
30+
*/
31+
public function __construct(
32+
StoreManagerInterface $storeManager,
33+
- StockResolverInterface $stockResolver
34+
+ StockResolverInterface $stockResolver,
35+
+ Request $request = null
36+
) {
37+
$this->storeManager = $storeManager;
38+
$this->stockResolver = $stockResolver;
39+
+ $this->request = $request ?: ObjectManager::getInstance()->get(Request::class);
40+
}
41+
42+
/**
43+
+ * Determine stock id in use based on current store context
44+
+ *
45+
* @return int
46+
*/
47+
public function execute(): int
48+
{
49+
- $websiteCode = $this->storeManager->getWebsite()->getCode();
50+
+ $storeId = $this->request->getParam('store');
51+
+ $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
52+
+ $websiteCode = $this->storeManager->getWebsite($websiteId)->getCode();
53+
54+
$stock = $this->stockResolver->execute(SalesChannelInterface::TYPE_WEBSITE, $websiteCode);
55+
$stockId = (int)$stock->getStockId();

‎patches/os/ACSD-47875_2.4.4-p1.patch‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
diff --git a/vendor/magento/module-store/App/FrontController/Plugin/DefaultStore.php b/vendor/magento/module-store/App/FrontController/Plugin/DefaultStore.php
2+
deleted file mode 100644
3+
index 58340c6cc35..00000000000
4+
--- a/vendor/magento/module-store/App/FrontController/Plugin/DefaultStore.php
5+
+++ /dev/null
6+
@@ -1,73 +0,0 @@
7+
-<?php
8+
-/**
9+
- * Copyright © Magento, Inc. All rights reserved.
10+
- * See COPYING.txt for license details.
11+
- */
12+
-namespace Magento\Store\App\FrontController\Plugin;
13+
-
14+
-use \Magento\Store\Model\StoreResolver\ReaderList;
15+
-use \Magento\Store\Model\ScopeInterface;
16+
-
17+
-/**
18+
- * Plugin to set default store for admin area.
19+
- */
20+
-class DefaultStore
21+
-{
22+
- /**
23+
- * @var \Magento\Store\Model\StoreManagerInterface
24+
- */
25+
- protected $storeManager;
26+
-
27+
- /**
28+
- * @var ReaderList
29+
- */
30+
- protected $readerList;
31+
-
32+
- /**
33+
- * @var string
34+
- */
35+
- protected $runMode;
36+
-
37+
- /**
38+
- * @var string
39+
- */
40+
- protected $scopeCode;
41+
-
42+
- /**
43+
- * Initialize dependencies.
44+
- *
45+
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
46+
- * @param ReaderList $readerList
47+
- * @param string $runMode
48+
- * @param null $scopeCode
49+
- */
50+
- public function __construct(
51+
- \Magento\Store\Model\StoreManagerInterface $storeManager,
52+
- ReaderList $readerList,
53+
- $runMode = ScopeInterface::SCOPE_STORE,
54+
- $scopeCode = null
55+
- ) {
56+
- $this->runMode = $scopeCode ? $runMode : ScopeInterface::SCOPE_WEBSITE;
57+
- $this->scopeCode = $scopeCode;
58+
- $this->readerList = $readerList;
59+
- $this->storeManager = $storeManager;
60+
- }
61+
-
62+
- /**
63+
- * Set current store for admin area
64+
- *
65+
- * @param \Magento\Framework\App\FrontController $subject
66+
- * @param \Magento\Framework\App\RequestInterface $request
67+
- * @return void
68+
- *
69+
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
70+
- */
71+
- public function beforeDispatch(
72+
- \Magento\Framework\App\FrontController $subject,
73+
- \Magento\Framework\App\RequestInterface $request
74+
- ) {
75+
- $reader = $this->readerList->getReader($this->runMode);
76+
- $defaultStoreId = $reader->getDefaultStoreId($this->scopeCode);
77+
- $this->storeManager->setCurrentStore($defaultStoreId);
78+
- }
79+
-}
80+
diff --git a/vendor/magento/module-store/etc/adminhtml/di.xml b/vendor/magento/module-store/etc/adminhtml/di.xml
81+
index e6e21f6ec0a..26fcbad0ff1 100644
82+
--- a/vendor/magento/module-store/etc/adminhtml/di.xml
83+
+++ b/vendor/magento/module-store/etc/adminhtml/di.xml
84+
@@ -6,9 +6,6 @@
85+
*/
86+
-->
87+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
88+
- <type name="Magento\Framework\App\FrontControllerInterface">
89+
- <plugin name="default_store_setter" type="Magento\Store\App\FrontController\Plugin\DefaultStore" />
90+
- </type>
91+
<type name="Magento\Framework\Notification\MessageList">
92+
<arguments>
93+
<argument name="messages" xsi:type="array">
94+
diff --git a/vendor/magento/module-store/etc/di.xml b/vendor/magento/module-store/etc/di.xml
95+
index 984a16eb349..643550ac9f8 100644
96+
--- a/vendor/magento/module-store/etc/di.xml
97+
+++ b/vendor/magento/module-store/etc/di.xml
98+
@@ -115,12 +115,6 @@
99+
<argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
100+
</arguments>
101+
</type>
102+
- <type name="Magento\Store\App\FrontController\Plugin\DefaultStore">
103+
- <arguments>
104+
- <argument name="runMode" xsi:type="init_parameter">Magento\Store\Model\StoreManager::PARAM_RUN_TYPE</argument>
105+
- <argument name="scopeCode" xsi:type="init_parameter">Magento\Store\Model\StoreManager::PARAM_RUN_CODE</argument>
106+
- </arguments>
107+
- </type>
108+
<virtualType name="Magento\Store\Model\ResourceModel\Group\Collection\FetchStrategy" type="Magento\Framework\Data\Collection\Db\FetchStrategy\Cache">
109+
<arguments>
110+
<argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Collection</argument>

0 commit comments

Comments
 (0)