Skip to content

Commit 7eb3bc1

Browse files
author
Dmytro Voskoboinikov
committed
MAGETWO-34361: Pull request processing
1 parent fdfc5a2 commit 7eb3bc1

File tree

4 files changed

+16
-2
lines changed

4 files changed

+16
-2
lines changed

app/code/Magento/Customer/Model/Attribute/Data/Postcode.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ public function restoreValue($value)
108108
*
109109
* @param string $format
110110
* @return string|array
111+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
111112
*/
112113
public function outputValue($format = AttributeDataFactory::OUTPUT_FORMAT_TEXT)
113114
{

app/code/Magento/Customer/Setup/UpgradeSchema.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class UpgradeSchema implements UpgradeSchemaInterface
1919
{
2020
/**
2121
* {@inheritdoc}
22+
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
2223
*/
2324
public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
2425
{

dev/tests/integration/testsuite/Magento/Customer/Model/VisitorTest.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,22 @@ public function testBindCustomerLogout()
6363
*/
6464
public function testClean()
6565
{
66+
$customerIdNow = 1;
6667
$lastVisitNow = date('Y-m-d H:i:s', time());
6768
$sessionIdNow = 'asaswljxvgklasdflkjasieasd';
69+
$customerIdPast = null;
6870
$lastVisitPast = date('Y-m-d H:i:s', time() - 172800);
6971
$sessionIdPast = 'kui0aa57nqddl8vk7k6ohgi352';
7072

7173
/** @var \Magento\Customer\Model\Visitor $visitor */
7274
$visitor = Bootstrap::getObjectManager()->get('Magento\Customer\Model\Visitor');
75+
$visitor->setCustomerId($customerIdPast);
7376
$visitor->setSessionId($sessionIdPast);
7477
$visitor->setLastVisitAt($lastVisitPast);
7578
$visitor->save();
7679
$visitorIdPast = $visitor->getId();
7780
$visitor->unsetData();
81+
$visitor->setCustomerId($customerIdNow);
7882
$visitor->setSessionId($sessionIdNow);
7983
$visitor->setLastVisitAt($lastVisitNow);
8084
$visitor->save();
@@ -87,7 +91,12 @@ public function testClean()
8791
$visitor->unsetData();
8892
$visitor->load($visitorIdNow);
8993
$this->assertEquals(
90-
['visitor_id' => $visitorIdNow, 'session_id' => $sessionIdNow, 'last_visit_at' => $lastVisitNow],
94+
[
95+
'visitor_id' => $visitorIdNow,
96+
'customer_id' => $customerIdNow,
97+
'session_id' => $sessionIdNow,
98+
'last_visit_at' => $lastVisitNow
99+
],
91100
$visitor->getData()
92101
);
93102
}

dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,10 @@ protected function setUp()
106106
'',
107107
false
108108
);
109-
$this->localeDate->expects($this->any())->method('getDefaultTimezonePath')->willReturn($this->pathToDefaultTimezone);
109+
$this->localeDate
110+
->expects($this->any())
111+
->method('getDefaultTimezonePath')
112+
->willReturn($this->pathToDefaultTimezone);
110113

111114
$this->scopeConfig = $this->getMock(
112115
'Magento\Framework\App\Config',

0 commit comments

Comments
 (0)