Merge remote-tracking branch 'tangoc/MAGETWO-44686' into pullr

Bohdan Korablov · Bohdan Korablov · commit 281feb34e177 · 2015-11-02T11:05:25.000+02:00
diff --git a/app/code/Magento/Eav/Model/Config.php b/app/code/Magento/Eav/Model/Config.php
@@ -418,7 +418,7 @@ protected function _initAttributes($entityType)
      *
      * @param   mixed $entityType
      * @param   mixed $code
-     * @return  \Magento\Eav\Model\Entity\Attribute\AbstractAttribute|false
+     * @return  \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getAttribute($entityType, $code)

Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,7 @@ protected function _initAttributes($entityType)`
`418`	`418`	`*`
`419`	`419`	`* @param mixed $entityType`
`420`	`420`	`* @param mixed $code`
`421`		`- * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute\|false`
	`421`	`+ * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute`
`422`	`422`	`* @throws \Magento\Framework\Exception\LocalizedException`
`423`	`423`	`*/`
`424`	`424`	`public function getAttribute($entityType, $code)`