From 8d9f0292b7018c933e9ba5f729d64df2a48b6ed2 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov <sidolov@ebay.com> Date: Mon, 26 Oct 2015 17:14:34 +0200 Subject: [PATCH] MAGETWO-44589: [Github] Make API jsonapi compliant --- app/code/Magento/Checkout/Model/Type/Onepage.php | 6 +++--- .../Checkout/Test/Unit/Model/Type/OnepageTest.php | 2 +- app/code/Magento/Paypal/Model/Express/Checkout.php | 6 +++--- .../Model/GuestCart/GuestCartItemRepository.php | 8 ++++---- .../Model/GuestCart/GuestCartTotalManagement.php | 6 +++--- app/code/Magento/Quote/Model/QuoteManagement.php | 2 +- .../Unit/Model/Cart/CartTotalManagementTest.php | 4 ++-- .../GuestCart/GuestCartItemRepositoryTest.php | 2 +- .../Test/Unit/Model/Quote/Item/RepositoryTest.php | 6 +++--- .../Quote/Test/Unit/Model/QuoteManagementTest.php | 14 +++++++------- app/code/Magento/Sales/Model/AdminOrder/Create.php | 6 +++--- .../quote_with_product_and_custom_options.php | 4 ++-- .../Paypal/_files/quote_payment_express.php | 4 ++-- .../_files/quote_payment_express_with_customer.php | 4 ++-- .../Paypal/_files/quote_payment_payflow.php | 4 ++-- .../Quote/Model/Quote/Item/RepositoryTest.php | 4 ++-- .../Magento/Quote/Model/QuoteManagementTest.php | 4 ++-- .../testsuite/Magento/Sales/_files/order_info.php | 2 +- 18 files changed, 44 insertions(+), 44 deletions(-) diff --git a/app/code/Magento/Checkout/Model/Type/Onepage.php b/app/code/Magento/Checkout/Model/Type/Onepage.php index f2fa06638f9..b5edd78257a 100644 --- a/app/code/Magento/Checkout/Model/Type/Onepage.php +++ b/app/code/Magento/Checkout/Model/Type/Onepage.php @@ -156,7 +156,7 @@ class Onepage protected $extensibleDataObjectConverter; /** - * @var \Magento\Quote\Model\QuoteManagement + * @var \Magento\Quote\Api\CartManagementInterface */ protected $quoteManagement; @@ -195,7 +195,7 @@ class Onepage * @param CustomerRepositoryInterface $customerRepository * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository * @param \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter - * @param \Magento\Quote\Model\QuoteManagement $quoteManagement + * @param \Magento\Quote\Api\CartManagementInterface $quoteManagement * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper * @param \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector * @codeCoverageIgnore @@ -226,7 +226,7 @@ class Onepage CustomerRepositoryInterface $customerRepository, \Magento\Quote\Api\CartRepositoryInterface $quoteRepository, \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter, - \Magento\Quote\Model\QuoteManagement $quoteManagement, + \Magento\Quote\Api\CartManagementInterface $quoteManagement, \Magento\Framework\Api\DataObjectHelper $dataObjectHelper, \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector ) { diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Type/OnepageTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Type/OnepageTest.php index caf337b15e0..2d5aaa1a8e1 100644 --- a/app/code/Magento/Checkout/Test/Unit/Model/Type/OnepageTest.php +++ b/app/code/Magento/Checkout/Test/Unit/Model/Type/OnepageTest.php @@ -142,7 +142,7 @@ class OnepageTest extends \PHPUnit_Framework_TestCase $this->addressFactoryMock = $this->getMock('Magento\Customer\Model\AddressFactory', [], [], '', false); $this->formFactoryMock = $this->getMock('Magento\Customer\Model\Metadata\FormFactory', [], [], '', false); $this->customerFactoryMock = $this->getMock('Magento\Customer\Model\CustomerFactory', [], [], '', false); - $this->quoteManagementMock = $this->getMock('Magento\Quote\Model\QuoteManagement', [], [], '', false); + $this->quoteManagementMock = $this->getMock('\Magento\Quote\Api\CartManagementInterface'); $this->orderFactoryMock = $this->getMock('Magento\Sales\Model\OrderFactory', ['create'], [], '', false); $this->copyMock = $this->getMock('Magento\Framework\DataObject\Copy', [], [], '', false); $this->messageManagerMock = $this->getMock('Magento\Framework\Message\ManagerInterface'); diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php index e0802232bc0..2df901f5ce5 100644 --- a/app/code/Magento/Paypal/Model/Express/Checkout.php +++ b/app/code/Magento/Paypal/Model/Express/Checkout.php @@ -265,7 +265,7 @@ class Checkout protected $quoteRepository; /** - * @var \Magento\Quote\Model\QuoteManagement + * @var \Magento\Quote\Api\CartManagementInterface */ protected $quoteManagement; @@ -287,7 +287,7 @@ class Checkout * @param \Magento\Framework\UrlInterface $coreUrl * @param \Magento\Paypal\Model\CartFactory $cartFactory * @param \Magento\Checkout\Model\Type\OnepageFactory $onepageFactory - * @param \Magento\Quote\Model\QuoteManagement $quoteManagement + * @param \Magento\Quote\Api\CartManagementInterface $quoteManagement * @param \Magento\Paypal\Model\Billing\AgreementFactory $agreementFactory * @param \Magento\Paypal\Model\Api\Type\Factory $apiTypeFactory * @param DataObject\Copy $objectCopyService @@ -317,7 +317,7 @@ class Checkout \Magento\Framework\UrlInterface $coreUrl, \Magento\Paypal\Model\CartFactory $cartFactory, \Magento\Checkout\Model\Type\OnepageFactory $onepageFactory, - \Magento\Quote\Model\QuoteManagement $quoteManagement, + \Magento\Quote\Api\CartManagementInterface $quoteManagement, \Magento\Paypal\Model\Billing\AgreementFactory $agreementFactory, \Magento\Paypal\Model\Api\Type\Factory $apiTypeFactory, \Magento\Framework\DataObject\Copy $objectCopyService, diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCartItemRepository.php b/app/code/Magento/Quote/Model/GuestCart/GuestCartItemRepository.php index c0519dbf6fc..b15c2225b7f 100644 --- a/app/code/Magento/Quote/Model/GuestCart/GuestCartItemRepository.php +++ b/app/code/Magento/Quote/Model/GuestCart/GuestCartItemRepository.php @@ -7,7 +7,7 @@ namespace Magento\Quote\Model\GuestCart; use Magento\Quote\Api\Data\CartItemInterface; -use Magento\Quote\Model\Quote\Item\Repository; +use Magento\Quote\Api\CartItemRepositoryInterface; use Magento\Quote\Model\QuoteIdMask; use Magento\Quote\Model\QuoteIdMaskFactory; @@ -17,7 +17,7 @@ use Magento\Quote\Model\QuoteIdMaskFactory; class GuestCartItemRepository implements \Magento\Quote\Api\GuestCartItemRepositoryInterface { /** - * @var Repository + * @var \Magento\Quote\Api\CartItemRepositoryInterface */ protected $repository; @@ -29,11 +29,11 @@ class GuestCartItemRepository implements \Magento\Quote\Api\GuestCartItemReposit /** * Constructs a read service object. * - * @param \Magento\Quote\Model\Quote\Item\Repository $repository + * @param \Magento\Quote\Api\CartItemRepositoryInterface $repository * @param QuoteIdMaskFactory $quoteIdMaskFactory */ public function __construct( - \Magento\Quote\Model\Quote\Item\Repository $repository, + \Magento\Quote\Api\CartItemRepositoryInterface $repository, QuoteIdMaskFactory $quoteIdMaskFactory ) { $this->quoteIdMaskFactory = $quoteIdMaskFactory; diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalManagement.php index 92a806211f0..10220a26297 100644 --- a/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalManagement.php +++ b/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalManagement.php @@ -14,7 +14,7 @@ use Magento\Quote\Api\GuestCartTotalManagementInterface; class GuestCartTotalManagement implements GuestCartTotalManagementInterface { /** - * @var \Magento\Quote\Model\Cart\CartTotalManagement + * @var \Magento\Quote\Api\CartTotalManagementInterface */ protected $cartTotalManagement; @@ -24,11 +24,11 @@ class GuestCartTotalManagement implements GuestCartTotalManagementInterface protected $quoteIdMaskFactory; /** - * @param \Magento\Quote\Model\Cart\CartTotalManagement $cartTotalManagement + * @param \Magento\Quote\Api\CartTotalManagementInterface $cartTotalManagement * @param QuoteIdMaskFactory $quoteIdMaskFactory */ public function __construct( - \Magento\Quote\Model\Cart\CartTotalManagement $cartTotalManagement, + \Magento\Quote\Api\CartTotalManagementInterface $cartTotalManagement, QuoteIdMaskFactory $quoteIdMaskFactory ) { $this->cartTotalManagement = $cartTotalManagement; diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php index 6e1cebb4b2d..54cd258ce2c 100644 --- a/app/code/Magento/Quote/Model/QuoteManagement.php +++ b/app/code/Magento/Quote/Model/QuoteManagement.php @@ -343,7 +343,7 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface } /** - * Delete quote item + * Submit quote * * @param Quote $quote * @param array $orderData diff --git a/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalManagementTest.php index 949d05f360f..54652f8c811 100644 --- a/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalManagementTest.php +++ b/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalManagementTest.php @@ -32,7 +32,7 @@ class CartTotalManagementTest extends \PHPUnit_Framework_TestCase protected $cartTotalMock; /** - * @var \Magento\Quote\Model\Cart\CartTotalManagement + * @var \Magento\Quote\Api\CartTotalManagementInterface */ protected $model; @@ -43,7 +43,7 @@ class CartTotalManagementTest extends \PHPUnit_Framework_TestCase $this->paymentMock = $this->getMock('\Magento\Quote\Api\PaymentMethodManagementInterface', [], [], '', false); $this->cartTotalMock = $this->getMock('\Magento\Quote\Api\CartTotalRepositoryInterface', [], [], '', false); $this->model = $this->objectManager->getObject( - '\Magento\Quote\Model\Cart\CartTotalManagement', + '\Magento\Quote\Api\CartTotalManagementInterface', [ 'shippingMethodManagement' => $this->shippingMock, 'paymentMethodManagement' => $this->paymentMock, diff --git a/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartItemRepositoryTest.php b/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartItemRepositoryTest.php index 9535e3c1c74..6d8fd124e76 100644 --- a/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartItemRepositoryTest.php +++ b/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartItemRepositoryTest.php @@ -79,7 +79,7 @@ class GuestCartItemRepositoryTest extends \PHPUnit_Framework_TestCase ->method('setQuoteId') ->with($this->cartId); - $this->cartItemRepositoryMock = $this->getMock('\Magento\Quote\Model\Quote\Item\Repository', [], [], '', false); + $this->cartItemRepositoryMock = $this->getMock('\Magento\Quote\Api\CartItemRepositoryInterface'); $this->guestCartItemRepository = $objectManager->getObject( 'Magento\Quote\Model\GuestCart\GuestCartItemRepository', diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RepositoryTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RepositoryTest.php index fee1610ca16..11dd10b134a 100644 --- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RepositoryTest.php +++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RepositoryTest.php @@ -7,12 +7,12 @@ namespace Magento\Quote\Test\Unit\Model\Quote\Item; -use Magento\Quote\Model\Quote\Item\Repository; +use Magento\Quote\Api\CartItemRepositoryInterface; class RepositoryTest extends \PHPUnit_Framework_TestCase { /** - * @var Repository + * @var \Magento\Quote\Api\CartItemRepositoryInterface */ protected $repository; @@ -77,7 +77,7 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase false ); - $this->repository = new Repository( + $this->repository = new \Magento\Quote\Model\Quote\Item\Repository( $this->quoteRepositoryMock, $this->productRepositoryMock, $this->itemDataFactoryMock, diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php index bd8057b5c01..e318617d88e 100644 --- a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php +++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php @@ -6,7 +6,7 @@ namespace Magento\Quote\Test\Unit\Model; -use \Magento\Quote\Model\QuoteManagement; +use \Magento\Quote\Api\CartManagementInterface; use \Magento\Quote\Model\CustomerManagement; use \Magento\Framework\Exception\NoSuchEntityException; @@ -18,7 +18,7 @@ use \Magento\Framework\Exception\NoSuchEntityException; class QuoteManagementTest extends \PHPUnit_Framework_TestCase { /** - * @var QuoteManagement + * @var \Magento\Quote\Api\CartManagementInterface */ protected $model; @@ -221,7 +221,7 @@ class QuoteManagementTest extends \PHPUnit_Framework_TestCase ); $this->model = $objectManager->getObject( - 'Magento\Quote\Model\QuoteManagement', + '\Magento\Quote\Api\CartManagementInterface', [ 'eventManager' => $this->eventManager, 'quoteValidator' => $this->quoteValidator, @@ -663,9 +663,9 @@ class QuoteManagementTest extends \PHPUnit_Framework_TestCase ->method('setCustomerGroupId') ->with(\Magento\Customer\Api\Data\GroupInterface::NOT_LOGGED_IN_ID); - /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Quote\Model\QuoteManagement $service */ + /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Quote\Api\CartManagementInterface $service */ $service = $this->getMock( - '\Magento\Quote\Model\QuoteManagement', + '\Magento\Quote\Api\CartManagementInterface', ['submit'], [ 'eventManager' => $this->eventManager, @@ -719,9 +719,9 @@ class QuoteManagementTest extends \PHPUnit_Framework_TestCase $orderIncrementId = 100003332; $orderStatus = 'status1'; - /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Quote\Model\QuoteManagement $service */ + /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Quote\Api\CartManagementInterface $service */ $service = $this->getMock( - '\Magento\Quote\Model\QuoteManagement', + '\Magento\Quote\Api\CartManagementInterface', ['submit'], [ 'eventManager' => $this->eventManager, diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php index e89b88062e0..8ff52f86f15 100644 --- a/app/code/Magento/Sales/Model/AdminOrder/Create.php +++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php @@ -205,7 +205,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\ protected $quoteRepository; /** - * @var \Magento\Quote\Model\QuoteManagement + * @var \Magento\Quote\Api\CartManagementInterface */ protected $quoteManagement; @@ -243,7 +243,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\ * @param \Magento\Customer\Api\AccountManagementInterface $accountManagement * @param \Magento\Customer\Api\Data\CustomerInterfaceFactory $customerFactory * @param \Magento\Customer\Model\Customer\Mapper $customerMapper - * @param \Magento\Quote\Model\QuoteManagement $quoteManagement + * @param \Magento\Quote\Api\CartManagementInterface $quoteManagement * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper * @param \Magento\Sales\Api\OrderManagementInterface $orderManagement * @param array $data @@ -273,7 +273,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\ \Magento\Customer\Api\AccountManagementInterface $accountManagement, \Magento\Customer\Api\Data\CustomerInterfaceFactory $customerFactory, \Magento\Customer\Model\Customer\Mapper $customerMapper, - \Magento\Quote\Model\QuoteManagement $quoteManagement, + \Magento\Quote\Api\CartManagementInterface $quoteManagement, \Magento\Framework\Api\DataObjectHelper $dataObjectHelper, \Magento\Sales\Api\OrderManagementInterface $orderManagement, array $data = [] diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/quote_with_product_and_custom_options.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/quote_with_product_and_custom_options.php index 1f78762dab6..490bde24775 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/_files/quote_with_product_and_custom_options.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/quote_with_product_and_custom_options.php @@ -29,8 +29,8 @@ $product = $productRepository->get('simple'); /** @var \Magento\Quote\Model\Quote $quote */ $quote = $objectManager->create('Magento\Quote\Model\Quote'); -/** @var \Magento\Quote\Model\Quote\Item\Repository $quoteItemRepository */ -$quoteItemRepository = $objectManager->create('Magento\Quote\Model\Quote\Item\Repository'); +/** @var \Magento\Quote\Api\CartItemRepositoryInterface $quoteItemRepository */ +$quoteItemRepository = $objectManager->create('\Magento\Quote\Api\CartItemRepositoryInterface'); /** @var \Magento\Quote\Api\Data\CartItemInterface $cartItem */ $cartItem = $objectManager->create('Magento\Quote\Api\Data\CartItemInterface'); /** @var \Magento\Quote\Model\Quote\ProductOption $productOption */ diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payment_express.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payment_express.php index f6231c2b8ee..be4608b73fd 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payment_express.php +++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payment_express.php @@ -92,7 +92,7 @@ $quote->collectTotals()->save(); $quote->setCustomerEmail('admin@example.com'); -/** @var $service \Magento\Quote\Model\QuoteManagement */ +/** @var $service \Magento\Quote\Api\CartManagementInterface */ $service = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() - ->create('Magento\Quote\Model\QuoteManagement'); + ->create('\Magento\Quote\Api\CartManagementInterface'); $order = $service->submit($quote, ['increment_id' => '100000002']); diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payment_express_with_customer.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payment_express_with_customer.php index 85bb114f679..50e73b980ef 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payment_express_with_customer.php +++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payment_express_with_customer.php @@ -80,7 +80,7 @@ $quote->getShippingAddress()->setCollectShippingRates(true); $quote->getPayment()->setMethod(\Magento\Paypal\Model\Config::METHOD_WPS_EXPRESS); $quote->collectTotals()->save(); -/** @var $service \Magento\Quote\Model\QuoteManagement */ +/** @var $service \Magento\Quote\Api\CartManagementInterface */ $service = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() - ->create('Magento\Quote\Model\QuoteManagement'); + ->create('\Magento\Quote\Api\CartManagementInterface'); $order = $service->submit($quote, ['increment_id' => '100000002']); diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payment_payflow.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payment_payflow.php index cf20591b918..7a3928f8f41 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payment_payflow.php +++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payment_payflow.php @@ -104,7 +104,7 @@ $payment->setMethod(\Magento\Paypal\Model\Config::METHOD_WPS_EXPRESS); $quote->getPayment()->setMethod(\Magento\Paypal\Model\Config::METHOD_WPS_EXPRESS)->save(); -/** @var $service \Magento\Quote\Model\QuoteManagement */ +/** @var $service \Magento\Quote\Api\CartManagementInterface */ $service = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() - ->create('Magento\Quote\Model\QuoteManagement'); + ->create('\Magento\Quote\Api\CartManagementInterface'); $order = $service->submit($quote, ['increment_id' => '100000001']); diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/RepositoryTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/RepositoryTest.php index b7e78e97719..d604ba2d966 100644 --- a/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/RepositoryTest.php +++ b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/RepositoryTest.php @@ -20,8 +20,8 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase 'email' => 'admin@example.com' ]; - /** @var \Magento\Quote\Model\Quote\Item\Repository $quoteItemRepository */ - $quoteItemRepository = Bootstrap::getObjectManager()->create('Magento\Quote\Model\Quote\Item\Repository'); + /** @var \Magento\Quote\Api\CartItemRepositoryInterface $quoteItemRepository */ + $quoteItemRepository = Bootstrap::getObjectManager()->create('\Magento\Quote\Api\CartItemRepositoryInterface'); /** @var \Magento\Quote\Model\Quote $quote */ $quote = Bootstrap::getObjectManager()->create('Magento\Quote\Model\Quote'); $quoteId = $quote->load('test01', 'reserved_order_id')->getId(); diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php index 68635c4369b..1b67d126ac6 100644 --- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php +++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php @@ -27,8 +27,8 @@ class QuoteManagementTest extends \PHPUnit_Framework_TestCase $quote->load('test01', 'reserved_order_id'); /** Execute SUT */ - /** @var \Magento\Quote\Model\QuoteManagement $model */ - $model = $objectManager->create('\Magento\Quote\Model\QuoteManagement'); + /** @var \Magento\Quote\Api\CartManagementInterface $model */ + $model = $objectManager->create('\Magento\Quote\Api\CartManagementInterface'); $order = $model->submit($quote); /** Check if SUT caused expected effects */ diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php index 38cae047439..ac4cacb4e18 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php +++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php @@ -64,7 +64,7 @@ $quote->collectTotals(); $quote->save(); $quote->setCustomerEmail('admin@example.com'); -$quoteManagement = $objectManager->create('Magento\Quote\Model\QuoteManagement'); +$quoteManagement = $objectManager->create('\Magento\Quote\Api\CartManagementInterface'); $order = $quoteManagement->submit($quote, ['increment_id' => '100000001']); -- GitLab