Merge branch 'MAGETWO-35067' into MAGETWO-31368

akaplya · akaplya · commit c0f07924f5d8 · 2015-03-17T18:42:56.000+02:00
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentInterface.php
@@ -253,7 +253,7 @@ public function getComments();
      * @param \Magento\Sales\Api\Data\ShipmentCommentInterface[] $comments
      * @return $this
      */
-    public function setComments(array $comments = null);
+    public function setComments($comments = null);
 
     /**
      * Sets the store ID for the shipment.
diff --git a/app/code/Magento/Sales/Model/Order/Shipment.php b/app/code/Magento/Sales/Model/Order/Shipment.php
@@ -733,7 +733,7 @@ public function getComments()
      * @param \Magento\Sales\Api\Data\ShipmentCommentInterface[] $comments
      * @return $this
      */
-    public function setComments(array $comments = null)
+    public function setComments($comments = null)
     {
         return $this->setData(ShipmentInterface::COMMENTS, $comments);
     }

Original file line number	Diff line number	Diff line change
`@@ -733,7 +733,7 @@ public function getComments()`
`733`	`733`	`* @param \Magento\Sales\Api\Data\ShipmentCommentInterface[] $comments`
`734`	`734`	`* @return $this`
`735`	`735`	`*/`
`736`		`- public function setComments(array $comments = null)`
	`736`	`+ public function setComments($comments = null)`
`737`	`737`	`{`
`738`	`738`	`return $this->setData(ShipmentInterface::COMMENTS, $comments);`
`739`	`739`	`}`