From 1e34fde22bf5ceba0ddedf425de9edfb9f50b3b0 Mon Sep 17 00:00:00 2001
From: Luke Rodgers <lukerodgers90@gmail.com>
Date: Sun, 5 Nov 2017 21:23:23 +0000
Subject: [PATCH] Make indexer status mview 5.5 compatible
---
.../Command/IndexerStatusMviewCommand.php | 4 +-
.../Command/IndexerStatusMviewCommandTest.php | 54 +++++++++++--------
2 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerStatusMviewCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerStatusMviewCommand.php
index 4fb0c0bcb56..61461a0ba61 100644
--- a/app/code/Magento/Indexer/Console/Command/IndexerStatusMviewCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerStatusMviewCommand.php
@@ -75,8 +75,8 @@ class IndexerStatusMviewCommand extends Command
];
}
- usort($rows, function($a, $b) {
- return $a[0] <=> $b[0];
+ usort($rows, function ($a, $b) {
+ return strcmp($a[0], $b[0]);
});
$table->addRows($rows);
diff --git a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusMviewCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusMviewCommandTest.php
index 7266d009a5e..e6a782cba92 100644
--- a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusMviewCommandTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusMviewCommandTest.php
@@ -13,6 +13,9 @@ use Symfony\Component\Console\Helper\TableHelper;
use Magento\Store\Model\Website;
use Magento\Framework\Console\Cli;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class IndexerStatusMviewCommandTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -101,28 +104,7 @@ class IndexerStatusMviewCommandTest extends \PHPUnit_Framework_TestCase
foreach ($mviews as $data) {
$this->collection->addItem($this->generateMviewStub($data['view'], $data['changelog']));
}
-
- /** @var Mview\View\Changelog|\PHPUnit_Framework_MockObject_MockObject $stub */
- $changelog = $this->getMockBuilder(\Magento\Framework\Mview\View\Changelog::class)
- ->disableOriginalConstructor()
- ->getMock();
-
- $changelog->expects($this->any())
- ->method('getVersion')
- ->willThrowException(
- new Mview\View\ChangelogTableNotExistsException(new \Magento\Framework\Phrase("Do not render"))
- );
-
- /** @var Mview\View|\PHPUnit_Framework_MockObject_MockObject $notInitiatedMview */
- $notInitiatedMview = $this->getMockBuilder(\Magento\Framework\Mview\View::class)
- ->disableOriginalConstructor()
- ->getMock();
-
- $notInitiatedMview->expects($this->any())
- ->method('getChangelog')
- ->willReturn($changelog);
-
- $this->collection->addItem($notInitiatedMview);
+ $this->collection->addItem($this->getNeverEnabledMviewIndexerWithNoTable());
$tester = new CommandTester($this->command);
$this->assertEquals(Cli::RETURN_SUCCESS, $tester->execute([]));
@@ -212,6 +194,34 @@ class IndexerStatusMviewCommandTest extends \PHPUnit_Framework_TestCase
return $stub;
}
+ /**
+ * @return Mview\View|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected function getNeverEnabledMviewIndexerWithNoTable()
+ {
+ /** @var Mview\View\Changelog|\PHPUnit_Framework_MockObject_MockObject $stub */
+ $changelog = $this->getMockBuilder(\Magento\Framework\Mview\View\Changelog::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $changelog->expects($this->any())
+ ->method('getVersion')
+ ->willThrowException(
+ new Mview\View\ChangelogTableNotExistsException(new \Magento\Framework\Phrase("Do not render"))
+ );
+
+ /** @var Mview\View|\PHPUnit_Framework_MockObject_MockObject $notInitiatedMview */
+ $notInitiatedMview = $this->getMockBuilder(\Magento\Framework\Mview\View::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $notInitiatedMview->expects($this->any())
+ ->method('getChangelog')
+ ->willReturn($changelog);
+
+ return $notInitiatedMview;
+ }
+
public function testExecuteExceptionNoVerbosity()
{
/** @var \Magento\Framework\Mview\View|\PHPUnit_Framework_MockObject_MockObject $stub */
--
GitLab