From 39a70d7bd87c0ed00b4c4cfd2f00ac4a7c9013a7 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 22 Nov 2018 19:40:47 +0100 Subject: [PATCH 1/3] Removed logic related to columnCountLayoutDepend --- .../Catalog/Block/Product/AbstractProduct.php | 57 +------------------ .../Catalog/Block/Product/NewProduct.php | 5 -- .../Block/Product/ProductsList.php | 5 -- .../Reports/Block/Product/Widget/Compared.php | 13 ----- .../Reports/Block/Product/Widget/Viewed.php | 13 ----- .../Catalog/Block/Product/AbstractTest.php | 5 -- .../Magento/Test/Legacy/LayoutTest.php | 1 - 7 files changed, 1 insertion(+), 98 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php index 4102c82a0a316..bf40b6401b594 100644 --- a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php +++ b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php @@ -34,13 +34,6 @@ class AbstractProduct extends \Magento\Framework\View\Element\Template */ protected $_defaultColumnCount = 3; - /** - * Product amount per row depending on custom page layout of category - * - * @var array - */ - protected $_columnCountLayoutDepend = []; - /** * Core registry * @@ -299,59 +292,11 @@ public function hasProductUrl($product) public function getColumnCount() { if (!$this->_getData('column_count')) { - $pageLayout = $this->getPageLayout(); - if ($pageLayout && $this->getColumnCountLayoutDepend($pageLayout->getCode())) { - $this->setData('column_count', $this->getColumnCountLayoutDepend($pageLayout->getCode())); - } else { - $this->setData('column_count', $this->_defaultColumnCount); - } + $this->setData('column_count', $this->_defaultColumnCount); } return (int) $this->_getData('column_count'); } - /** - * Add row size depends on page layout - * - * @param string $pageLayout - * @param int $columnCount - * @return \Magento\Catalog\Block\Product\ListProduct - */ - public function addColumnCountLayoutDepend($pageLayout, $columnCount) - { - $this->_columnCountLayoutDepend[$pageLayout] = $columnCount; - return $this; - } - - /** - * Remove row size depends on page layout - * - * @param string $pageLayout - * @return \Magento\Catalog\Block\Product\ListProduct - */ - public function removeColumnCountLayoutDepend($pageLayout) - { - if (isset($this->_columnCountLayoutDepend[$pageLayout])) { - unset($this->_columnCountLayoutDepend[$pageLayout]); - } - - return $this; - } - - /** - * Retrieve row size depends on page layout - * - * @param string $pageLayout - * @return int|boolean - */ - public function getColumnCountLayoutDepend($pageLayout) - { - if (isset($this->_columnCountLayoutDepend[$pageLayout])) { - return $this->_columnCountLayoutDepend[$pageLayout]; - } - - return false; - } - /** * Retrieve current page layout * diff --git a/app/code/Magento/Catalog/Block/Product/NewProduct.php b/app/code/Magento/Catalog/Block/Product/NewProduct.php index cb0904fe5fa64..8580d96a341c4 100644 --- a/app/code/Magento/Catalog/Block/Product/NewProduct.php +++ b/app/code/Magento/Catalog/Block/Product/NewProduct.php @@ -77,11 +77,6 @@ public function __construct( protected function _construct() { parent::_construct(); - $this->addColumnCountLayoutDepend('empty', 6) - ->addColumnCountLayoutDepend('1column', 5) - ->addColumnCountLayoutDepend('2columns-left', 4) - ->addColumnCountLayoutDepend('2columns-right', 4) - ->addColumnCountLayoutDepend('3columns', 3); $this->addData( ['cache_lifetime' => 86400, 'cache_tags' => [\Magento\Catalog\Model\Product::CACHE_TAG]] diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php index 55f4d67273379..5d896c067ee17 100644 --- a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php +++ b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php @@ -137,11 +137,6 @@ public function __construct( protected function _construct() { parent::_construct(); - $this->addColumnCountLayoutDepend('empty', 6) - ->addColumnCountLayoutDepend('1column', 5) - ->addColumnCountLayoutDepend('2columns-left', 4) - ->addColumnCountLayoutDepend('2columns-right', 4) - ->addColumnCountLayoutDepend('3columns', 3); $this->addData([ 'cache_lifetime' => 86400, diff --git a/app/code/Magento/Reports/Block/Product/Widget/Compared.php b/app/code/Magento/Reports/Block/Product/Widget/Compared.php index b22c4636cbe7d..532dc77ae95cb 100644 --- a/app/code/Magento/Reports/Block/Product/Widget/Compared.php +++ b/app/code/Magento/Reports/Block/Product/Widget/Compared.php @@ -12,17 +12,4 @@ */ class Compared extends \Magento\Reports\Block\Product\Compared implements \Magento\Widget\Block\BlockInterface { - /** - * Internal constructor - * - * @return void - */ - protected function _construct() - { - parent::_construct(); - $this->addColumnCountLayoutDepend('1column', 5) - ->addColumnCountLayoutDepend('2columns-left', 4) - ->addColumnCountLayoutDepend('2columns-right', 4) - ->addColumnCountLayoutDepend('2columns', 3); - } } diff --git a/app/code/Magento/Reports/Block/Product/Widget/Viewed.php b/app/code/Magento/Reports/Block/Product/Widget/Viewed.php index 88965edb08a26..3dfc609a8c608 100644 --- a/app/code/Magento/Reports/Block/Product/Widget/Viewed.php +++ b/app/code/Magento/Reports/Block/Product/Widget/Viewed.php @@ -12,17 +12,4 @@ */ class Viewed extends \Magento\Reports\Block\Product\Viewed implements \Magento\Widget\Block\BlockInterface { - /** - * Internal constructor - * - * @return void - */ - protected function _construct() - { - parent::_construct(); - $this->addColumnCountLayoutDepend('1column', 5) - ->addColumnCountLayoutDepend('2columns-left', 4) - ->addColumnCountLayoutDepend('2columns-right', 4) - ->addColumnCountLayoutDepend('3columns', 3); - } } diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/AbstractTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/AbstractTest.php index 494cf3812c57c..eb3fa4debdeb0 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/AbstractTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/AbstractTest.php @@ -154,11 +154,6 @@ public function testLayoutDependColumnCount() ); $this->assertEquals(3, $this->block->getColumnCount()); /* default column count */ - - $this->block->addColumnCountLayoutDepend('test', 10); - $this->assertEquals(10, $this->block->getColumnCountLayoutDepend('test')); - $this->block->removeColumnCountLayoutDepend('test'); - $this->assertFalse($this->block->getColumnCountLayoutDepend('test')); } public function testGetCanShowProductPrice() diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php index 1ee599a04463d..0c5b46bfee3b4 100644 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php @@ -242,7 +242,6 @@ public function getAllowedActionNodeMethods() return [ 'addBodyClass', 'addButtons', - 'addColumnCountLayoutDepend', 'addCrumb', 'addDatabaseBlock', 'addInputTypeTemplate', From 5ba8c8cb79cd978e19e9beb9f42c5d745e013120 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 22 Nov 2018 20:28:41 +0100 Subject: [PATCH 2/3] Marked methods as deprecated instead of removal --- .../Catalog/Block/Product/AbstractProduct.php | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php index bf40b6401b594..e5a02edf7f4fb 100644 --- a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php +++ b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php @@ -297,6 +297,46 @@ public function getColumnCount() return (int) $this->_getData('column_count'); } + /** + * Add row size depends on page layout + * + * @param string $pageLayout + * @param int $columnCount + * @return $this + * @deprecated + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function addColumnCountLayoutDepend($pageLayout, $columnCount) + { + return $this; + } + + /** + * Remove row size depends on page layout + * + * @param string $pageLayout + * @return $this + * @deprecated + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function removeColumnCountLayoutDepend($pageLayout) + { + return $this; + } + + /** + * Retrieve row size depends on page layout + * + * @param string $pageLayout + * @return false + * @deprecated + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function getColumnCountLayoutDepend($pageLayout) + { + return false; + } + /** * Retrieve current page layout * From e5d6b3f8d6a83f0cca73875fb1d2a81cd57efa83 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Fri, 23 Nov 2018 18:54:28 +0100 Subject: [PATCH 3/3] Removed testLayoutDependColumnCount() --- .../Magento/Catalog/Block/Product/AbstractTest.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/AbstractTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/AbstractTest.php index eb3fa4debdeb0..01d3fb201776c 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/AbstractTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/AbstractTest.php @@ -146,16 +146,6 @@ public function testHasProductUrl() $this->assertTrue($this->block->hasProductUrl($this->product)); } - public function testLayoutDependColumnCount() - { - $this->block->setLayout( - \Magento\TestFramework\Helper\Bootstrap::getObjectManager() - ->get(\Magento\Framework\View\LayoutInterface::class) - ); - $this->assertEquals(3, $this->block->getColumnCount()); - /* default column count */ - } - public function testGetCanShowProductPrice() { $this->assertTrue($this->block->getCanShowProductPrice($this->product));