Skip to content

[Backport] Fixes in catalog component blocks [2.1-develop] #15915

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

Merged
merged 1 commit into from
Jun 13, 2018
Merged

[Backport] Fixes in catalog component blocks [2.1-develop] #15915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ public function getBreadcrumbsJavascript($path, $javascriptVarName)
*
* @param Node|array $node
* @param int $level
* @return string
* @return array
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function (node, e) {
*
* @param \Magento\Framework\Data\Tree\Node|array $node
* @param int $level
* @return string
* @return array
*/
protected function _getNodeJson($node, $level = 0)
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Eleme
/**
* Retrieve data object related with form
*
* @return \Magento\Catalog\Model\Product || \Magento\Catalog\Model\Category
* @return \Magento\Catalog\Model\Product|\Magento\Catalog\Model\Category
*/
public function getDataObject()
{
Expand Down
3 changes: 1 addition & 2 deletions app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,7 @@ protected function _prepareColumns()
'type' => 'options',
'options' => ['1' => __('Yes'), '0' => __('No')],
'align' => 'center'
],
'is_user_defined'
]
);

$this->_eventManager->dispatch('product_attribute_grid_build', ['grid' => $this]);
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public function getSelectorOptions()
*
* @param string $labelPart
* @param int $templateId
* @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
* @return array
*/
public function getSuggestedAttributes($labelPart, $templateId = null)
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public function isRssAllowed()
}

/**
* @return string
* @return array
*/
protected function getLinkParams()
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Category/Rss/Link.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function getLabel()
}

/**
* @return string
* @return array
*/
protected function getLinkParams()
{
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -186,7 +186,7 @@ public function getAddToCompareUrl()
* Gets minimal sales quantity
*
* @param \Magento\Catalog\Model\Product $product
* @return int|null
* @return float|null
*/
public function getMinimalQty($product)
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public function getPrice($price, $includingTax = null)
* Returns price converted to current currency rate
*
* @param float $price
* @return float
* @return float|string
*/
public function getCurrencyPrice($price)
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Rss/Product/Special.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ protected function _construct()
}

/**
* @return string
* @return array
*/
public function getRssData()
{
Expand Down