Skip to content

Commit d813974

Browse files
committed
[PSR-2 Compliance] The Great @codingStandardsIgnoreFile Massacre
- revert files with nontrivial issues to mainline state for further investigation - Step 0. Run command: git checkout bbe3ee0 -- lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Reader/_files/ConfigDomMock.php lib/internal/Magento/Framework/Interception lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php lib/internal/Magento/Framework/Code/ dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/EntityAbstractTest.php dev/tests/integration/testsuite/Magento/Cms/Controller/RouterTest.php dev/tests/integration/testsuite/Magento/Framework/Interception/ dev/tests/static/get_github_changes.php setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/ParserTest.php app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressTest.php dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/phrases/TestPhrases.php
1 parent c619404 commit d813974

File tree

42 files changed

+110
-54
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+110
-54
lines changed

app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressTest.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
// @codingStandardsIgnoreFile
78
namespace Magento\Customer\Test\Unit\Model\ResourceModel;
89

910
use Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite;
@@ -188,11 +189,7 @@ protected function prepareEavConfig()
188189
->method('getBackend')
189190
->willReturn(
190191
$this->getMock(
191-
\Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend::class,
192-
[],
193-
[],
194-
'',
195-
false
192+
\Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend::class, [], [], '', false
196193
)
197194
);
198195

app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
// @codingStandardsIgnoreFile
67
namespace Magento\Vault\Api\Data;
78

89
/**

dev/tests/integration/testsuite/Magento/Cms/Controller/RouterTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
// @codingStandardsIgnoreFile
8+
79
namespace Magento\Cms\Controller;
810

911
/**
@@ -21,8 +23,7 @@ protected function setUp()
2123
$this->markTestIncomplete('MAGETWO-3393');
2224
$this->_model = new \Magento\Cms\Controller\Router(
2325
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
24-
\Magento\Framework\App\ActionFactory::class
25-
),
26+
\Magento\Framework\App\ActionFactory::class),
2627
new \Magento\Framework\Event\ManagerInterfaceStub(
2728
$this->getMockForAbstractClass(\Magento\Framework\Event\InvokerInterface::class),
2829
$this->getMock(\Magento\Framework\Event\Config::class, [], [], '', false),

dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,10 @@ public function setUpInterceptionConfig($pluginConfig)
9494
$config->extend(
9595
[
9696
'preferences' => [
97-
\Magento\Framework\Interception\PluginListInterface::class => \Magento\Framework\Interception\PluginList\PluginList::class,
98-
\Magento\Framework\Interception\ChainInterface::class => \Magento\Framework\Interception\Chain\Chain::class,
97+
\Magento\Framework\Interception\PluginListInterface::class =>
98+
\Magento\Framework\Interception\PluginList\PluginList::class,
99+
\Magento\Framework\Interception\ChainInterface::class =>
100+
\Magento\Framework\Interception\Chain\Chain::class,
99101
],
100102
]
101103
);

dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* See COPYING.txt for license details.
66
*/
77

8+
// @codingStandardsIgnoreFile
9+
810
namespace Magento\Framework\Interception\Fixture;
911

1012
class Intercepted extends InterceptedParent implements InterceptedInterface

dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* See COPYING.txt for license details.
66
*/
77

8+
// @codingStandardsIgnoreFile
9+
810
namespace Magento\Framework\Interception\Fixture;
911

1012
interface InterceptedInterface

dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedParent.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* See COPYING.txt for license details.
66
*/
77

8+
// @codingStandardsIgnoreFile
9+
810
namespace Magento\Framework\Interception\Fixture;
911

1012
class InterceptedParent implements InterceptedParentInterface

dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedParentInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* See COPYING.txt for license details.
66
*/
77

8+
// @codingStandardsIgnoreFile
9+
810
namespace Magento\Framework\Interception\Fixture;
911

1012
interface InterceptedParentInterface

dev/tests/integration/testsuite/Magento/Framework/Interception/GeneralTest.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,17 @@ class GeneralTest extends AbstractPlugin
1414
public function setUp()
1515
{
1616
$this->setUpInterceptionConfig(
17-
[\Magento\Framework\Interception\Fixture\InterceptedInterface::class => [
17+
[\Magento\Framework\Interception\Fixture\InterceptedInterface::class =>
18+
[
1819
'plugins' => [
1920
'first' => [
20-
'instance' => \Magento\Framework\Interception\Fixture\Intercepted\InterfacePlugin::class,
21+
'instance' =>
22+
\Magento\Framework\Interception\Fixture\Intercepted\InterfacePlugin::class,
2123
'sortOrder' => 10,
2224
],
2325
],
24-
], \Magento\Framework\Interception\Fixture\Intercepted::class => [
26+
], \Magento\Framework\Interception\Fixture\Intercepted::class =>
27+
[
2528
'plugins' => [
2629
'second' => [
2730
'instance' => \Magento\Framework\Interception\Fixture\Intercepted\Plugin::class,

dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/EntityAbstractTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
// @codingStandardsIgnoreFile
8+
79
/**
810
* Test for abstract export model
911
*/
@@ -102,7 +104,8 @@ public function testFilterAttributeCollection()
102104
/**
103105
* Stub abstract class which provide to change protected property "$_disabledAttrs" and test methods depended on it
104106
*/
105-
abstract class Stub_Magento_ImportExport_Model_Export_AbstractEntity extends \Magento\ImportExport\Model\Export\AbstractEntity
107+
abstract class Stub_Magento_ImportExport_Model_Export_AbstractEntity
108+
extends \Magento\ImportExport\Model\Export\AbstractEntity
106109
{
107110
public function __construct(
108111
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,

0 commit comments

Comments
 (0)