Merge remote-tracking branch 'origin/imported-magento-magento2-32217' into 2.4-develop-pr127

Author: zakdma

app/code/Magento/Catalog/Model/Design.php

@@ -201,6 +201,21 @@ protected function _mergeSettings($categorySettings, $productSettings)
             $update = array_merge($categorySettings->getLayoutUpdates(), $productSettings->getLayoutUpdates());
             $categorySettings->setLayoutUpdates($update);
         }
+        if ($categorySettings->getPageLayoutHandles()) {
+            $handles = [];
+            foreach ($categorySettings->getPageLayoutHandles() as $key => $value) {
+                $handles[$key] = [
+                    'handle' => 'catalog_category_view',
+                    'value' => $value,
+                ];
+            }
+            $categorySettings->setPageLayoutHandles($handles);
+        }
+        if ($productSettings->getPageLayoutHandles()) {
+            $handle = array_merge($categorySettings->getPageLayoutHandles(), $productSettings->getPageLayoutHandles());
+            $categorySettings->setPageLayoutHandles($handle);
+        }
+
         return $categorySettings;
     }
 }

dev/tests/integration/testsuite/Magento/Catalog/Model/DesignTest.php

@@ -13,6 +13,7 @@
 use Magento\Framework\TranslateInterface;
 use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Framework\View\DesignInterface;
+use Magento\Framework\View\Result\Page;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Theme\Model\Theme;
 use PHPUnit\Framework\TestCase;
@@ -117,6 +118,34 @@ public function getDesignSettingsForProductWithScheduleDesignTest(): array
         ];
     }
 
+    /**
+     * Verify ability to add category inherited page layout handles for product.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @return void
+     */
+    public function testAddCategoryPageLayoutHandlesForProduct(): void
+    {
+        $resultPage = Bootstrap::getObjectManager()->create(Page::class);
+        $product = $this->productRepository->get('simple');
+        $category = $this->getMockBuilder(Category::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getParentDesignCategory'])
+            ->getMock();
+        $category->expects(self::once())->method('getParentDesignCategory')->willReturnSelf();
+        $category->setId(1);
+        $category->setCustomLayoutUpdateFile('testFile');
+        $category->setCustomApplyToProducts(1);
+        $product->setCategory($category);
+        $settings = $this->model->getDesignSettings($product);
+        $resultPage->addPageLayoutHandles($settings->getPageLayoutHandles());
+        $handles = $resultPage->getLayout()->getUpdate()->getHandles();
+        self::assertEquals(
+            'catalog_category_view_selectable_1_testFile',
+            $handles[1]
+        );
+    }
+
     /**
      * @return array
      */

lib/internal/Magento/Framework/View/Result/Page.php

@@ -223,6 +223,8 @@ public function addPageLayoutHandles(array $parameters = [], $defaultHandle = nu
         $handle = $defaultHandle ? $defaultHandle : $this->getDefaultLayoutHandle();
         $pageHandles = [$handle];
         foreach ($parameters as $key => $value) {
+            $handle = $value['handle'] ?? $handle;
+            $value = $value['value'] ?? $value;
             $pageHandle = $handle . '_' . $key . '_' . $value;
             $pageHandles[] = $pageHandle;
             if ($entitySpecific) {