Skip to content

Commit c0078be

Browse files
committed
Make indexer status mview 5.5 compatible
1 parent 71ae63c commit c0078be

File tree

2 files changed

+34
-24
lines changed

2 files changed

+34
-24
lines changed

app/code/Magento/Indexer/Console/Command/IndexerStatusMviewCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
7575
];
7676
}
7777

78-
usort($rows, function($a, $b) {
79-
return $a[0] <=> $b[0];
78+
usort($rows, function ($a, $b) {
79+
return strcmp($a[0], $b[0]);
8080
});
8181

8282
$table->addRows($rows);

app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusMviewCommandTest.php

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
use Magento\Store\Model\Website;
1414
use Magento\Framework\Console\Cli;
1515

16+
/**
17+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
18+
*/
1619
class IndexerStatusMviewCommandTest extends \PHPUnit_Framework_TestCase
1720
{
1821
/**
@@ -101,28 +104,7 @@ public function testExecute()
101104
foreach ($mviews as $data) {
102105
$this->collection->addItem($this->generateMviewStub($data['view'], $data['changelog']));
103106
}
104-
105-
/** @var Mview\View\Changelog|\PHPUnit_Framework_MockObject_MockObject $stub */
106-
$changelog = $this->getMockBuilder(\Magento\Framework\Mview\View\Changelog::class)
107-
->disableOriginalConstructor()
108-
->getMock();
109-
110-
$changelog->expects($this->any())
111-
->method('getVersion')
112-
->willThrowException(
113-
new Mview\View\ChangelogTableNotExistsException(new \Magento\Framework\Phrase("Do not render"))
114-
);
115-
116-
/** @var Mview\View|\PHPUnit_Framework_MockObject_MockObject $notInitiatedMview */
117-
$notInitiatedMview = $this->getMockBuilder(\Magento\Framework\Mview\View::class)
118-
->disableOriginalConstructor()
119-
->getMock();
120-
121-
$notInitiatedMview->expects($this->any())
122-
->method('getChangelog')
123-
->willReturn($changelog);
124-
125-
$this->collection->addItem($notInitiatedMview);
107+
$this->collection->addItem($this->getNeverEnabledMviewIndexerWithNoTable());
126108

127109
$tester = new CommandTester($this->command);
128110
$this->assertEquals(Cli::RETURN_SUCCESS, $tester->execute([]));
@@ -212,6 +194,34 @@ protected function generateMviewStub(array $viewData, array $changelogData)
212194
return $stub;
213195
}
214196

197+
/**
198+
* @return Mview\View|\PHPUnit_Framework_MockObject_MockObject
199+
*/
200+
protected function getNeverEnabledMviewIndexerWithNoTable()
201+
{
202+
/** @var Mview\View\Changelog|\PHPUnit_Framework_MockObject_MockObject $stub */
203+
$changelog = $this->getMockBuilder(\Magento\Framework\Mview\View\Changelog::class)
204+
->disableOriginalConstructor()
205+
->getMock();
206+
207+
$changelog->expects($this->any())
208+
->method('getVersion')
209+
->willThrowException(
210+
new Mview\View\ChangelogTableNotExistsException(new \Magento\Framework\Phrase("Do not render"))
211+
);
212+
213+
/** @var Mview\View|\PHPUnit_Framework_MockObject_MockObject $notInitiatedMview */
214+
$notInitiatedMview = $this->getMockBuilder(\Magento\Framework\Mview\View::class)
215+
->disableOriginalConstructor()
216+
->getMock();
217+
218+
$notInitiatedMview->expects($this->any())
219+
->method('getChangelog')
220+
->willReturn($changelog);
221+
222+
return $notInitiatedMview;
223+
}
224+
215225
public function testExecuteExceptionNoVerbosity()
216226
{
217227
/** @var \Magento\Framework\Mview\View|\PHPUnit_Framework_MockObject_MockObject $stub */

0 commit comments

Comments
 (0)