Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into ACP2E-3854

aplapana · aplapana · commit 3bdb858f2c73 · 2025-05-22T11:31:53.000+03:00
diff --git a/app/code/Magento/Backend/App/Area/FrontNameResolver.php b/app/code/Magento/Backend/App/Area/FrontNameResolver.php
@@ -107,11 +107,10 @@ public function getFrontName($checkHost = false)
         if ($checkHost && !$this->isHostBackend()) {
             return false;
         }
-        $isCustomPathUsed = (bool)(string)$this->config->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_PATH);
-        if ($isCustomPathUsed) {
-            return (string)$this->config->getValue(self::XML_PATH_CUSTOM_ADMIN_PATH);
-        }
-        return $this->defaultFrontName;
+
+        return $this->config->isSetFlag(self::XML_PATH_USE_CUSTOM_ADMIN_PATH)
+            ? (string)$this->config->getValue(self::XML_PATH_CUSTOM_ADMIN_PATH)
+            : $this->defaultFrontName;
     }
 
     /**
@@ -127,9 +126,8 @@ public function isHostBackend()
         if (!$this->request->getServer('HTTP_HOST')) {
             return false;
         }
-
-        if ($this->scopeConfig->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE)) {
-            $backendUrl = $this->scopeConfig->getValue(self::XML_PATH_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE);
+        if ($this->scopeConfig->isSetFlag(self::XML_PATH_USE_CUSTOM_ADMIN_URL)) {
+            $backendUrl = $this->scopeConfig->getValue(self::XML_PATH_CUSTOM_ADMIN_URL);
         } else {
             $xmlPath = $this->request->isSecure() ? Store::XML_PATH_SECURE_BASE_URL : Store::XML_PATH_UNSECURE_BASE_URL;
             $backendUrl = $this->config->getValue($xmlPath);
diff --git a/app/code/Magento/Backend/Test/Unit/App/Area/FrontNameResolverTest.php b/app/code/Magento/Backend/Test/Unit/App/Area/FrontNameResolverTest.php
@@ -80,12 +80,16 @@ protected function setUp(): void
      */
     public function testIfCustomPathUsed(): void
     {
-        $this->configMock
+        $this->configMock->expects($this->once())
+            ->method('isSetFlag')
+            ->with(FrontNameResolver::XML_PATH_USE_CUSTOM_ADMIN_PATH)
+            ->willReturn(true);
+
+        $this->configMock->expects($this->once())
             ->method('getValue')
-            ->willReturnCallback(fn($param) => match ([$param]) {
-                ['admin/url/use_custom_path'] => true,
-                ['admin/url/custom_path'] => 'expectedValue'
-            });
+            ->with(FrontNameResolver::XML_PATH_CUSTOM_ADMIN_PATH)
+            ->willReturn('expectedValue');
+
         $this->assertEquals('expectedValue', $this->model->getFrontName());
     }
 
@@ -94,15 +98,11 @@ public function testIfCustomPathUsed(): void
      */
     public function testIfCustomPathNotUsed(): void
     {
-        $this->configMock->expects(
-            $this->once()
-        )->method(
-            'getValue'
-        )->with(
-            'admin/url/use_custom_path'
-        )->willReturn(
-            false
-        );
+        $this->configMock->expects($this->once())
+            ->method('isSetFlag')
+            ->with(FrontNameResolver::XML_PATH_USE_CUSTOM_ADMIN_PATH)
+            ->willReturn(false);
+
         $this->assertEquals($this->_defaultFrontName, $this->model->getFrontName());
     }
 
@@ -125,7 +125,12 @@ public function testIsHostBackend(
         string $customAdminUrl,
         bool $expectedValue
     ): void {
-        $this->scopeConfigMock->method('getValue')
+        $this->scopeConfigMock
+            ->method('isSetFlag')
+            ->willReturn($useCustomAdminUrl);
+
+        $this->scopeConfigMock
+            ->method('getValue')
             ->willReturnMap(
                 [
                     [Store::XML_PATH_UNSECURE_BASE_URL, ScopeInterface::SCOPE_STORE, null, $url],
@@ -138,7 +143,7 @@ public function testIsHostBackend(
                     ],
                     [
                         FrontNameResolver::XML_PATH_CUSTOM_ADMIN_URL,
-                        ScopeInterface::SCOPE_STORE,
+                        ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
                         null,
                         $customAdminUrl
                     ]
diff --git a/app/code/Magento/Catalog/Block/Widget/Link.php b/app/code/Magento/Catalog/Block/Widget/Link.php
@@ -81,6 +81,7 @@ public function getHref()
                 UrlRewrite::ENTITY_ID => $rewriteData[1],
                 UrlRewrite::ENTITY_TYPE => $rewriteData[0],
                 UrlRewrite::STORE_ID => $store->getId(),
+                UrlRewrite::REDIRECT_TYPE => 0,
             ];
             if (!empty($rewriteData[2]) && $rewriteData[0] == ProductUrlRewriteGenerator::ENTITY_TYPE) {
                 $filterData[UrlRewrite::METADATA]['category_id'] = $rewriteData[2];
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Widget/LinkTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Widget/LinkTest.php
@@ -240,6 +240,7 @@ function ($route, $params) use ($storeId) {
                     UrlRewrite::ENTITY_ID => 'entity_id',
                     UrlRewrite::ENTITY_TYPE => 'entity_type',
                     UrlRewrite::STORE_ID => $this->storeManager->getStore($storeId)->getStoreId(),
+                    UrlRewrite::REDIRECT_TYPE => 0,
                 ]
             )
             ->willReturn($rewrite);
@@ -319,6 +320,7 @@ public function testGetHrefWithForProductWithCategoryIdParameter()
                     UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
                     UrlRewrite::STORE_ID => $storeId,
                     UrlRewrite::METADATA => ['category_id' => 'category_id'],
+                    UrlRewrite::REDIRECT_TYPE => 0,
                 ]
             )
             ->willReturn(false);
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -552,8 +552,8 @@ public function getUsedProductIds($product)
     {
         if (!$product->hasData($this->_usedProductIds)) {
             $usedProductIds = [];
-            foreach ($this->getUsedProducts($product) as $product) {
-                $usedProductIds[] = $product->getId();
+            foreach ($this->getUsedProducts($product) as $childProduct) {
+                $usedProductIds[] = $childProduct->getId();
             }
             $product->setData($this->_usedProductIds, $usedProductIds);
         }
diff --git a/app/code/Magento/Customer/Controller/Account/Confirmation.php b/app/code/Magento/Customer/Controller/Account/Confirmation.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -99,10 +99,7 @@ public function execute()
                 );
                 $this->messageManager->addSuccessMessage(__('Please check your email for confirmation key.'));
                 return $this->getRedirect('*/*/index', ['_secure' => true]);
-            } catch (InvalidTransitionException $e) {
-                $this->messageManager->addSuccessMessage(__('This email does not require confirmation.'));
-                return $this->getRedirect('*/*/index', ['_secure' => true]);
-            } catch (NoSuchEntityException $e) {
+            } catch (InvalidTransitionException | NoSuchEntityException $e) {
                 $this->messageManager->addErrorMessage(__('Wrong email.'));
             }
         }
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\GroupedProduct\Model\Product\Type;
 
@@ -403,7 +403,7 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
         }
         $associatedProducts = !$isStrictProcessMode || !empty($productsInfo)
             ? $this->getAssociatedProducts($product)
-            : false;
+            : [];
 
         foreach ($associatedProducts as $subProduct) {
             $qty = $productsInfo[$subProduct->getId()];
diff --git a/app/code/Magento/LoginAsCustomerAssistance/view/frontend/layout/customer_account_create.xml b/app/code/Magento/LoginAsCustomerAssistance/view/frontend/layout/customer_account_create.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column"
-      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="customer_form_register">
             <container name="fieldset.create.info.additional" as="fieldset_create_info_additional"/>
diff --git a/app/code/Magento/Msrp/view/base/layout/cms_index_index.xml b/app/code/Magento/Msrp/view/base/layout/cms_index_index.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="msrp_popup"/>
     <body/>
-</page>
+</page>
diff --git a/app/code/Magento/Msrp/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Msrp/view/frontend/layout/catalog_category_view.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="msrp_popup"/>
     <body/>
 </page>
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
@@ -1,8 +1,7 @@
 <?php
 /**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -173,7 +172,7 @@ public function execute()
     {
         if ($this->getRequest()->isPost()
             && $this->getRequest()->getPost('email')
-            && $this->newsletterConfig->isActive()
+            && $this->newsletterConfig->isActive(ScopeInterface::SCOPE_STORE)
         ) {
             $email = (string)$this->getRequest()->getPost('email');
 
diff --git a/app/code/Magento/Newsletter/view/frontend/layout/customer_account_create.xml b/app/code/Magento/Newsletter/view/frontend/layout/customer_account_create.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="customer_form_register">
             <block name="customer.form.register.newsletter" template="Magento_Newsletter::form/register/newsletter.phtml"/>
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByPercent.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByPercent.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\SalesRule\Model\Rule\Action\Discount;
 
@@ -60,12 +60,16 @@ protected function _calculate($rule, $item, $qty, $rulePercent)
         $baseItemOriginalPrice = $this->validator->getItemBaseOriginalPrice($item);
 
         $_rulePct = $rulePercent / 100;
-        $discountData->setAmount(($qty * $itemPrice - $item->getDiscountAmount()) * $_rulePct);
-        $discountData->setBaseAmount(($qty * $baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct);
-        $discountData->setOriginalAmount(($qty * $itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct);
-        $discountData->setBaseOriginalAmount(
-            ($qty * $baseItemOriginalPrice - $item->getBaseDiscountAmount()) * $_rulePct
-        );
+
+        $amount = ($qty * $itemPrice - $item->getDiscountAmount()) * $_rulePct;
+        $baseAmount = ($qty * $baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct;
+        $originalAmount = ($qty * $itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct;
+        $baseOriginalAmount = ($qty * $baseItemOriginalPrice - $item->getBaseDiscountAmount()) * $_rulePct;
+
+        $discountData->setAmount(round(floatval((string) $amount), 2));
+        $discountData->setBaseAmount(round(floatval((string) $baseAmount), 2));
+        $discountData->setOriginalAmount(round(floatval((string) $originalAmount), 2));
+        $discountData->setBaseOriginalAmount(round(floatval((string) $baseOriginalAmount), 2));
 
         if (!$rule->getDiscountQty() || $rule->getDiscountQty() >= $qty) {
             $discountPercent = min(100, $item->getDiscountPercent() + $rulePercent);
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/ToPercentTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/ToPercentTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -221,8 +221,8 @@ public static function calculateDataProvider()
                 'expectedRuleDiscountQty' => 100,
                 'expectedDiscountData' => [
                     'amount' => 98,
-                    'baseAmount' => 59.49999999999999,
-                    'originalAmount' => 118.99999999999999,
+                    'baseAmount' => 59.50,
+                    'originalAmount' => 119,
                     'baseOriginalAmount' => 80.5,
                 ],
             ]
diff --git a/app/code/Magento/Sitemap/view/frontend/layout/robots_index_index.xml b/app/code/Magento/Sitemap/view/frontend/layout/robots_index_index.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 -->
-<page layout="robots" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="root">
             <block class="Magento\Sitemap\Block\Robots" name="sitemapRobotsLinks"/>
diff --git a/app/code/Magento/VaultGraphQl/Model/Resolver/DeletePaymentToken.php b/app/code/Magento/VaultGraphQl/Model/Resolver/DeletePaymentToken.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -21,26 +21,14 @@
  */
 class DeletePaymentToken implements ResolverInterface
 {
-    /**
-     * @var PaymentTokenManagementInterface
-     */
-    private $paymentTokenManagement;
-
-    /**
-     * @var PaymentTokenRepositoryInterface
-     */
-    private $paymentTokenRepository;
-
     /**
      * @param PaymentTokenManagementInterface $paymentTokenManagement
      * @param PaymentTokenRepositoryInterface $paymentTokenRepository
      */
     public function __construct(
-        PaymentTokenManagementInterface $paymentTokenManagement,
-        PaymentTokenRepositoryInterface $paymentTokenRepository
+        private readonly PaymentTokenManagementInterface $paymentTokenManagement,
+        private readonly PaymentTokenRepositoryInterface $paymentTokenRepository
     ) {
-        $this->paymentTokenManagement = $paymentTokenManagement;
-        $this->paymentTokenRepository = $paymentTokenRepository;
     }
 
     /**
diff --git a/app/code/Magento/VaultGraphQl/Model/Resolver/PaymentTokens.php b/app/code/Magento/VaultGraphQl/Model/Resolver/PaymentTokens.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -19,18 +19,12 @@
  */
 class PaymentTokens implements ResolverInterface
 {
-    /**
-     * @var PaymentTokenManagement
-     */
-    private $paymentTokenManagement;
-
     /**
      * @param PaymentTokenManagement $paymentTokenManagement
      */
     public function __construct(
-        PaymentTokenManagement $paymentTokenManagement
+        private readonly PaymentTokenManagement $paymentTokenManagement
     ) {
-        $this->paymentTokenManagement = $paymentTokenManagement;
     }
 
     /**
diff --git a/app/code/Magento/VaultGraphQl/registration.php b/app/code/Magento/VaultGraphQl/registration.php
diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/_data-grid-static.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/_data-grid-static.less
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/variables/_data-grid.less b/app/design/adminhtml/Magento/backend/web/css/source/variables/_data-grid.less
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Subscriber/NewActionTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Subscriber/NewActionTest.php
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/CartFixedTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/CartFixedTest.php

Original file line number	Diff line number	Diff line change
`@@ -240,6 +240,7 @@ function ($route, $params) use ($storeId) {`
`240`	`240`	`UrlRewrite::ENTITY_ID => 'entity_id',`
`241`	`241`	`UrlRewrite::ENTITY_TYPE => 'entity_type',`
`242`	`242`	`UrlRewrite::STORE_ID => $this->storeManager->getStore($storeId)->getStoreId(),`
	`243`	`+ UrlRewrite::REDIRECT_TYPE => 0,`
`243`	`244`	`]`
`244`	`245`	`)`
`245`	`246`	`->willReturn($rewrite);`
`@@ -319,6 +320,7 @@ public function testGetHrefWithForProductWithCategoryIdParameter()`
`319`	`320`	`UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,`
`320`	`321`	`UrlRewrite::STORE_ID => $storeId,`
`321`	`322`	`UrlRewrite::METADATA => ['category_id' => 'category_id'],`
	`323`	`+ UrlRewrite::REDIRECT_TYPE => 0,`
`322`	`324`	`]`
`323`	`325`	`)`
`324`	`326`	`->willReturn(false);`
Original file line number	Diff line number	Diff line change
`@@ -552,8 +552,8 @@ public function getUsedProductIds($product)`
`552`	`552`	`{`
`553`	`553`	`if (!$product->hasData($this->_usedProductIds)) {`
`554`	`554`	`$usedProductIds = [];`
`555`		`- foreach ($this->getUsedProducts($product) as $product) {`
`556`		`- $usedProductIds[] = $product->getId();`
	`555`	`+ foreach ($this->getUsedProducts($product) as $childProduct) {`
	`556`	`+ $usedProductIds[] = $childProduct->getId();`
`557`	`557`	`}`
`558`	`558`	`$product->setData($this->_usedProductIds, $usedProductIds);`
`559`	`559`	`}`