Skip to content

Commit 516448f

Browse files
committed
Fixed coding standard violations in the Framework\Test namespace, so that it will be checked bij PHP CS and no longer be ignored while doing CI checks. Made the following changes:
- Removed @codingStandardsIgnoreFile from the head of the file - Fixed indentation - Removed duplicate code line in UrlTest class
1 parent c3040d3 commit 516448f

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

lib/internal/Magento/Framework/Test/Unit/ShellTest.php

Lines changed: 4 additions & 3 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\Test\Unit;
108

119
class ShellTest extends \PHPUnit_Framework_TestCase
@@ -54,7 +52,10 @@ protected function _testExecuteCommand(\Magento\Framework\Shell $shell, $command
5452
public function testExecute($command, $commandArgs, $expectedResult)
5553
{
5654
$this->_testExecuteCommand(
57-
new \Magento\Framework\Shell($this->commandRenderer, $this->logger), $command, $commandArgs, $expectedResult
55+
new \Magento\Framework\Shell($this->commandRenderer, $this->logger),
56+
$command,
57+
$commandArgs,
58+
$expectedResult
5859
);
5960
}
6061

lib/internal/Magento/Framework/Test/Unit/UrlTest.php

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

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\Framework\Test\Unit;
8+
109
use Magento\Framework\Url\HostChecker;
1110

1211
/**
@@ -125,7 +124,7 @@ protected function getRouteParamsResolverFactory($resolve = true)
125124
);
126125
if ($resolve) {
127126
$routeParamsResolverFactoryMock->expects($this->once())->method('create')
128-
->will($this->returnValue($this->routeParamsResolverMock));
127+
->will($this->returnValue($this->routeParamsResolverMock));
129128
}
130129
return $routeParamsResolverFactoryMock;
131130
}
@@ -293,7 +292,6 @@ public function testGetUrlIdempotentSetRoutePath()
293292
$this->urlModifier->expects($this->exactly(1))->method('execute');
294293

295294
$this->assertEquals('catalog/product/view', $model->getUrl('catalog/product/view'));
296-
$this->assertEquals('catalog/product/view', $model->getUrl('catalog/product/view'));
297295
}
298296

299297
public function testGetUrlIdempotentSetRouteName()
@@ -650,7 +648,8 @@ public function testGetConfigDataWithSecureIsForcedParam()
650648
->method('getValue')
651649
->with(
652650
'web/secure/base_url_secure_forced',
653-
\Magento\Store\Model\ScopeInterface::SCOPE_STORE, $this->scopeMock
651+
\Magento\Store\Model\ScopeInterface::SCOPE_STORE,
652+
$this->scopeMock
654653
)
655654
->will($this->returnValue('http://localhost/'));
656655
$this->routeParamsResolverMock->expects($this->once())->method('hasData')->with('secure_is_forced')

lib/internal/Magento/Framework/Test/Unit/ValidatorFactoryTest.php

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

9-
// @codingStandardsIgnoreFile
10-
119
namespace Magento\Framework\Test\Unit;
1210

1311
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;

0 commit comments

Comments
 (0)