Skip to content

Commit 08637b0

Browse files
committed
Revert "Make indexer status mview 5.5 compatible"
This reverts commit c0078be.
1 parent 3075426 commit 08637b0

File tree

2 files changed

+24
-34
lines changed

2 files changed

+24
-34
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 strcmp($a[0], $b[0]);
78+
usort($rows, function($a, $b) {
79+
return $a[0] <=> $b[0];
8080
});
8181

8282
$table->addRows($rows);

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

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

16-
/**
17-
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
18-
*/
1916
class IndexerStatusMviewCommandTest extends \PHPUnit_Framework_TestCase
2017
{
2118
/**
@@ -104,7 +101,28 @@ public function testExecute()
104101
foreach ($mviews as $data) {
105102
$this->collection->addItem($this->generateMviewStub($data['view'], $data['changelog']));
106103
}
107-
$this->collection->addItem($this->getNeverEnabledMviewIndexerWithNoTable());
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);
108126

109127
$tester = new CommandTester($this->command);
110128
$this->assertEquals(Cli::RETURN_SUCCESS, $tester->execute([]));
@@ -194,34 +212,6 @@ protected function generateMviewStub(array $viewData, array $changelogData)
194212
return $stub;
195213
}
196214

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-
225215
public function testExecuteExceptionNoVerbosity()
226216
{
227217
/** @var \Magento\Framework\Mview\View|\PHPUnit_Framework_MockObject_MockObject $stub */

0 commit comments

Comments
 (0)