Skip to content

Removed logic related to columnCountLayoutDepend #19349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Removed logic related to columnCountLayoutDepend #19349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39a70d7
Removed logic related to columnCountLayoutDepend
sreichel Nov 22, 2018
5ba8c8c
Marked methods as deprecated instead of removal
sreichel Nov 22, 2018
e5d6b3f
Removed testLayoutDependColumnCount()
sreichel Nov 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 10 additions & 25 deletions app/code/Magento/Catalog/Block/Product/AbstractProduct.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [];
Copy link
Contributor

@sidolov sidolov Mar 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, mark property as deprecated due to backward compatibility instead of remove.

Copy link
Contributor

@orlangur orlangur Mar 15, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Stas, somehow I overlooked it, while "do not eliminate any usages/functionality yet" looks completely not correct to me.


/**
* Core registry
*
Expand Down Expand Up @@ -299,12 +292,7 @@ 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');
}
Expand All @@ -314,41 +302,38 @@ public function getColumnCount()
*
* @param string $pageLayout
* @param int $columnCount
* @return \Magento\Catalog\Block\Product\ListProduct
* @return $this
* @deprecated
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
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
* @return $this
* @deprecated
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
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
* @return false
* @deprecated
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getColumnCountLayoutDepend($pageLayout)
{
if (isset($this->_columnCountLayoutDepend[$pageLayout])) {
return $this->_columnCountLayoutDepend[$pageLayout];
}

return false;
}

Expand Down
5 changes: 0 additions & 5 deletions app/code/Magento/Catalog/Block/Product/NewProduct.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down
5 changes: 0 additions & 5 deletions app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
13 changes: 0 additions & 13 deletions app/code/Magento/Reports/Block/Product/Widget/Compared.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
13 changes: 0 additions & 13 deletions app/code/Magento/Reports/Block/Product/Widget/Viewed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
15 changes: 0 additions & 15 deletions dev/tests/integration/testsuite/Magento/Catalog/Block/Product/AbstractTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,21 +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 */

$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()
{
$this->assertTrue($this->block->getCanShowProductPrice($this->product));
Expand Down
1 change: 0 additions & 1 deletion dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@ public function getAllowedActionNodeMethods()
return [
'addBodyClass',
'addButtons',
'addColumnCountLayoutDepend',
'addCrumb',
'addDatabaseBlock',
'addInputTypeTemplate',
Expand Down