Merge remote-tracking branch 'origin/MAGETWO-92484' into 2.2.5-develop-pr31

Author: zakdma

app/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php

@@ -389,7 +389,7 @@ public function testGetConditionsFieldSetId()
     public function testReindex(
         array $productIds,
         \PHPUnit_Framework_MockObject_Matcher_InvokedCount $callCount
-    ): void {
+    ) {
         $this->objectManager->setBackwardCompatibleProperty($this->rule, '_productIds', $productIds);
         $this->_ruleProductProcessor->expects($callCount)->method('reindexList');
         $this->rule->reindex();