MAGETWO-38193: Stabilize story branch

Author: sivaschenko

app/code/Magento/Sales/Model/Resource/EntityRelationComposite.php

@@ -38,6 +38,7 @@ public function __construct(
 
     /**
      * @param AbstractModel $object
+     * @return void
      */
     public function processRelations(AbstractModel $object)
     {

app/code/Magento/Sales/Model/Resource/EntityRelationInterface.php

@@ -15,6 +15,7 @@ interface EntityRelationInterface
      * Process object relations
      *
      * @param \Magento\Sales\Model\AbstractModel $object
+     * @return void
      */
     public function processRelation(\Magento\Sales\Model\AbstractModel $object);
 }

app/code/Magento/Sales/Model/Resource/Order.php

@@ -54,8 +54,9 @@ protected function _construct()
      * @param Attribute $attribute
      * @param Manager $sequenceManager
      * @param EntitySnapshot $entitySnapshot
+     * @param EntityRelationComposite $entityRelationComposite
      * @param StateHandler $stateHandler
-     * @param null $resourcePrefix
+     * @param string $resourcePrefix
      */
     public function __construct(
         \Magento\Framework\Model\Resource\Db\Context $context,

app/code/Magento/Sales/Model/Resource/Order/Address.php

@@ -36,9 +36,10 @@ class Address extends SalesResource implements OrderAddressResourceInterface
      * @param \Magento\Sales\Model\Resource\Attribute $attribute
      * @param \Magento\SalesSequence\Model\Manager $sequenceManager
      * @param EntitySnapshot $entitySnapshot
+     * @param \Magento\Sales\Model\Resource\EntityRelationComposite $entityRelationComposite
      * @param \Magento\Sales\Model\Order\Address\Validator $validator
      * @param \Magento\Sales\Model\Resource\GridPool $gridPool
-     * @param string|null $resourcePrefix
+     * @param string $resourcePrefix
      */
     public function __construct(
         \Magento\Framework\Model\Resource\Db\Context $context,

app/code/Magento/Sales/Model/Resource/Order/Creditmemo/Comment.php

@@ -35,8 +35,9 @@ class Comment extends EntityAbstract implements CreditmemoCommentResourceInterfa
      * @param \Magento\Sales\Model\Resource\Attribute $attribute
      * @param \Magento\SalesSequence\Model\Manager $sequenceManager
      * @param EntitySnapshot $entitySnapshot
+     * @param \Magento\Sales\Model\Resource\EntityRelationComposite $entityRelationComposite
      * @param \Magento\Sales\Model\Order\Creditmemo\Comment\Validator $validator
-     * @param string|null $resourcePrefix
+     * @param string $resourcePrefix
      */
     public function __construct(
         \Magento\Framework\Model\Resource\Db\Context $context,

app/code/Magento/Sales/Model/Resource/Order/Creditmemo/Relation.php

@@ -40,6 +40,7 @@ public function __construct(
      *
      * @param \Magento\Sales\Model\AbstractModel $object
      * @throws \Exception
+     * @return void
      */
     public function processRelation(\Magento\Sales\Model\AbstractModel $object)
     {

app/code/Magento/Sales/Model/Resource/Order/Invoice/Comment.php

@@ -35,16 +35,17 @@ class Comment extends EntityAbstract implements InvoiceCommentResourceInterface
      * @param \Magento\Sales\Model\Resource\Attribute $attribute
      * @param \Magento\SalesSequence\Model\Manager $sequenceManager
      * @param EntitySnapshot $entitySnapshot
+     * @param \Magento\Sales\Model\Resource\EntityRelationComposite $entityRelationComposite
      * @param \Magento\Sales\Model\Order\Invoice\Comment\Validator $validator
-     * @param string|null $resourcePrefix
+     * @param string $resourcePrefix
      */
     public function __construct(
         \Magento\Framework\Model\Resource\Db\Context $context,
         \Magento\Sales\Model\Resource\Attribute $attribute,
         \Magento\SalesSequence\Model\Manager $sequenceManager,
         EntitySnapshot $entitySnapshot,
-        \Magento\Sales\Model\Order\Invoice\Comment\Validator $validator,
         \Magento\Sales\Model\Resource\EntityRelationComposite $entityRelationComposite,
+        \Magento\Sales\Model\Order\Invoice\Comment\Validator $validator,
         $resourcePrefix = null
     ) {
         $this->validator = $validator;

app/code/Magento/Sales/Model/Resource/Order/Invoice/Relation.php

@@ -41,6 +41,7 @@ public function __construct(
      * Process relations for Shipment
      *
      * @param \Magento\Sales\Model\AbstractModel $object
+     * @return void
      * @throws \Exception
      */
     public function processRelation(\Magento\Sales\Model\AbstractModel $object)

app/code/Magento/Sales/Model/Resource/Order/Relation.php

@@ -60,6 +60,7 @@ public function __construct(
      * Save relations for Order
      *
      * @param AbstractModel $object
+     * @return void
      * @throws \Exception
      */
     public function processRelation(AbstractModel $object)

app/code/Magento/Sales/Model/Resource/Order/Shipment.php

@@ -65,15 +65,4 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
 
         return parent::_beforeSave($object);
     }
-
-    /**
-     * Perform actions after object save
-     *
-     * @param \Magento\Framework\Model\AbstractModel $object
-     * @return $this
-     */
-    protected function processRelations(\Magento\Framework\Model\AbstractModel $object)
-    {
-
-    }
 }