Upstream Merge Conflict (2.4-develop)

app/code/Magento/Captcha/Block/CheckoutLayoutProcessor.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright 2025 Adobe.
+ * All Rights Reserved.
+ */
+
+declare(strict_types=1);
+namespace Magento\Captcha\Block;
+
+use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
+use Magento\Captcha\Helper\Data as HelperCaptcha;
+
+class CheckoutLayoutProcessor implements LayoutProcessorInterface
+{
+    /**
+     * @param HelperCaptcha $helper
+     */
+    public function __construct(
+        private readonly HelperCaptcha $helper
+    ) {
+    }
+
+    /**
+     * Remove captcha from checkout page if it is disabled
+     *
+     * @param array $jsLayout
+     * @return array
+     */
+    public function process($jsLayout): array
+    {
+        if ($this->helper->getConfig('enable')) {
+            $captcha = [
+                'component' => 'Magento_Captcha/js/view/checkout/loginCaptcha',
+                'displayArea'   => 'additional-login-form-fields',
+                'formId' => 'user_login',
+                'configSource' => 'checkoutConfig'
+            ];
+            $jsLayout['components']['checkout']['children']['authentication']['children']['captcha'] = $captcha;
+            $jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children']
+            ['shippingAddress']['children']['customer-email']['children']['additional-login-form-fields']
+            ['children']['captcha'] = $captcha;
+        }
+        return $jsLayout;
+    }
+}

app/code/Magento/Captcha/Block/Customer/AuthenticationPopup/LayoutProcessor.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright 2025 Adobe.
+ * All Rights Reserved.
+ */
+
+declare(strict_types=1);
+namespace Magento\Captcha\Block\Customer\AuthenticationPopup;
+
+use Magento\Captcha\Helper\Data as HelperCaptcha;
+use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
+
+class LayoutProcessor implements LayoutProcessorInterface
+{
+    /**
+     * @param HelperCaptcha $helper
+     */
+    public function __construct(
+        private readonly HelperCaptcha $helper
+    ) {
+    }
+
+    /**
+     * Process jsLayout of checkout page
+     *
+     * @param array $jsLayout
+     * @return array
+     */
+    public function process($jsLayout): array
+    {
+        if ($this->helper->getConfig('enable')) {
+            $jsLayout['components']['authenticationPopup']['children']['captcha'] = [
+                'component' => 'Magento_Captcha/js/view/checkout/loginCaptcha',
+                'displayArea' => 'additional-login-form-fields',
+                'formId' => 'user_login',
+                'configSource' => 'checkout'
+            ];
+        }
+        return $jsLayout;
+    }
+}

app/code/Magento/Captcha/etc/frontend/di.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
@@ -37,4 +37,18 @@
     <type name="Magento\Sales\Api\OrderManagementInterface">
         <plugin name="reset_payment_attempts_after_order_is_placed_plugin" type="Magento\Captcha\Plugin\ResetPaymentAttemptsAfterOrderIsPlacedPlugin"/>
     </type>
+    <type name="Magento\Checkout\Block\Onepage">
+        <arguments>
+            <argument name="layoutProcessors" xsi:type="array">
+                <item name="captcha_processor" xsi:type="object">Magento\Captcha\Block\CheckoutLayoutProcessor</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Customer\Block\Account\AuthenticationPopup">
+        <arguments>
+            <argument name="layoutProcessors" xsi:type="array">
+                <item name="authentication_popup_processor" xsi:type="object">Magento\Captcha\Block\Customer\AuthenticationPopup\LayoutProcessor</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php

@@ -1,8 +1,10 @@
 <?php
+
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
+
 declare(strict_types=1);
 
 namespace Magento\CatalogUrlRewrite\Model\Storage;
@@ -170,7 +172,7 @@ private function findProductRewriteByRequestPath(array $data): ?array
         }
         $categorySuffix = $this->getCategoryUrlSuffix($data[UrlRewrite::STORE_ID]);
         $productResource = $this->productFactory->create();
-        $categoryPath = str_replace('/' . $productUrl, '', $requestPath);
+        $categoryPath = substr($requestPath, 0, -1 * strlen('/' . $productUrl));
         if ($productFromDb[UrlRewrite::REDIRECT_TYPE]) {
             $productUrl = $productFromDb[UrlRewrite::TARGET_PATH];
         }

app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Storage/DynamicStorageTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -80,6 +80,11 @@ class DynamicStorageTest extends TestCase
      */
     private $logger;
 
+    /**
+     * @var string
+     */
+    private $requestPath;
+
     /**
      * @inheritdoc
      */
@@ -169,9 +174,7 @@ public function testFindProductRewriteByRequestPath(
         bool $canBeShownInCategory,
         ?array $expectedProductRewrite
     ): void {
-        $this->connectionMock->expects($this->any())
-            ->method('fetchRow')
-            ->will($this->onConsecutiveCalls($productFromDb, $categoryFromDb));
+        $this->fetchDataMock($productFromDb, $categoryFromDb);
 
         $scopeConfigMap = [
             [
@@ -347,6 +350,68 @@ public static function findProductRewriteByRequestPathDataProvider(): array
                     'redirect_type' => OptionProvider::PERMANENT,
                 ]
             ],
+            [
+                // Category has product url key at the beginning of its url key
+                [
+                    'request_path' => 'test-category/test-sub-category/test',
+                    'store_id' => 1
+                ],
+                [
+                    'entity_type' => 'product',
+                    'entity_id' => '1',
+                    'request_path' => 'test',
+                    'target_path' => 'catalog/product/view/id/1',
+                    'redirect_type' => '0',
+                ],
+                '',
+                [
+                    'entity_type' => 'category',
+                    'entity_id' => '38',
+                    'request_path' => 'test-category/test-sub-category',
+                    'target_path' => 'catalog/category/view/id/38',
+                    'redirect_type' => '0',
+                ],
+                true,
+                [
+                    'entity_type' => 'product',
+                    'entity_id' => '1',
+                    'request_path' => 'test-category/test-sub-category/test',
+                    'target_path' => 'catalog/product/view/id/1/category/38',
+                    'redirect_type' => '0',
+                ]
+            ],
         ];
     }
+
+    /**
+     * @param array|false $productFromDb
+     * @param array|false $categoryFromDb
+     *
+     * @return void
+     */
+    private function fetchDataMock($productFromDb, $categoryFromDb): void
+    {
+        $selectMock = $this->selectMock;
+        $this->selectMock->expects($this->any())
+            ->method('where')
+            ->willReturnCallback(function ($string, $value) use ($selectMock) {
+                if ($string == 'url_rewrite.request_path IN (?)') {
+                    $this->requestPath = array_shift($value);
+                }
+                return $selectMock;
+            });
+        $this->connectionMock->expects($this->any())
+            ->method('fetchRow')
+            ->willReturnCallback(function () use ($productFromDb, $categoryFromDb) {
+                switch (true) {
+                    case $productFromDb && $productFromDb['request_path'] == $this->requestPath:
+                        return $productFromDb;
+                    case $categoryFromDb && $categoryFromDb['request_path'] == $this->requestPath:
+                        return $categoryFromDb;
+                    default:
+                        return false;
+                }
+            })
+        ;
+    }
 }

app/code/Magento/Cms/Block/Adminhtml/Block/Widget/Chooser.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\Cms\Block\Adminhtml\Block\Widget;
 
@@ -100,7 +100,7 @@ public function getRowClickCallback()
         $js = '
             function (grid, event) {
                 var trElement = Event.findElement(event, "tr");
-                var blockId = trElement.down("td").next().next().innerHTML.replace(/^\s+|\s+$/g,"");
+                var blockId = trElement.down("td").innerHTML.replace(/^\s+|\s+$/g,"");
                 var blockTitle = trElement.down("td").next().innerHTML;
                 ' .
             $chooserJsObject .

app/code/Magento/Cms/Test/Mftf/Test/AdminAddBlockWidgetToCMSPageTest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2020 Adobe
+  * All Rights Reserved.
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -51,7 +51,7 @@
         <!-- Assert block_id value in page content -->
         <actionGroup ref="AdminAssertCMSPageContentParamValueActionGroup" stepKey="assertBlockId">
             <argument name="param" value="block_id"/>
-            <argument name="value" value="$$createPreReqBlock.identifier$$"/>
+            <argument name="value" value="$$createPreReqBlock.id$$"/>
         </actionGroup>
     </test>
 </tests>