Skip to content

Fixed coding standard violations in the Framework\Stdlib namespace #9329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 21, 2017
Merged

Fixed coding standard violations in the Framework\Stdlib namespace #9329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
* See COPYING.txt for license details.
*/

// @codingStandardsIgnoreFile

namespace Magento\Framework\Stdlib\DateTime;

/**
Expand Down
5 changes: 2 additions & 3 deletions lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
* See COPYING.txt for license details.
*/

// @codingStandardsIgnoreFile

namespace Magento\Framework\Stdlib\Test\Unit\Cookie;

use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
Expand Down Expand Up @@ -117,7 +115,8 @@ public function testGetSensitiveCookieMetadataDefaults()
SensitiveCookieMetadata::KEY_HTTP_ONLY => true,
SensitiveCookieMetadata::KEY_SECURE => true,
],
$cookieScope->getSensitiveCookieMetadata()->__toArray());
$cookieScope->getSensitiveCookieMetadata()->__toArray()
);
}

/**
Expand Down
12 changes: 6 additions & 6 deletions lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,18 @@
* See COPYING.txt for license details.
*/

// @codingStandardsIgnoreFile

// @codingStandardsIgnoreStart
namespace {
$mockTranslateSetCookie = false;
}

namespace Magento\Framework\Stdlib\Test\Unit\Cookie {
// @codingStandardsIgnoreEnd
namespace Magento\Framework\Stdlib\Test\Unit\Cookie
{
use Magento\Framework\Stdlib\Cookie\PhpCookieManager;
use Magento\Framework\Exception\InputException;
use Magento\Framework\Stdlib\Cookie\FailureToSendException;
use Magento\Framework\Stdlib\Cookie\CookieSizeLimitReachedException;
// @codingStandardsIgnoreEnd

/**
* Test PhpCookieManager
Expand Down Expand Up @@ -49,7 +48,7 @@ class PhpCookieManagerTest extends \PHPUnit_Framework_TestCase
/**
* Mapping from constant names to functions that handle the assertions.
*/
static $functionTestAssertionMapping = [
protected static $functionTestAssertionMapping = [
self::DELETE_COOKIE_NAME => 'self::assertDeleteCookie',
self::DELETE_COOKIE_NAME_NO_METADATA => 'self::assertDeleteCookieWithNoMetadata',
self::SENSITIVE_COOKIE_NAME_NO_METADATA_HTTPS => 'self::assertSensitiveCookieWithNoMetaDataHttps',
Expand All @@ -75,6 +74,7 @@ class PhpCookieManagerTest extends \PHPUnit_Framework_TestCase
* @var \Magento\Framework\Stdlib\Cookie\PhpCookieManager
*/
protected $cookieManager;

/**
* @var \PHPUnit_Framework_MockObject_MockObject|CookieScopeInterface
*/
Expand Down Expand Up @@ -233,7 +233,7 @@ public function testSetSensitiveCookieNoMetadata($cookieName, $secure)
[
'request' => $this->requestMock
]
);
);
$this->scopeMock->expects($this->once())
->method('getSensitiveCookieMetadata')
->with()
Expand Down