MAGETWO-89990: Multishipping

ameysar · ameysar · commit 6b74b21ef402 · 2018-04-10T15:34:17.000+03:00
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Results.php b/app/code/Magento/Multishipping/Block/Checkout/Results.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Multishipping\Block\Checkout;
 
 use Magento\Customer\Model\Address\Config as AddressConfig;
@@ -37,11 +39,6 @@ class Results extends Success
      */
     private $session;
 
-    /**
-     * @var Multishipping
-     */
-    private $multishipping;
-
     /**
      * @param Context $context
      * @param Multishipping $multishipping
@@ -60,7 +57,6 @@ public function __construct(
     ) {
         parent::__construct($context, $multishipping, $data);
 
-        $this->multishipping = $multishipping;
         $this->addressConfig = $addressConfig;
         $this->orderRepository = $orderRepository;
         $this->session = $session;
@@ -73,7 +69,7 @@ public function __construct(
      */
     public function getQuoteShippingAddresses(): array
     {
-        return $this->multishipping->getQuote()->getAllShippingAddresses();
+        return $this->_multishipping->getQuote()->getAllShippingAddresses();
     }
 
     /**
diff --git a/app/code/Magento/Multishipping/Block/DataProviders/Billing.php b/app/code/Magento/Multishipping/Block/DataProviders/Billing.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Multishipping\Block\DataProviders;
 
 use Magento\Framework\View\Element\Block\ArgumentInterface;
diff --git a/app/code/Magento/Multishipping/Block/DataProviders/Overview.php b/app/code/Magento/Multishipping/Block/DataProviders/Overview.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Multishipping\Block\DataProviders;
 
diff --git a/app/code/Magento/Multishipping/Block/DataProviders/Success.php b/app/code/Magento/Multishipping/Block/DataProviders/Success.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Multishipping\Block\DataProviders;
 
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Results.php b/app/code/Magento/Multishipping/Controller/Checkout/Results.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Multishipping\Controller\Checkout;
 
 /**
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderDefault.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderDefault.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Multishipping\Model\Checkout\Type\Multishipping;
 
 use Magento\Sales\Api\OrderManagementInterface;
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderFactory.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderFactory.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Multishipping\Model\Checkout\Type\Multishipping;
 
 use Magento\Framework\ObjectManagerInterface;
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderInterface.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderInterface.php
@@ -3,12 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Multishipping\Model\Checkout\Type\Multishipping;
 
 use Magento\Sales\Api\Data\OrderInterface;
 
 /**
  * Place orders during multishipping checkout flow.
+ *
+ * @api
  */
 interface PlaceOrderInterface
 {
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderPool.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderPool.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Multishipping\Model\Checkout\Type\Multishipping;
 
 use Magento\Framework\ObjectManager\TMap;
diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderDefaultTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderDefaultTest.php
@@ -3,12 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Multishipping\Test\Unit\Model\Checkout\Type\Multishipping;
 
 use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderDefault;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\OrderManagementInterface;
 
+/**
+ * Tests Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderDefault.
+ */
 class PlaceOrderDefaultTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderFactoryTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderFactoryTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Multishipping\Test\Unit\Model\Checkout\Type\Multishipping;
 
 use Magento\Framework\ObjectManagerInterface;
@@ -11,6 +13,9 @@
 use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderInterface;
 use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderPool;
 
+/**
+ * Tests Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderFactory.
+ */
 class PlaceOrderFactoryTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -42,6 +47,11 @@ protected function setUp()
         $this->placeOrderFactory = new PlaceOrderFactory($this->objectManager, $this->placeOrderPool);
     }
 
+    /**
+     * Checks instantiation of place order service.
+     *
+     * @return void
+     */
     public function testCreate()
     {
         $paymentProviderCode = 'code';
@@ -58,6 +68,8 @@ public function testCreate()
 
     /**
      * Checks that default place order service is created when place order pull returns null.
+     *
+     * @return void
      */
     public function testCreateWithDefault()
     {
diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderPoolTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/Multishipping/PlaceOrderPoolTest.php
@@ -3,18 +3,24 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Multishipping\Test\Unit\Model\Checkout\Type\Multishipping;
 
 use Magento\Framework\ObjectManager\TMapFactory;
 use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderInterface;
 use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderPool;
 
+/**
+ * Tests Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderPool.
+ */
 class PlaceOrderPoolTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @param string $paymentProviderCode
      * @param PlaceOrderInterface[] $placeOrderList
      * @param PlaceOrderInterface|null $expectedResult
+     * @return void
      *
      * @dataProvider getDataProvider
      */
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/billing_address.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/billing_address.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 use Magento\Quote\Api\Data\AddressInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 use Magento\Quote\Model\Quote\Item;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/items_rollback.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 require __DIR__ . '/simple_product_10_rollback.php';
 require __DIR__ . '/simple_product_20_rollback.php';
 require __DIR__ . '/virtual_product_5_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/payment_method.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/payment_method.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
 use Magento\Quote\Api\Data\PaymentInterface;
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
 use Magento\Quote\Model\Quote;
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_rollback.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_with_split_items.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_with_split_items.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 use Magento\Quote\Model\Quote;
 
 require __DIR__ . '/quote.php';
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/shipping_address_list.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/shipping_address_list.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
 use Magento\Quote\Api\Data\AddressInterface;
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_10_rollback.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/simple_product_20_rollback.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5_rollback.php b/dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/virtual_product_5_rollback.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php b/dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php
