diff --git a/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php b/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php index 170053df37c087a19d70bef786678337e505180e..a4d8b53934937cd2342f00bfd5505f6d59953ecc 100644 --- a/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php +++ b/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php @@ -25,6 +25,7 @@ abstract class AbstractIndexer implements IndexerActionInterface, MviewActionInt /** * @param IndexBuilder $indexBuilder + * @param \Magento\Framework\Event\ManagerInterface $eventManager */ public function __construct( IndexBuilder $indexBuilder, diff --git a/app/code/Magento/CatalogRule/Model/Rule.php b/app/code/Magento/CatalogRule/Model/Rule.php index bcb85979fc7f8b2371f3bfc12a7d03ddfd43f6ff..92fe0e211685f710216e13c1bf8e00d600d2ac14 100644 --- a/app/code/Magento/CatalogRule/Model/Rule.php +++ b/app/code/Magento/CatalogRule/Model/Rule.php @@ -163,7 +163,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel * @param \Magento\CatalogRule\Helper\Data $catalogRuleData * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypesList * @param \Magento\Framework\Stdlib\DateTime $dateTime - * @param \Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor + * @param \Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor $ruleProductProcessor * @param \Magento\Framework\Model\Resource\AbstractResource $resource * @param \Magento\Framework\Data\Collection\Db $resourceCollection * @param array $relatedCacheTypes diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/AbstractIndexerTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/AbstractIndexerTest.php index 6c2fd2056d735fc8a144f0f445e3afe74fedfe74..b9a21020e4120a7218a7af66fc9ba0d833a2ebc8 100644 --- a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/AbstractIndexerTest.php +++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/AbstractIndexerTest.php @@ -23,6 +23,11 @@ class AbstractIndexerTest extends \PHPUnit_Framework_TestCase */ protected $_eventManagerMock; + /** + * Set up test + * + * @return void + */ protected function setUp() { $this->_eventManagerMock = $this->getMock('\Magento\Framework\Event\ManagerInterface'); @@ -37,6 +42,11 @@ class AbstractIndexerTest extends \PHPUnit_Framework_TestCase ); } + /** + * Test execute + * + * @return void + */ public function testExecute() { $ids = [1, 2, 5]; @@ -45,6 +55,11 @@ class AbstractIndexerTest extends \PHPUnit_Framework_TestCase $this->indexer->execute($ids); } + /** + * Test execute full reindex action + * + * @return void + */ public function testExecuteFull() { $this->indexBuilder->expects($this->once())->method('reindexFull'); @@ -61,12 +76,19 @@ class AbstractIndexerTest extends \PHPUnit_Framework_TestCase /** * @expectedException \Magento\CatalogRule\CatalogRuleException * @expectedExceptionMessage Could not rebuild index for empty products array + * + * @return void */ public function testExecuteListWithEmptyIds() { $this->indexer->executeList([]); } + /** + * @throws \Magento\CatalogRule\CatalogRuleException + * + * @return void + */ public function testExecuteList() { $ids = [1, 2, 5]; @@ -78,12 +100,19 @@ class AbstractIndexerTest extends \PHPUnit_Framework_TestCase /** * @expectedException \Magento\CatalogRule\CatalogRuleException * @expectedExceptionMessage Could not rebuild index for undefined product + * + * @return void */ public function testExecuteRowWithEmptyId() { $this->indexer->executeRow(null); } + /** + * @throws \Magento\CatalogRule\CatalogRuleException + * + * @return void + */ public function testExecuteRow() { $id = 5; diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php index de720aa681aa03b584703b7324666946e4742dd2..4b3d8d2edd1875f00b0244b31f82a2796e6bc60e 100644 --- a/app/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php +++ b/app/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php @@ -51,6 +51,11 @@ class RuleTest extends \PHPUnit_Framework_TestCase */ protected $productModel; + /** + * Set up before test + * + * @return void + */ protected function setUp() { $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface'); @@ -134,6 +139,8 @@ class RuleTest extends \PHPUnit_Framework_TestCase /** * @dataProvider dataProviderCallbackValidateProduct * @param bool $validate + * + * @return void */ public function testCallbackValidateProduct($validate) { @@ -180,6 +187,11 @@ class RuleTest extends \PHPUnit_Framework_TestCase } } + /** + * Data provider for callbackValidateProduct test + * + * @return array + */ public function dataProviderCallbackValidateProduct() { return [ @@ -188,6 +200,11 @@ class RuleTest extends \PHPUnit_Framework_TestCase ]; } + /** + * Test after delete action + * + * @return void + */ public function testAfterDelete() { $indexer = $this->getMock('\Magento\Indexer\Model\IndexerInterface'); @@ -196,6 +213,11 @@ class RuleTest extends \PHPUnit_Framework_TestCase $this->rule->afterDelete(); } + /** + * Test after update action + * + * @return void + */ public function testAfterUpdate() { $this->rule->isObjectNew(false);