Skip to content

Commit b6aa293

Browse files
committed
Fixed coding standard violations in the Framework\Stdlib 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 at the head of the files - Fixed indentation - Fixed class property which type was not defined. - Wrapped header of PhpCookieManagerTest with a codingstandardignorestart and end, because another namespace is given in the same class file, which is not allowed by PSR-2
1 parent d5f2939 commit b6aa293

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.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\Stdlib\DateTime;
108

119
/**

lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php

Lines changed: 2 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\Stdlib\Test\Unit\Cookie;
108

119
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -117,7 +115,8 @@ public function testGetSensitiveCookieMetadataDefaults()
117115
SensitiveCookieMetadata::KEY_HTTP_ONLY => true,
118116
SensitiveCookieMetadata::KEY_SECURE => true,
119117
],
120-
$cookieScope->getSensitiveCookieMetadata()->__toArray());
118+
$cookieScope->getSensitiveCookieMetadata()->__toArray()
119+
);
121120
}
122121

123122
/**

lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php

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

7-
// @codingStandardsIgnoreFile
8-
97
// @codingStandardsIgnoreStart
108
namespace {
119
$mockTranslateSetCookie = false;
1210
}
1311

14-
namespace Magento\Framework\Stdlib\Test\Unit\Cookie {
15-
// @codingStandardsIgnoreEnd
12+
namespace Magento\Framework\Stdlib\Test\Unit\Cookie
13+
{
1614
use Magento\Framework\Stdlib\Cookie\PhpCookieManager;
1715
use Magento\Framework\Exception\InputException;
1816
use Magento\Framework\Stdlib\Cookie\FailureToSendException;
1917
use Magento\Framework\Stdlib\Cookie\CookieSizeLimitReachedException;
18+
// @codingStandardsIgnoreEnd
2019

2120
/**
2221
* Test PhpCookieManager
@@ -49,7 +48,7 @@ class PhpCookieManagerTest extends \PHPUnit_Framework_TestCase
4948
/**
5049
* Mapping from constant names to functions that handle the assertions.
5150
*/
52-
static $functionTestAssertionMapping = [
51+
protected static $functionTestAssertionMapping = [
5352
self::DELETE_COOKIE_NAME => 'self::assertDeleteCookie',
5453
self::DELETE_COOKIE_NAME_NO_METADATA => 'self::assertDeleteCookieWithNoMetadata',
5554
self::SENSITIVE_COOKIE_NAME_NO_METADATA_HTTPS => 'self::assertSensitiveCookieWithNoMetaDataHttps',
@@ -75,6 +74,7 @@ class PhpCookieManagerTest extends \PHPUnit_Framework_TestCase
7574
* @var \Magento\Framework\Stdlib\Cookie\PhpCookieManager
7675
*/
7776
protected $cookieManager;
77+
7878
/**
7979
* @var \PHPUnit_Framework_MockObject_MockObject|CookieScopeInterface
8080
*/
@@ -233,7 +233,7 @@ public function testSetSensitiveCookieNoMetadata($cookieName, $secure)
233233
[
234234
'request' => $this->requestMock
235235
]
236-
);
236+
);
237237
$this->scopeMock->expects($this->once())
238238
->method('getSensitiveCookieMetadata')
239239
->with()

0 commit comments

Comments
 (0)