Skip to content

Commit

Permalink
ENGCOM-8117: Removed unused construct parameters #28653
Browse files Browse the repository at this point in the history
 - Merge Pull Request #28653 from Usik2203/magento2:removed-unused-construct-parameters
 - Merged commits:
   1. 7eeba38
   2. e15fc1d
   3. de7dab3
   4. 35043cf
  • Loading branch information
magento-engcom-team committed Sep 7, 2020
2 parents 9e7b088 + 35043cf commit 20166c1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 38 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;

/**
* Class AdvancedPricing
* Import advanced pricing class
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
Expand All @@ -19,43 +19,27 @@
class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
{
const VALUE_ALL_GROUPS = 'ALL GROUPS';

const VALUE_ALL_WEBSITES = 'All Websites';

const COL_SKU = 'sku';

const COL_TIER_PRICE_WEBSITE = 'tier_price_website';

const COL_TIER_PRICE_CUSTOMER_GROUP = 'tier_price_customer_group';

const COL_TIER_PRICE_QTY = 'tier_price_qty';

const COL_TIER_PRICE = 'tier_price';

const COL_TIER_PRICE_PERCENTAGE_VALUE = 'percentage_value';

const COL_TIER_PRICE_TYPE = 'tier_price_value_type';

const TIER_PRICE_TYPE_FIXED = 'Fixed';

const TIER_PRICE_TYPE_PERCENT = 'Discount';

const TABLE_TIER_PRICE = 'catalog_product_entity_tier_price';

const DEFAULT_ALL_GROUPS_GROUPED_PRICE_VALUE = '0';

const ENTITY_TYPE_CODE = 'advanced_pricing';

const VALIDATOR_MAIN = 'validator';

const VALIDATOR_WEBSITE = 'validator_website';

/**
* @deprecated
* @see VALIDATOR_TIER_PRICE
*/
private const VALIDATOR_TEAR_PRICE = 'validator_tier_price';

private const VALIDATOR_TIER_PRICE = 'validator_tier_price';

/**
Expand Down Expand Up @@ -176,10 +160,8 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
* @param \Magento\Framework\Json\Helper\Data $jsonHelper
* @param \Magento\ImportExport\Helper\Data $importExportData
* @param \Magento\ImportExport\Model\ResourceModel\Import\Data $importData
* @param \Magento\Eav\Model\Config $config
* @param \Magento\Framework\App\ResourceConnection $resource
* @param \Magento\ImportExport\Model\ResourceModel\Helper $resourceHelper
* @param \Magento\Framework\Stdlib\StringUtils $string
* @param ProcessingErrorAggregatorInterface $errorAggregator
* @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
* @param \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory $resourceFactory
Expand All @@ -197,10 +179,8 @@ public function __construct(
\Magento\Framework\Json\Helper\Data $jsonHelper,
\Magento\ImportExport\Helper\Data $importExportData,
\Magento\ImportExport\Model\ResourceModel\Import\Data $importData,
\Magento\Eav\Model\Config $config,
\Magento\Framework\App\ResourceConnection $resource,
\Magento\ImportExport\Model\ResourceModel\Helper $resourceHelper,
\Magento\Framework\Stdlib\StringUtils $string,
ProcessingErrorAggregatorInterface $errorAggregator,
\Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
\Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory $resourceFactory,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as RowValidatorInterface;
use Magento\CatalogImportExport\Model\Import\Product\StoreResolver;
use Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory as ResourceFactory;
use Magento\Eav\Model\Config;
use Magento\Eav\Model\Entity\Type;
use Magento\Framework\App\ResourceConnection;
use Magento\Framework\DB\Adapter\AdapterInterface;
Expand All @@ -26,7 +25,6 @@
use Magento\Framework\Json\Helper\Data;
use Magento\Framework\Stdlib\DateTime\DateTime;
use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
use Magento\Framework\Stdlib\StringUtils;
use Magento\ImportExport\Model\Import;
use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
use Magento\ImportExport\Model\ResourceModel\Helper;
Expand Down Expand Up @@ -99,11 +97,6 @@ class AdvancedPricingTest extends AbstractImportTestCase
*/
protected $dataSourceModel;

/**
* @var Config
*/
protected $eavConfig;

/**
* @var TimezoneInterface|MockObject
*/
Expand Down Expand Up @@ -139,11 +132,6 @@ class AdvancedPricingTest extends AbstractImportTestCase
*/
protected $advancedPricing;

/**
* @var StringUtils
*/
protected $stringObject;

/**
* @var ProcessingErrorAggregatorInterface
*/
Expand All @@ -165,10 +153,8 @@ protected function setUp(): void
);
$this->resource->method('getConnection')->willReturn($this->connection);
$this->dataSourceModel = $this->createMock(\Magento\ImportExport\Model\ResourceModel\Import\Data::class);
$this->eavConfig = $this->createMock(Config::class);
$entityType = $this->createMock(Type::class);
$entityType->method('getEntityTypeId')->willReturn('');
$this->eavConfig->method('getEntityType')->willReturn($entityType);
$this->resourceFactory = $this->getMockBuilder(
\Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory::class
)
Expand All @@ -193,7 +179,6 @@ protected function setUp(): void
$this->tierPriceValidator = $this->createMock(
TierPrice::class
);
$this->stringObject = $this->createMock(StringUtils::class);
$this->errorAggregator = $this->getErrorAggregatorObject();
$this->dateTime = $this->getMockBuilder(DateTime::class)
->disableOriginalConstructor()
Expand Down Expand Up @@ -1070,10 +1055,8 @@ private function getAdvancedPricingMock($methods = [])
$this->jsonHelper,
$this->importExportData,
$this->dataSourceModel,
$this->eavConfig,
$this->resource,
$this->resourceHelper,
$this->stringObject,
$this->errorAggregator,
$this->dateTime,
$this->resourceFactory,
Expand Down

0 comments on commit 20166c1

Please sign in to comment.