Skip to content

[Forwardport] Add Clean Code #17043

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 4 commits into from
Jul 25, 2018
Merged

[Forwardport] Add Clean Code #17043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
447a917
Add Clean Code
hryvinskyi Jul 17, 2018
c393a40
Update construct and phpdoc
hryvinskyi Jul 18, 2018
18bfebe
replace tab space
hryvinskyi Jul 19, 2018
6c9203f
Fixed coding standards issue
Jul 20, 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
21 changes: 12 additions & 9 deletions app/code/Magento/CatalogRule/Model/Rule/Job.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
* See COPYING.txt for license details.
*/

namespace Magento\CatalogRule\Model\Rule;

use Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor;

/**
* Catalog Rule job model
*
Expand All @@ -18,13 +22,8 @@
* @method bool hasSuccess()
* @method bool hasError()
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\CatalogRule\Model\Rule;

use Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor;

/**
* @author Magento Core Team <[email protected]>
*
* @api
* @since 100.0.2
*/
Expand All @@ -39,10 +38,14 @@ class Job extends \Magento\Framework\DataObject
* Basic object initialization
*
* @param RuleProductProcessor $ruleProcessor
* @param array $data
*/
public function __construct(RuleProductProcessor $ruleProcessor)
{
public function __construct(
RuleProductProcessor $ruleProcessor,
array $data = []
) {
$this->ruleProcessor = $ruleProcessor;
parent::__construct($data);
}

/**
Expand Down
6 changes: 5 additions & 1 deletion ...agento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use Magento\Catalog\Api\Data\ProductLinkExtensionFactory;
use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;
use Magento\Catalog\Api\ProductRepositoryInterface;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\GroupedProduct\Model\Product\Type\Grouped as TypeGrouped;

/**
Expand Down Expand Up @@ -60,6 +61,9 @@ public function __construct(
* @param array $links
*
* @return \Magento\Catalog\Model\Product
*
* @throws NoSuchEntityException
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
Expand All @@ -70,7 +74,7 @@ public function beforeInitializeLinks(
array $links
) {
if ($product->getTypeId() === TypeGrouped::TYPE_CODE && !$product->getGroupedReadonly()) {
$links = (isset($links[self::TYPE_NAME])) ? $links[self::TYPE_NAME] : $product->getGroupedLinkData();
$links = $links[self::TYPE_NAME] ?? $product->getGroupedLinkData();
if (!is_array($links)) {
$links = [];
}
Expand Down