MAGETWO-49608: Prepare PR

mslabko · mslabko · commit ce5b4db76717 · 2016-02-23T11:19:27.000+02:00
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
@@ -216,13 +216,14 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData)
 
     /**
      * @param string|null $attribute
+     * @return void
      */
     protected function setInvalidAttribute($attribute)
     {
         $this->invalidAttribute = $attribute;
     }
 
-    /*
+    /**
      * @return string
      */
     public function getInvalidAttribute()
diff --git a/app/code/Magento/CatalogRule/Model/Rule.php b/app/code/Magento/CatalogRule/Model/Rule.php
@@ -582,6 +582,7 @@ public function getConditionsFieldSetId($formName = '')
     }
 
     //@codeCoverageIgnoreStart
+
     /**
      * {@inheritdoc}
      */

Original file line number	Diff line number	Diff line change
`@@ -216,13 +216,14 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData)`
`216`	`216`
`217`	`217`	`/**`
`218`	`218`	`* @param string\|null $attribute`
	`219`	`+ * @return void`
`219`	`220`	`*/`
`220`	`221`	`protected function setInvalidAttribute($attribute)`
`221`	`222`	`{`
`222`	`223`	`$this->invalidAttribute = $attribute;`
`223`	`224`	`}`
`224`	`225`
`225`		`- /*`
	`226`	`+ /**`
`226`	`227`	`* @return string`
`227`	`228`	`*/`
`228`	`229`	`public function getInvalidAttribute()`
Original file line number	Diff line number	Diff line change
`@@ -582,6 +582,7 @@ public function getConditionsFieldSetId($formName = '')`
`582`	`582`	`}`
`583`	`583`
`584`	`584`	`//@codeCoverageIgnoreStart`
	`585`	`+`
`585`	`586`	`/**`
`586`	`587`	`* {@inheritdoc}`
`587`	`588`	`*/`