Skip to content

Commit 3876c51

Browse files
author
Yuri Kovsher
committed
MAGETWO-34383: Pull request & cleanup
1 parent 655c79d commit 3876c51

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ public function __construct(
3838
\Magento\Backup\Model\BackupFactory $backupModelFactory,
3939
\Magento\Framework\App\MaintenanceMode $maintenanceMode,
4040
\Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
41-
\Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory) {
41+
\Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
42+
) {
4243
parent::__construct(
4344
$context,
4445
$coreRegistry,

dev/tests/unit/testsuite/Magento/Backup/Controller/Adminhtml/Index/DownloadTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
/**
1212
* @covers \Magento\Backup\Controller\Adminhtml\Index\Download
13+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1314
*/
1415
class DownloadTest extends \PHPUnit_Framework_TestCase
1516
{
@@ -252,4 +253,4 @@ public function executeBackupNotFoundDataProvider()
252253
[0, false, 0]
253254
];
254255
}
255-
}
256+
}

dev/tests/unit/testsuite/Magento/Customer/Controller/Adminhtml/Index/ViewfileTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
namespace Magento\Customer\Controller\Adminhtml\Index;
88

9+
/**
10+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
11+
*/
912
class ViewfileTest extends \PHPUnit_Framework_TestCase
1013
{
1114
/**
@@ -125,7 +128,7 @@ public function testExecuteParamFile()
125128
['Magento\Framework\Filesystem', $this->fileSystemMock],
126129
['Magento\Core\Helper\File\Storage', $this->storage]
127130
]
128-
);
131+
);
129132

130133
$this->urlDecoderMock->expects($this->once())->method('decode')->with($decodedFile)->willReturn($file);
131134

@@ -211,4 +214,4 @@ public function testExecuteGetParamImage()
211214
);
212215
$this->assertSame($this->resultRawMock, $controller->execute());
213216
}
214-
}
217+
}

dev/tests/unit/testsuite/Magento/User/Model/UserTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,10 @@ public function testVerifyIdentityInactiveRecord()
368368
->with($password, $this->_model->getPassword())
369369
->will($this->returnValue(true));
370370
$this->_model->setIsActive(false);
371-
$this->setExpectedException('Magento\\Framework\\Exception\\AuthenticationException', 'This account is inactive.');
371+
$this->setExpectedException(
372+
'Magento\\Framework\\Exception\\AuthenticationException',
373+
'This account is inactive.'
374+
);
372375
$this->_model->verifyIdentity($password);
373376
}
374377

0 commit comments

Comments
 (0)