Skip to content

Commit b6ee352

Browse files
author
Joan He
committed
MAGETWO-32074: Move Specifc Helper Components From the Magento_Core Module to Magento_Framework
- Fixed static test failure
1 parent 1556711 commit b6ee352

File tree

4 files changed

+15
-17
lines changed

4 files changed

+15
-17
lines changed

app/code/Magento/CustomerImportExport/Model/Resource/Import/CustomerComposite/Data.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function __construct(
3737
$resourcePrefix = null,
3838
array $arguments = []
3939
) {
40-
parent::__construct($context, $jsonHelper, $resourcePrefix, $arguments);
40+
parent::__construct($context, $jsonHelper, $resourcePrefix);
4141

4242
if (isset($arguments['entity_type'])) {
4343
$this->_entityType = $arguments['entity_type'];

app/code/Magento/ImportExport/Model/Resource/Import/Data.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,11 @@ class Data extends \Magento\Framework\Model\Resource\Db\AbstractDb implements \I
3030
* @param \Magento\Framework\Model\Resource\Db\Context $context
3131
* @param \Magento\Framework\Json\Helper\Data $jsonHelper
3232
* @param string|null $resourcePrefix
33-
* @param array $arguments
3433
*/
3534
public function __construct(
3635
\Magento\Framework\Model\Resource\Db\Context $context,
3736
\Magento\Framework\Json\Helper\Data $jsonHelper,
38-
$resourcePrefix = null,
39-
array $arguments = []
37+
$resourcePrefix = null
4038
) {
4139
parent::__construct($context, $resourcePrefix);
4240
$this->jsonHelper = $jsonHelper;

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"phpunit/phpunit": "4.1.0",
3939
"squizlabs/php_codesniffer": "1.5.3",
4040
"phpmd/phpmd": "@stable",
41+
"pdepend/pdepend": "2.0.4",
4142
"lib-libxml": "*",
4243
"ext-ctype": "*",
4344
"ext-gd": "*",

composer.lock

Lines changed: 12 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)