Merge branch 'MAGETWO-39301' of github.corp.ebay.com:magento-troll/magento2ce into MAGETWO-38540

slopukhov · slopukhov · commit 4404d2969c45 · 2015-06-26T13:35:26.000+03:00
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php
@@ -15,6 +15,7 @@ class Actions extends Generic implements TabInterface
      * Prepare content for tab
      *
      * @return \Magento\Framework\Phrase
+     * @codeCoverageIgnore
      */
     public function getTabLabel()
     {
@@ -25,6 +26,7 @@ public function getTabLabel()
      * Prepare title for tab
      *
      * @return \Magento\Framework\Phrase
+     * @codeCoverageIgnore
      */
     public function getTabTitle()
     {
@@ -35,6 +37,7 @@ public function getTabTitle()
      * Returns status flag about this tab can be showen or not
      *
      * @return bool
+     * @codeCoverageIgnore
      */
     public function canShowTab()
     {
@@ -45,6 +48,7 @@ public function canShowTab()
      * Returns status flag about this tab hidden or not
      *
      * @return bool
+     * @codeCoverageIgnore
      */
     public function isHidden()
     {
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
@@ -46,6 +46,7 @@ public function __construct(
      * Prepare content for tab
      *
      * @return \Magento\Framework\Phrase
+     * @codeCoverageIgnore
      */
     public function getTabLabel()
     {
@@ -56,6 +57,7 @@ public function getTabLabel()
      * Prepare title for tab
      *
      * @return \Magento\Framework\Phrase
+     * @codeCoverageIgnore
      */
     public function getTabTitle()
     {
@@ -66,6 +68,7 @@ public function getTabTitle()
      * Returns status flag about this tab can be showen or not
      *
      * @return bool
+     * @codeCoverageIgnore
      */
     public function canShowTab()
     {
@@ -76,6 +79,7 @@ public function canShowTab()
      * Returns status flag about this tab hidden or not
      *
      * @return bool
+     * @codeCoverageIgnore
      */
     public function isHidden()
     {
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php
@@ -68,6 +68,7 @@ public function __construct(
      * Prepare content for tab
      *
      * @return \Magento\Framework\Phrase
+     * @codeCoverageIgnore
      */
     public function getTabLabel()
     {
@@ -78,6 +79,7 @@ public function getTabLabel()
      * Prepare title for tab
      *
      * @return \Magento\Framework\Phrase
+     * @codeCoverageIgnore
      */
     public function getTabTitle()
     {
@@ -88,6 +90,7 @@ public function getTabTitle()
      * Returns status flag about this tab can be showed or not
      *
      * @return bool
+     * @codeCoverageIgnore
      */
     public function canShowTab()
     {
@@ -98,6 +101,7 @@ public function canShowTab()
      * Returns status flag about this tab hidden or not
      *
      * @return bool
+     * @codeCoverageIgnore
      */
     public function isHidden()
     {
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php
@@ -86,6 +86,7 @@ protected function _isAllowed()
      *
      * @param string $dirtyRulesNoticeMessage
      * @return void
+     * @codeCoverageIgnore
      */
     public function setDirtyRulesNoticeMessage($dirtyRulesNoticeMessage)
     {
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php b/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
@@ -60,6 +60,7 @@ public function executeFull()
      * Get affected cache tags
      *
      * @return array
+     * @codeCoverageIgnore
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/CatalogRule/Model/Resource/Rule.php b/app/code/Magento/CatalogRule/Model/Resource/Rule.php
@@ -135,6 +135,7 @@ public function __construct(
      * Initialize main table and table id field
      *
      * @return void
+     * @codeCoverageIgnore
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/CatalogRule/Model/Resource/Rule/Collection.php b/app/code/Magento/CatalogRule/Model/Resource/Rule/Collection.php
@@ -24,6 +24,7 @@ class Collection extends \Magento\Rule\Model\Resource\Rule\Collection\AbstractCo
      * Set resource model
      *
      * @return void
+     * @codeCoverageIgnore
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/CatalogRule/Model/Resource/Rule/Product/Price.php b/app/code/Magento/CatalogRule/Model/Resource/Rule/Product/Price.php
@@ -17,6 +17,7 @@ class Price extends \Magento\Framework\Model\Resource\Db\AbstractDb
      * Initialize connection and define main table
      *
      * @return void
+     * @codeCoverageIgnore
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/CatalogRule/Model/Resource/Rule/Product/Price/Collection.php b/app/code/Magento/CatalogRule/Model/Resource/Rule/Product/Price/Collection.php
@@ -9,6 +9,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
 {
     /**
      * @return void
+     * @codeCoverageIgnore
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/CatalogRule/Model/Rule.php b/app/code/Magento/CatalogRule/Model/Rule.php
@@ -270,6 +270,7 @@ public function getNow()
      *
      * @param string $now
      * @return void
+     * @codeCoverageIgnore
      */
     public function setNow($now)
     {
@@ -425,6 +426,7 @@ protected function _getRulesFromProduct($dateTs, $websiteId, $customerGroupId, $
      *
      * @param  int|array $productIds
      * @return void
+     * @codeCoverageIgnore
      */
     public function setProductsFilter($productIds)
     {
@@ -435,6 +437,7 @@ public function setProductsFilter($productIds)
      * Returns products filter
      *
      * @return array|int|null
+     * @codeCoverageIgnore
      */
     public function getProductsFilter()
     {

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ class Actions extends Generic implements TabInterface`
`15`	`15`	`* Prepare content for tab`
`16`	`16`	`*`
`17`	`17`	`* @return \Magento\Framework\Phrase`
	`18`	`+ * @codeCoverageIgnore`
`18`	`19`	`*/`
`19`	`20`	`public function getTabLabel()`
`20`	`21`	`{`
`@@ -25,6 +26,7 @@ public function getTabLabel()`
`25`	`26`	`* Prepare title for tab`
`26`	`27`	`*`
`27`	`28`	`* @return \Magento\Framework\Phrase`
	`29`	`+ * @codeCoverageIgnore`
`28`	`30`	`*/`
`29`	`31`	`public function getTabTitle()`
`30`	`32`	`{`
`@@ -35,6 +37,7 @@ public function getTabTitle()`
`35`	`37`	`* Returns status flag about this tab can be showen or not`
`36`	`38`	`*`
`37`	`39`	`* @return bool`
	`40`	`+ * @codeCoverageIgnore`
`38`	`41`	`*/`
`39`	`42`	`public function canShowTab()`
`40`	`43`	`{`
`@@ -45,6 +48,7 @@ public function canShowTab()`
`45`	`48`	`* Returns status flag about this tab hidden or not`
`46`	`49`	`*`
`47`	`50`	`* @return bool`
	`51`	`+ * @codeCoverageIgnore`
`48`	`52`	`*/`
`49`	`53`	`public function isHidden()`
`50`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ public function __construct(`
`46`	`46`	`* Prepare content for tab`
`47`	`47`	`*`
`48`	`48`	`* @return \Magento\Framework\Phrase`
	`49`	`+ * @codeCoverageIgnore`
`49`	`50`	`*/`
`50`	`51`	`public function getTabLabel()`
`51`	`52`	`{`
`@@ -56,6 +57,7 @@ public function getTabLabel()`
`56`	`57`	`* Prepare title for tab`
`57`	`58`	`*`
`58`	`59`	`* @return \Magento\Framework\Phrase`
	`60`	`+ * @codeCoverageIgnore`
`59`	`61`	`*/`
`60`	`62`	`public function getTabTitle()`
`61`	`63`	`{`
`@@ -66,6 +68,7 @@ public function getTabTitle()`
`66`	`68`	`* Returns status flag about this tab can be showen or not`
`67`	`69`	`*`
`68`	`70`	`* @return bool`
	`71`	`+ * @codeCoverageIgnore`
`69`	`72`	`*/`
`70`	`73`	`public function canShowTab()`
`71`	`74`	`{`
`@@ -76,6 +79,7 @@ public function canShowTab()`
`76`	`79`	`* Returns status flag about this tab hidden or not`
`77`	`80`	`*`
`78`	`81`	`* @return bool`
	`82`	`+ * @codeCoverageIgnore`
`79`	`83`	`*/`
`80`	`84`	`public function isHidden()`
`81`	`85`	`{`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ public function __construct(`
`68`	`68`	`* Prepare content for tab`
`69`	`69`	`*`
`70`	`70`	`* @return \Magento\Framework\Phrase`
	`71`	`+ * @codeCoverageIgnore`
`71`	`72`	`*/`
`72`	`73`	`public function getTabLabel()`
`73`	`74`	`{`
`@@ -78,6 +79,7 @@ public function getTabLabel()`
`78`	`79`	`* Prepare title for tab`
`79`	`80`	`*`
`80`	`81`	`* @return \Magento\Framework\Phrase`
	`82`	`+ * @codeCoverageIgnore`
`81`	`83`	`*/`
`82`	`84`	`public function getTabTitle()`
`83`	`85`	`{`
`@@ -88,6 +90,7 @@ public function getTabTitle()`
`88`	`90`	`* Returns status flag about this tab can be showed or not`
`89`	`91`	`*`
`90`	`92`	`* @return bool`
	`93`	`+ * @codeCoverageIgnore`
`91`	`94`	`*/`
`92`	`95`	`public function canShowTab()`
`93`	`96`	`{`
`@@ -98,6 +101,7 @@ public function canShowTab()`
`98`	`101`	`* Returns status flag about this tab hidden or not`
`99`	`102`	`*`
`100`	`103`	`* @return bool`
	`104`	`+ * @codeCoverageIgnore`
`101`	`105`	`*/`
`102`	`106`	`public function isHidden()`
`103`	`107`	`{`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ protected function _isAllowed()`
`86`	`86`	`*`
`87`	`87`	`* @param string $dirtyRulesNoticeMessage`
`88`	`88`	`* @return void`
	`89`	`+ * @codeCoverageIgnore`
`89`	`90`	`*/`
`90`	`91`	`public function setDirtyRulesNoticeMessage($dirtyRulesNoticeMessage)`
`91`	`92`	`{`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ public function executeFull()`
`60`	`60`	`* Get affected cache tags`
`61`	`61`	`*`
`62`	`62`	`* @return array`
	`63`	`+ * @codeCoverageIgnore`
`63`	`64`	`*/`
`64`	`65`	`public function getIdentities()`
`65`	`66`	`{`
Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@ public function __construct(`
`135`	`135`	`* Initialize main table and table id field`
`136`	`136`	`*`
`137`	`137`	`* @return void`
	`138`	`+ * @codeCoverageIgnore`
`138`	`139`	`*/`
`139`	`140`	`protected function _construct()`
`140`	`141`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ class Collection extends \Magento\Rule\Model\Resource\Rule\Collection\AbstractCo`
`24`	`24`	`* Set resource model`
`25`	`25`	`*`
`26`	`26`	`* @return void`
	`27`	`+ * @codeCoverageIgnore`
`27`	`28`	`*/`
`28`	`29`	`protected function _construct()`
`29`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ class Price extends \Magento\Framework\Model\Resource\Db\AbstractDb`
`17`	`17`	`* Initialize connection and define main table`
`18`	`18`	`*`
`19`	`19`	`* @return void`
	`20`	`+ * @codeCoverageIgnore`
`20`	`21`	`*/`
`21`	`22`	`protected function _construct()`
`22`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac`
`9`	`9`	`{`
`10`	`10`	`/**`
`11`	`11`	`* @return void`
	`12`	`+ * @codeCoverageIgnore`
`12`	`13`	`*/`
`13`	`14`	`protected function _construct()`
`14`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -270,6 +270,7 @@ public function getNow()`
`270`	`270`	`*`
`271`	`271`	`* @param string $now`
`272`	`272`	`* @return void`
	`273`	`+ * @codeCoverageIgnore`
`273`	`274`	`*/`
`274`	`275`	`public function setNow($now)`
`275`	`276`	`{`
`@@ -425,6 +426,7 @@ protected function _getRulesFromProduct($dateTs, $websiteId, $customerGroupId, $`
`425`	`426`	`*`
`426`	`427`	`* @param int\|array $productIds`
`427`	`428`	`* @return void`
	`429`	`+ * @codeCoverageIgnore`
`428`	`430`	`*/`
`429`	`431`	`public function setProductsFilter($productIds)`
`430`	`432`	`{`
`@@ -435,6 +437,7 @@ public function setProductsFilter($productIds)`
`435`	`437`	`* Returns products filter`
`436`	`438`	`*`
`437`	`439`	`* @return array\|int\|null`
	`440`	`+ * @codeCoverageIgnore`
`438`	`441`	`*/`
`439`	`442`	`public function getProductsFilter()`
`440`	`443`	`{`