Skip to content

Commit 7d7c327

Browse files
committed
- Removed the @codingStandardsIgnoreFile in every php file in the framework.
- Made a couple of changes to some files already - This will probably break the build. Let's see if I can fix all the issues
1 parent 0c6227d commit 7d7c327

File tree

136 files changed

+195
-362
lines changed

Some content is hidden

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

136 files changed

+195
-362
lines changed

lib/internal/Magento/Framework/Acl/AclResource/Provider.php

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

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\Framework\Acl\AclResource;
108

119
class Provider implements ProviderInterface
@@ -24,8 +22,10 @@ class Provider implements ProviderInterface
2422
* @param \Magento\Framework\Config\ReaderInterface $configReader
2523
* @param TreeBuilder $resourceTreeBuilder
2624
*/
27-
public function __construct(\Magento\Framework\Config\ReaderInterface $configReader, TreeBuilder $resourceTreeBuilder)
28-
{
25+
public function __construct(
26+
\Magento\Framework\Config\ReaderInterface $configReader,
27+
TreeBuilder $resourceTreeBuilder
28+
) {
2929
$this->_configReader = $configReader;
3030
$this->_resourceTreeBuilder = $resourceTreeBuilder;
3131
}
@@ -37,7 +37,9 @@ public function getAclResources()
3737
{
3838
$aclResourceConfig = $this->_configReader->read();
3939
if (!empty($aclResourceConfig['config']['acl']['resources'])) {
40-
return $this->_resourceTreeBuilder->build($aclResourceConfig['config']['acl']['resources']);
40+
return $this->_resourceTreeBuilder->build(
41+
$aclResourceConfig['config']['acl']['resources']
42+
);
4143
}
4244
return [];
4345
}

lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageContentValidatorTest.php

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

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\Framework\Api\Test\Unit\Api;
108

119
/**
@@ -26,8 +24,8 @@ class ImageContentValidatorTest extends \PHPUnit_Framework_TestCase
2624
protected function setUp()
2725
{
2826
$this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
29-
$this->imageContentValidator = $this->objectManager->getObject(
30-
\Magento\Framework\Api\ImageContentValidator::class
27+
$this->imageContentValidator = $this->objectManager->getObject(
28+
\Magento\Framework\Api\ImageContentValidator::class
3129
);
3230
}
3331

lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageProcessorTest.php

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

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\Framework\Api\Test\Unit\Api;
108

119
/**
@@ -57,7 +55,7 @@ protected function setUp()
5755
{
5856
$this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
5957

60-
$this->directoryWriteMock = $this->getMockForAbstractClass(
58+
$this->directoryWriteMock = $this->getMockForAbstractClass(
6159
\Magento\Framework\Filesystem\Directory\WriteInterface::class
6260
);
6361
$this->fileSystemMock = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
@@ -66,7 +64,7 @@ protected function setUp()
6664
$this->fileSystemMock->expects($this->any())
6765
->method('getDirectoryWrite')
6866
->willReturn($this->directoryWriteMock);
69-
$this->contentValidatorMock = $this->getMockBuilder(
67+
$this->contentValidatorMock = $this->getMockBuilder(
7068
\Magento\Framework\Api\ImageContentValidatorInterface::class)
7169
->disableOriginalConstructor()
7270
->getMock();
@@ -90,7 +88,7 @@ protected function setUp()
9088
->disableOriginalConstructor()
9189
->getMock();
9290

93-
$this->imageProcessor = $this->objectManager->getObject(
91+
$this->imageProcessor = $this->objectManager->getObject(
9492
\Magento\Framework\Api\ImageProcessor::class,
9593
[
9694
'fileSystem' => $this->fileSystemMock,

lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/ExtensionAttributesGeneratorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © 2016 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
// @codingStandardsIgnoreFile
6+
77
namespace Magento\Framework\Api\Test\Unit\Code\Generator;
88

99
use Magento\Framework\Api\ExtensionAttribute\Config\Converter;

lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/ExtensionAttributesInterfaceGeneratorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © 2016 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
// @codingStandardsIgnoreFile
6+
77
namespace Magento\Framework\Api\Test\Unit\Code\Generator;
88

99
use Magento\Framework\Api\ExtensionAttribute\Config\Converter;

lib/internal/Magento/Framework/Api/Test/Unit/DataObjectHelperTest.php

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

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\Framework\Api\Test\Unit;
108

119
use Magento\Framework\Api\CustomAttributesDataInterface;

lib/internal/Magento/Framework/App/Test/Unit/Action/ActionTest.php

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

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\Framework\App\Test\Unit\Action;
108

119
use \Magento\Framework\App\Action\Action;

lib/internal/Magento/Framework/App/Test/Unit/AreaListTest.php

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

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\Framework\App\Test\Unit;
108

119
use \Magento\Framework\App\AreaList;

lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php

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

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\Framework\App\Test\Unit;
108

119
use \Magento\Framework\App\Bootstrap;

lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/ConfigLoaderTest.php

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

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\Framework\App\Test\Unit\ObjectManager;
108

119
class ConfigLoaderTest extends \PHPUnit_Framework_TestCase
@@ -32,15 +30,15 @@ class ConfigLoaderTest extends \PHPUnit_Framework_TestCase
3230

3331
protected function setUp()
3432
{
35-
$this->_readerMock = $this->getMock(
33+
$this->_readerMock = $this->getMock(
3634
\Magento\Framework\ObjectManager\Config\Reader\Dom::class,
3735
[],
3836
[],
3937
'',
4038
false
4139
);
4240

43-
$this->_readerFactoryMock = $this->getMock(
41+
$this->_readerFactoryMock = $this->getMock(
4442
\Magento\Framework\ObjectManager\Config\Reader\DomFactory::class,
4543
['create'],
4644
[],

0 commit comments

Comments
 (0)