diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php
index 9b7f329ab3dc340c906d1062880dffd70d3d6405..e318ddb44c98007dc19a07b25b2f15462bc7ade7 100644
--- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php
+++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php
@@ -130,8 +130,8 @@ abstract class Payment extends \Magento\Framework\App\Action\Action
$order = $this->_objectManager->create('Magento\Sales\Model\Order')->loadByIncrementId($incrementId);
if ($order->getId()) {
try {
- /** @var \Magento\Quote\Model\QuoteRepository $quoteRepository */
- $quoteRepository = $this->_objectManager->create('Magento\Quote\Model\QuoteRepository');
+ /** @var \Magento\Quote\Api\CartRepositoryInterface $quoteRepository */
+ $quoteRepository = $this->_objectManager->create('Magento\Quote\Api\CartRepositoryInterface');
/** @var \Magento\Quote\Model\Quote $quote */
$quote = $quoteRepository->get($order->getQuoteId());
diff --git a/app/code/Magento/Authorizenet/Model/Directpost.php b/app/code/Magento/Authorizenet/Model/Directpost.php
index 68fd630f21f4593740fed6288e3821b87677d7db..3caaa53b59785a6f81bc69f4b6239067301d174d 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost.php
@@ -93,7 +93,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
protected $storeManager;
/**
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -136,7 +136,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
* @param \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
* @param \Magento\Sales\Model\OrderFactory $orderFactory
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param OrderSender $orderSender
* @param \Magento\Sales\Api\TransactionRepositoryInterface $transactionRepository
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
@@ -161,7 +161,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
ZendClientFactory $httpClientFactory,
\Magento\Sales\Model\OrderFactory $orderFactory,
\Magento\Store\Model\StoreManagerInterface $storeManager,
- \Magento\Quote\Model\QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
\Magento\Sales\Model\Order\Email\Sender\OrderSender $orderSender,
\Magento\Sales\Api\TransactionRepositoryInterface $transactionRepository,
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
diff --git a/app/code/Magento/Backend/Model/Session/Quote.php b/app/code/Magento/Backend/Model/Session/Quote.php
index 1427e1ad5ad570d5ea93c0f5cef3c5cdfd71c4cb..213587d2a12a7024d311f65a77e1209980412858 100644
--- a/app/code/Magento/Backend/Model/Session/Quote.php
+++ b/app/code/Magento/Backend/Model/Session/Quote.php
@@ -60,7 +60,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
/**
* Sales quote repository
*
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -85,7 +85,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
* @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
* @param \Magento\Framework\App\State $appState
* @param CustomerRepositoryInterface $customerRepository
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param \Magento\Sales\Model\OrderFactory $orderFactory
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param GroupManagementInterface $groupManagement
@@ -103,7 +103,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
\Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
\Magento\Framework\App\State $appState,
CustomerRepositoryInterface $customerRepository,
- \Magento\Quote\Model\QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
\Magento\Sales\Model\OrderFactory $orderFactory,
\Magento\Store\Model\StoreManagerInterface $storeManager,
GroupManagementInterface $groupManagement
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php b/app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php
index 1c89077b1b161051562190ccd56c3ad66c0e19a6..a643fc59f1156993d0cfbe1cbab58e389749fd28 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php
@@ -122,13 +122,7 @@ class QuoteTest extends \PHPUnit_Framework_TestCase
true,
['getValue']
);
- $this->quoteRepositoryMock = $this->getMock(
- 'Magento\Quote\Model\QuoteRepository',
- ['create', 'save', 'get'],
- [],
- '',
- false
- );
+ $this->quoteRepositoryMock = $this->getMock('Magento\Quote\Api\CartRepositoryInterface');
$this->requestMock = $this->getMock(
'Magento\Framework\App\Request\Http',
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/CheckoutTest.php b/app/code/Magento/Braintree/Test/Unit/Model/CheckoutTest.php
index 560d8a14af0838c3381908b30aace672245ff5f8..f08572f2d27b6f4984b621614350881db00716c9 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/CheckoutTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/CheckoutTest.php
@@ -57,7 +57,7 @@ class CheckoutTest extends \PHPUnit_Framework_TestCase
protected $shippingAddressMock;
/**
- * @var \Magento\Quote\Model\QuoteRepository|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Quote\Api\CartRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $quoteRepositoryMock;
@@ -73,10 +73,7 @@ class CheckoutTest extends \PHPUnit_Framework_TestCase
$this->quoteMock->expects($this->any())
->method('getShippingAddress')
->willReturn($this->shippingAddressMock);
- $this->quoteRepositoryMock = $this->getMockBuilder('\Magento\Quote\Model\QuoteRepository')
- ->disableOriginalConstructor()
- ->getMock();
-
+ $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$configMock = $this->getMockBuilder('\Magento\Paypal\Model\Config')
->disableOriginalConstructor()
->getMock();
diff --git a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
index 2496709c162c8736a78e7b1b8581d18200bf9adf..03d69b65cbc5567d91dfb72d41b17671b4819874 100644
--- a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
@@ -10,7 +10,7 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
/**
* Sales quote repository
*
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -29,7 +29,7 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
* @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
* @param \Magento\Checkout\Model\Cart $cart
* @param \Magento\SalesRule\Model\CouponFactory $couponFactory
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @codeCoverageIgnore
*/
public function __construct(
@@ -40,7 +40,7 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
\Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
\Magento\Checkout\Model\Cart $cart,
\Magento\SalesRule\Model\CouponFactory $couponFactory,
- \Magento\Quote\Model\QuoteRepository $quoteRepository
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
) {
parent::__construct(
$context,
diff --git a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
index 2ce3a8805e8dba0a580e9e5b1f00f3da7cbf8f25..94305748973bf456f30d496ae0f8cc8a1ca022f2 100644
--- a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
@@ -11,7 +11,7 @@ use Magento\Checkout\Model\Cart as CustomerCart;
class EstimatePost extends \Magento\Checkout\Controller\Cart
{
/**
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -22,7 +22,7 @@ class EstimatePost extends \Magento\Checkout\Controller\Cart
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
* @param CustomerCart $cart
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @codeCoverageIgnore
*/
public function __construct(
@@ -32,7 +32,7 @@ class EstimatePost extends \Magento\Checkout\Controller\Cart
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
CustomerCart $cart,
- \Magento\Quote\Model\QuoteRepository $quoteRepository
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
) {
$this->quoteRepository = $quoteRepository;
parent::__construct(
diff --git a/app/code/Magento/Checkout/Controller/Onepage.php b/app/code/Magento/Checkout/Controller/Onepage.php
index 38e141855f3f191f4f60a2394bec4abe7db2b6f0..bd76126e9fefb4dd47bd854e5c22789fbb623c86 100644
--- a/app/code/Magento/Checkout/Controller/Onepage.php
+++ b/app/code/Magento/Checkout/Controller/Onepage.php
@@ -57,7 +57,7 @@ abstract class Onepage extends Action
protected $layoutFactory;
/**
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -91,7 +91,7 @@ abstract class Onepage extends Action
* @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\View\LayoutFactory $layoutFactory
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
* @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
* @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
@@ -110,7 +110,7 @@ abstract class Onepage extends Action
\Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\View\LayoutFactory $layoutFactory,
- \Magento\Quote\Model\QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
\Magento\Framework\View\Result\PageFactory $resultPageFactory,
\Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory,
\Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php
index 9cc015b2271cdf002eaec6dfa959789f18061193..6643b52db8725d9f45d765c507f337cc82fd6158 100644
--- a/app/code/Magento/Checkout/Model/Cart.php
+++ b/app/code/Magento/Checkout/Model/Cart.php
@@ -81,7 +81,7 @@ class Cart extends DataObject implements CartInterface
protected $stockState;
/**
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -100,7 +100,7 @@ class Cart extends DataObject implements CartInterface
* @param \Magento\Framework\Message\ManagerInterface $messageManager
* @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
* @param \Magento\CatalogInventory\Api\StockStateInterface $stockState
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param ProductRepositoryInterface $productRepository
* @param array $data
* @codeCoverageIgnore
@@ -116,7 +116,7 @@ class Cart extends DataObject implements CartInterface
\Magento\Framework\Message\ManagerInterface $messageManager,
\Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
\Magento\CatalogInventory\Api\StockStateInterface $stockState,
- \Magento\Quote\Model\QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
ProductRepositoryInterface $productRepository,
array $data = []
) {
diff --git a/app/code/Magento/Checkout/Model/Cart/CollectQuote.php b/app/code/Magento/Checkout/Model/Cart/CollectQuote.php
index 5b3f7841635c70040d6ea37b31a574d36e3488a5..18fbe76167f88631cea7a18c7eaa1631f8c91fc3 100644
--- a/app/code/Magento/Checkout/Model/Cart/CollectQuote.php
+++ b/app/code/Magento/Checkout/Model/Cart/CollectQuote.php
@@ -33,7 +33,7 @@ class CollectQuote
protected $shippingMethodManager;
/**
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -43,7 +43,7 @@ class CollectQuote
* @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
* @param \Magento\Quote\Api\Data\EstimateAddressInterfaceFactory $estimatedAddressFactory
* @param \Magento\Quote\Api\ShippingMethodManagementInterface $shippingMethodManager
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @codeCoverageIgnore
*/
public function __construct(
@@ -52,7 +52,7 @@ class CollectQuote
\Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
\Magento\Quote\Api\Data\EstimateAddressInterfaceFactory $estimatedAddressFactory,
\Magento\Quote\Api\ShippingMethodManagementInterface $shippingMethodManager,
- \Magento\Quote\Model\QuoteRepository $quoteRepository
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
) {
$this->customerSession = $customerSession;
$this->customerRepository = $customerRepository;
diff --git a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
index d0cc39ceaafe18ee34a6f92645f7ed39e6c1ff7d..e9fc69ba2bde1bb731da42ca443a4eac6bcec346 100644
--- a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
+++ b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
@@ -15,7 +15,7 @@ use Magento\Customer\Model\Url as CustomerUrlManager;
use Magento\Framework\App\Http\Context as HttpContext;
use Magento\Framework\Data\Form\FormKey;
use Magento\Framework\Locale\CurrencyInterface as CurrencyManager;
-use Magento\Quote\Model\QuoteRepository;
+use Magento\Quote\Api\CartRepositoryInterface;
use Magento\Quote\Api\CartItemRepositoryInterface as QuoteItemRepository;
use Magento\Quote\Api\ShippingMethodManagementInterface as ShippingMethodManager;
use Magento\Catalog\Helper\Product\ConfigurationPool;
@@ -68,7 +68,7 @@ class DefaultConfigProvider implements ConfigProviderInterface
private $currencyManager;
/**
- * @var QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
private $quoteRepository;
@@ -175,7 +175,7 @@ class DefaultConfigProvider implements ConfigProviderInterface
* @param CustomerUrlManager $customerUrlManager
* @param HttpContext $httpContext
* @param CurrencyManager $currencyManager
- * @param QuoteRepository $quoteRepository
+ * @param CartRepositoryInterface $quoteRepository
* @param QuoteItemRepository $quoteItemRepository
* @param ShippingMethodManager $shippingMethodManager
* @param ConfigurationPool $configurationPool
@@ -206,7 +206,7 @@ class DefaultConfigProvider implements ConfigProviderInterface
CustomerUrlManager $customerUrlManager,
HttpContext $httpContext,
CurrencyManager $currencyManager,
- QuoteRepository $quoteRepository,
+ CartRepositoryInterface $quoteRepository,
QuoteItemRepository $quoteItemRepository,
ShippingMethodManager $shippingMethodManager,
ConfigurationPool $configurationPool,
diff --git a/app/code/Magento/Checkout/Model/Session.php b/app/code/Magento/Checkout/Model/Session.php
index e988a2f93814eb70d8cccff668281b845d76b30e..010cc1d19f4d6a83c4dddec2857e802d2cb99e59 100644
--- a/app/code/Magento/Checkout/Model/Session.php
+++ b/app/code/Magento/Checkout/Model/Session.php
@@ -58,7 +58,7 @@ class Session extends \Magento\Framework\Session\SessionManager
protected $_customerSession;
/**
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -104,7 +104,7 @@ class Session extends \Magento\Framework\Session\SessionManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Sales\Model\OrderFactory $orderFactory
* @param \Magento\Customer\Model\Session $customerSession
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -126,7 +126,7 @@ class Session extends \Magento\Framework\Session\SessionManager
\Magento\Framework\App\State $appState,
\Magento\Sales\Model\OrderFactory $orderFactory,
\Magento\Customer\Model\Session $customerSession,
- \Magento\Quote\Model\QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
\Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Store\Model\StoreManagerInterface $storeManager,
diff --git a/app/code/Magento/Checkout/Model/ShippingInformationManagement.php b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
index 2858cc787163d0adb6528ad3042fe7df44353916..e8c5fc5589a91f2b404300587e996dade1b449e0 100644
--- a/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
@@ -34,7 +34,7 @@ class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInf
/**
* Quote repository.
*
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -71,7 +71,7 @@ class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInf
* @param \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement
* @param \Magento\Checkout\Model\PaymentDetailsFactory $paymentDetailsFactory
* @param \Magento\Quote\Api\CartTotalRepositoryInterface $cartTotalsRepository
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param \Magento\Quote\Model\QuoteAddressValidator $addressValidator
* @param Logger $logger
* @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
@@ -83,7 +83,7 @@ class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInf
\Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement,
\Magento\Checkout\Model\PaymentDetailsFactory $paymentDetailsFactory,
\Magento\Quote\Api\CartTotalRepositoryInterface $cartTotalsRepository,
- \Magento\Quote\Model\QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
QuoteAddressValidator $addressValidator,
Logger $logger,
\Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
diff --git a/app/code/Magento/Checkout/Model/Type/Onepage.php b/app/code/Magento/Checkout/Model/Type/Onepage.php
index 8d9f2ed620c1ab9c79059480f38ddb6006f5625a..f2fa06638f9b9da35832097742b3028f2c3d45d8 100644
--- a/app/code/Magento/Checkout/Model/Type/Onepage.php
+++ b/app/code/Magento/Checkout/Model/Type/Onepage.php
@@ -141,7 +141,7 @@ class Onepage
protected $orderSender;
/**
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -193,7 +193,7 @@ class Onepage
* @param AccountManagementInterface $accountManagement
* @param OrderSender $orderSender
* @param CustomerRepositoryInterface $customerRepository
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter
* @param \Magento\Quote\Model\QuoteManagement $quoteManagement
* @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
@@ -224,7 +224,7 @@ class Onepage
AccountManagementInterface $accountManagement,
OrderSender $orderSender,
CustomerRepositoryInterface $customerRepository,
- \Magento\Quote\Model\QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
\Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter,
\Magento\Quote\Model\QuoteManagement $quoteManagement,
\Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php
index 99e3ccd1a7c7c44babb263d2d723b7a536f6aa5c..ffc7879cf10f89f7ca9fee4c685bf1d42a2c5203 100644
--- a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php
@@ -142,7 +142,7 @@ class CouponPostTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->setMethods(['create'])
->getMock();
- $this->quoteRepository = $this->getMock('Magento\Quote\Model\QuoteRepository', [], [], '', false);
+ $this->quoteRepository = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
index 756ab3e7861aaec98c14cfa6db6eb5c24ae8529f..a5e0a6ce00ecc8f9effeaca84e0931773d229710 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
@@ -47,8 +47,7 @@ class GuestPaymentInformationManagementTest extends \PHPUnit_Framework_TestCase
'\Magento\Quote\Api\GuestPaymentMethodManagementInterface'
);
$this->cartManagementMock = $this->getMock('\Magento\Quote\Api\GuestCartManagementInterface');
-
- $this->cartRepositoryMock = $this->getMock('\Magento\Quote\Model\QuoteRepository', [], [], '', false);
+ $this->cartRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->quoteIdMaskFactoryMock = $this->getMock(
'Magento\Quote\Model\QuoteIdMaskFactory',
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/SessionTest.php b/app/code/Magento/Checkout/Test/Unit/Model/SessionTest.php
index 377365e9294d21c82a5c3c6840789caeeffcaa87..cb941b305d1498d8035933c5accce47aba624cf1 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/SessionTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/SessionTest.php
@@ -48,9 +48,7 @@ class SessionTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->setMethods(['create'])
->getMock();
- $quoteRepository = $this->getMockBuilder('Magento\Quote\Model\QuoteRepository')
- ->disableOriginalConstructor()
- ->getMock();
+ $quoteRepository = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$appState = $this->getMock('\Magento\Framework\App\State', [], [], '', false);
$appState->expects($this->any())->method('isInstalled')->will($this->returnValue(true));
@@ -160,13 +158,7 @@ class SessionTest extends \PHPUnit_Framework_TestCase
$order->expects($this->once())->method('getId')->will($this->returnValue($hasOrderId ? 'order id' : null));
$orderFactory = $this->getMock('Magento\Sales\Model\OrderFactory', ['create'], [], '', false);
$orderFactory->expects($this->once())->method('create')->will($this->returnValue($order));
- $quoteRepository = $this->getMock(
- 'Magento\Quote\Model\QuoteRepository',
- ['get', 'save'],
- [],
- '',
- false
- );
+ $quoteRepository = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$storage = $this->getMock('Magento\Framework\Session\Storage', null);
$store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
$storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/ShippingInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/ShippingInformationManagementTest.php
index 552acbb01097b9a30b83fabb3da8aa910c9e8226..714fb048ec5ba81570fe9dc4b0ee83930145e336 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/ShippingInformationManagementTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/ShippingInformationManagementTest.php
@@ -80,7 +80,7 @@ class ShippingInformationManagementTest extends \PHPUnit_Framework_TestCase
false
);
$this->cartTotalsRepositoryMock = $this->getMock('\Magento\Quote\Api\CartTotalRepositoryInterface');
- $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Model\QuoteRepository', [], [], '', false);
+ $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->addressValidatorMock = $this->getMock('\Magento\Quote\Model\QuoteAddressValidator', [], [], '', false);
$this->loggerMock = $this->getMock('\Psr\Log\LoggerInterface');
$this->addressRepositoryMock = $this->getMock('\Magento\Customer\Api\AddressRepositoryInterface');
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 15275b9c11905052e18b7e4b776d2532bde7974e..caf337b15e0cbd84b4082e047cb1a55068366214 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/Type/OnepageTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/Type/OnepageTest.php
@@ -87,7 +87,7 @@ class OnepageTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Customer\Api\CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $customerRepositoryMock;
- /** @var \Magento\Quote\Model\QuoteRepository|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Quote\Api\CartRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $quoteRepositoryMock;
/**
@@ -181,13 +181,7 @@ class OnepageTest extends \PHPUnit_Framework_TestCase
false
);
- $this->quoteRepositoryMock = $this->getMock(
- 'Magento\Quote\Model\QuoteRepository',
- [],
- [],
- '',
- false
- );
+ $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->extensibleDataObjectConverterMock = $this->getMockBuilder(
'Magento\Framework\Api\ExtensibleDataObjectConverter'
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php
index 9f99ffd9339462f5692d169df9e2aeea0601f837..932cd1d6ee89b6bef2b0de8751416b1b01e82d95 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php
@@ -27,7 +27,7 @@ class Cart extends \Magento\Backend\Block\Widget\Grid\Extended
protected $_dataCollectionFactory;
/**
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -44,7 +44,7 @@ class Cart extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Backend\Helper\Data $backendHelper
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param \Magento\Framework\Data\CollectionFactory $dataCollectionFactory
* @param \Magento\Framework\Registry $coreRegistry
* @param array $data
@@ -52,7 +52,7 @@ class Cart extends \Magento\Backend\Block\Widget\Grid\Extended
public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Backend\Helper\Data $backendHelper,
- \Magento\Quote\Model\QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
\Magento\Framework\Data\CollectionFactory $dataCollectionFactory,
\Magento\Framework\Registry $coreRegistry,
array $data = []
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php
index b2adb0316d2ab6241e6d08f535627ed0c9d9aa00..95b5cd0926843305c4c46229c6067c741be252ac 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php
@@ -28,7 +28,7 @@ class Cart extends \Magento\Backend\Block\Widget\Grid\Extended
protected $_dataCollectionFactory;
/**
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -42,7 +42,7 @@ class Cart extends \Magento\Backend\Block\Widget\Grid\Extended
*
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Backend\Helper\Data $backendHelper
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param \Magento\Framework\Data\CollectionFactory $dataCollectionFactory
* @param \Magento\Framework\Registry $coreRegistry
* @param array $data
@@ -50,7 +50,7 @@ class Cart extends \Magento\Backend\Block\Widget\Grid\Extended
public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Backend\Helper\Data $backendHelper,
- \Magento\Quote\Model\QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
\Magento\Framework\Data\CollectionFactory $dataCollectionFactory,
\Magento\Framework\Registry $coreRegistry,
array $data = []
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php
index 449dd9c00d4befa2ab966e3fb11416dd3af7eaf1..903e691be6ad272b5ad1c09f32bfd75e057c6c79 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php
@@ -37,17 +37,17 @@ abstract class Cart extends \Magento\Backend\App\Action
protected $_quoteItem = null;
/**
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
/**
* @param Action\Context $context
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
*/
public function __construct(
Action\Context $context,
- \Magento\Quote\Model\QuoteRepository $quoteRepository
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
) {
$this->quoteRepository = $quoteRepository;
parent::__construct($context);
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
index e1c4dd68c9cdedc61beaf09a035d0ba84ad83084..d6c36217182d83b853cd5f27c70b7d262b963927 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
@@ -22,8 +22,8 @@ class Cart extends \Magento\Customer\Controller\Adminhtml\Index
// delete an item from cart
$deleteItemId = $this->getRequest()->getPost('delete');
if ($deleteItemId) {
- /** @var \Magento\Quote\Model\QuoteRepository $quoteRepository */
- $quoteRepository = $this->_objectManager->create('Magento\Quote\Model\QuoteRepository');
+ /** @var \Magento\Quote\Api\CartRepositoryInterface $quoteRepository */
+ $quoteRepository = $this->_objectManager->create('Magento\Quote\Api\CartRepositoryInterface');
/** @var \Magento\Quote\Model\Quote $quote */
try {
$quote = $quoteRepository->getForCustomer($customerId);
diff --git a/app/code/Magento/GiftMessage/Model/CartRepository.php b/app/code/Magento/GiftMessage/Model/CartRepository.php
index cc2ae7caae30c418d96662d0215f15e316e61f1a..760c47eef5cf57baf75a871c076cace1b43d57f5 100644
--- a/app/code/Magento/GiftMessage/Model/CartRepository.php
+++ b/app/code/Magento/GiftMessage/Model/CartRepository.php
@@ -19,7 +19,7 @@ class CartRepository implements \Magento\GiftMessage\Api\CartRepositoryInterface
/**
* Quote repository.
*
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -52,14 +52,14 @@ class CartRepository implements \Magento\GiftMessage\Api\CartRepositoryInterface
protected $messageFactory;
/**
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param GiftMessageManager $giftMessageManager
* @param \Magento\GiftMessage\Helper\Message $helper
* @param MessageFactory $messageFactory
*/
public function __construct(
- \Magento\Quote\Model\QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\GiftMessage\Model\GiftMessageManager $giftMessageManager,
\Magento\GiftMessage\Helper\Message $helper,
diff --git a/app/code/Magento/GiftMessage/Model/ItemRepository.php b/app/code/Magento/GiftMessage/Model/ItemRepository.php
index 5c667b3052bd96c4bc032f924a1260fd14cf0714..d7ebf051a1c8fcc18753c79e7193fd1bf90310ce 100644
--- a/app/code/Magento/GiftMessage/Model/ItemRepository.php
+++ b/app/code/Magento/GiftMessage/Model/ItemRepository.php
@@ -20,7 +20,7 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
/**
* Quote repository.
*
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -53,14 +53,14 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
protected $messageFactory;
/**
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param GiftMessageManager $giftMessageManager
* @param \Magento\GiftMessage\Helper\Message $helper
* @param MessageFactory $messageFactory
*/
public function __construct(
- \Magento\Quote\Model\QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\GiftMessage\Model\GiftMessageManager $giftMessageManager,
\Magento\GiftMessage\Helper\Message $helper,
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/CartRepositoryTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/CartRepositoryTest.php
index 3ad550304fb43c9e5348506a856c33a5ed286bdb..598861b2f4a0b89ec84a0810b493fe753518399c 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Model/CartRepositoryTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/CartRepositoryTest.php
@@ -69,7 +69,7 @@ class CartRepositoryTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->quoteRepositoryMock = $this->getMock('Magento\Quote\Model\QuoteRepository', [], [], '', false);
+ $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->messageFactoryMock = $this->getMock(
'Magento\GiftMessage\Model\MessageFactory',
[
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/GuestItemRepositoryTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/GuestItemRepositoryTest.php
index b20bf7bc9c43a1656e60ce27207fc464aadb2a12..51e4e7795fdb5e236e741935e9e1b7cd5bbf9162 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Model/GuestItemRepositoryTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/GuestItemRepositoryTest.php
@@ -69,7 +69,7 @@ class GuestItemRepositoryTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->quoteRepositoryMock = $this->getMock('Magento\Quote\Model\QuoteRepository', [], [], '', false);
+ $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->messageFactoryMock = $this->getMock(
'Magento\GiftMessage\Model\MessageFactory',
[
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/ItemRepositoryTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/ItemRepositoryTest.php
index 999783fb546b92a641732ce9e1e02c1e69cdb06c..3c1204fd1bc835252271677d3cfb3606e5e694f6 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Model/ItemRepositoryTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/ItemRepositoryTest.php
@@ -69,7 +69,7 @@ class ItemRepositoryTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->quoteRepositoryMock = $this->getMock('Magento\Quote\Model\QuoteRepository', [], [], '', false);
+ $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->messageFactoryMock = $this->getMock(
'Magento\GiftMessage\Model\MessageFactory',
[
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
index b56d7b532df76e618588ade7e7fe563cdca47087..f1673e267db14f29ceacdeb5e9e0dedacfb56321 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -100,7 +100,7 @@ class Multishipping extends \Magento\Framework\DataObject
protected $priceCurrency;
/**
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -157,7 +157,7 @@ class Multishipping extends \Magento\Framework\DataObject
* @param \Magento\Multishipping\Helper\Data $helper
* @param OrderSender $orderSender
* @param PriceCurrencyInterface $priceCurrency
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
* @param \Magento\Framework\Api\FilterBuilder $filterBuilder
* @param \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector
@@ -182,7 +182,7 @@ class Multishipping extends \Magento\Framework\DataObject
\Magento\Multishipping\Helper\Data $helper,
OrderSender $orderSender,
PriceCurrencyInterface $priceCurrency,
- \Magento\Quote\Model\QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
\Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder,
\Magento\Framework\Api\FilterBuilder $filterBuilder,
\Magento\Quote\Model\Quote\TotalsCollector $totalsCollector,
diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php
index cb72f0b778a04bc35e2b1c3a754dd5029aa152eb..2bd6694ae9e4ce7925dfbe49c9d1b24cc0f98efb 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php
@@ -75,7 +75,7 @@ class MultishippingTest extends \PHPUnit_Framework_TestCase
$this->helperMock = $this->getMock('\Magento\Multishipping\Helper\Data', [], [], '', false);
$orderSenderMock = $this->getMock('\Magento\Sales\Model\Order\Email\Sender\OrderSender', [], [], '', false);
$priceMock = $this->getMock('\Magento\Framework\Pricing\PriceCurrencyInterface', [], [], '', false);
- $quoteRepositoryMock = $this->getMock('\Magento\Quote\Model\QuoteRepository', [], [], '', false);
+ $quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->filterBuilderMock = $this->getMock('\Magento\Framework\Api\FilterBuilder', [], [], '', false);
$this->searchCriteriaBuilderMock = $this->getMock(
'\Magento\Framework\Api\SearchCriteriaBuilder',
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php
index a66433f346aa8447ab17e1feda209b64bbc8af75..8c078479f4794ab1c5a704e51f5eb91bfbaccd2a 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php
@@ -9,7 +9,7 @@ namespace Magento\Paypal\Controller\Express\AbstractExpress;
class ShippingOptionsCallback extends \Magento\Paypal\Controller\Express\AbstractExpress
{
/**
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -22,7 +22,7 @@ class ShippingOptionsCallback extends \Magento\Paypal\Controller\Express\Abstrac
* @param \Magento\Framework\Session\Generic $paypalSession
* @param \Magento\Framework\Url\Helper\Data $urlHelper
* @param \Magento\Customer\Model\Url $customerUrl
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
*/
public function __construct(
\Magento\Framework\App\Action\Context $context,
@@ -33,7 +33,7 @@ class ShippingOptionsCallback extends \Magento\Paypal\Controller\Express\Abstrac
\Magento\Framework\Session\Generic $paypalSession,
\Magento\Framework\Url\Helper\Data $urlHelper,
\Magento\Customer\Model\Url $customerUrl,
- \Magento\Quote\Model\QuoteRepository $quoteRepository
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
) {
$this->quoteRepository = $quoteRepository;
parent::__construct(
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index d3b0cf72fc76bf9047b4a82e4cdc663380834123..e0802232bc0237970e7bf8e6c7bcc78954cc82d2 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -260,7 +260,7 @@ class Checkout
protected $paypalQuote;
/**
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -298,7 +298,7 @@ class Checkout
* @param AccountManagement $accountManagement
* @param PaypalQuote $paypalQuote
* @param OrderSender $orderSender
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector
* @param array $params
* @throws \Exception
@@ -328,7 +328,7 @@ class Checkout
AccountManagement $accountManagement,
PaypalQuote $paypalQuote,
OrderSender $orderSender,
- \Magento\Quote\Model\QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
\Magento\Quote\Model\Quote\TotalsCollector $totalsCollector,
$params = []
) {
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php
index 03525721e42fd772cc4dbb6c964d3fb2f5dcf57c..899a4f4c0ac89e85f6a812eb0b396de1fe242046 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php
@@ -11,7 +11,7 @@ use Magento\Payment\Model\Method\Logger;
use Magento\Paypal\Model\Payflow\Service\Response\Handler\HandlerInterface;
use Magento\Framework\Session\Generic;
use Magento\Payment\Model\InfoInterface;
-use Magento\Quote\Model\QuoteRepository;
+use Magento\Quote\Api\CartRepositoryInterface;
use Magento\Paypal\Model\Payflow\Transparent;
use Magento\Quote\Api\PaymentMethodManagementInterface;
@@ -26,7 +26,7 @@ class Transaction
protected $sessionTransparent;
/**
- * @var QuoteRepository
+ * @var CartRepositoryInterface
*/
protected $quoteRepository;
@@ -54,7 +54,7 @@ class Transaction
* Constructor
*
* @param Generic $sessionTransparent
- * @param QuoteRepository $quoteRepository
+ * @param CartRepositoryInterface $quoteRepository
* @param Transparent $transparent
* @param PaymentMethodManagementInterface $paymentManagement
* @param HandlerInterface $errorHandler
@@ -62,7 +62,7 @@ class Transaction
*/
public function __construct(
Generic $sessionTransparent,
- QuoteRepository $quoteRepository,
+ CartRepositoryInterface $quoteRepository,
Transparent $transparent,
PaymentMethodManagementInterface $paymentManagement,
HandlerInterface $errorHandler,
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/AbstractFilterValidator.php b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/AbstractFilterValidator.php
index 1a0b550b7f0d41f143c738c0cf5009f836b7de9c..13fc20ac06cf6185ceb4d9abe91d330e1f41a5ac 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/AbstractFilterValidator.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/AbstractFilterValidator.php
@@ -6,7 +6,7 @@
namespace Magento\Paypal\Model\Payflow\Service\Response\Validator;
use Magento\Framework\Session\Generic;
-use Magento\Quote\Model\QuoteRepository;
+use Magento\Quote\Api\CartRepositoryInterface;
use Magento\Payment\Model\Method\ConfigInterface;
use Magento\Quote\Api\PaymentMethodManagementInterface;
@@ -16,7 +16,7 @@ use Magento\Quote\Api\PaymentMethodManagementInterface;
abstract class AbstractFilterValidator
{
/**
- * @var QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -34,11 +34,11 @@ abstract class AbstractFilterValidator
* Constructor
*
* @param Generic $sessionTransparent
- * @param QuoteRepository $quoteRepository
+ * @param CartRepositoryInterface $quoteRepository
* @param PaymentMethodManagementInterface $paymentManagement
*/
public function __construct(
- QuoteRepository $quoteRepository,
+ CartRepositoryInterface $quoteRepository,
Generic $sessionTransparent,
PaymentMethodManagementInterface $paymentManagement
) {
diff --git a/app/code/Magento/Paypal/Model/Payflowlink.php b/app/code/Magento/Paypal/Model/Payflowlink.php
index 91513032674c6250ab1a55306609cb533e432932..b8b64e481932c9a6db3d0cc08429d42d90f5f8e2 100644
--- a/app/code/Magento/Paypal/Model/Payflowlink.php
+++ b/app/code/Magento/Paypal/Model/Payflowlink.php
@@ -92,7 +92,7 @@ class Payflowlink extends \Magento\Paypal\Model\Payflowpro
protected $_requestFactory;
/**
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -127,7 +127,7 @@ class Payflowlink extends \Magento\Paypal\Model\Payflowpro
* @param HandlerInterface $errorHandler
* @param \Magento\Framework\Math\Random $mathRandom
* @param Payflow\RequestFactory $requestFactory
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param \Magento\Sales\Model\OrderFactory $orderFactory
* @param \Magento\Framework\App\RequestInterface $requestHttp
* @param \Magento\Store\Model\WebsiteFactory $websiteFactory
@@ -153,7 +153,7 @@ class Payflowlink extends \Magento\Paypal\Model\Payflowpro
HandlerInterface $errorHandler,
\Magento\Framework\Math\Random $mathRandom,
\Magento\Paypal\Model\Payflow\RequestFactory $requestFactory,
- \Magento\Quote\Model\QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
\Magento\Sales\Model\OrderFactory $orderFactory,
\Magento\Framework\App\RequestInterface $requestHttp,
\Magento\Store\Model\WebsiteFactory $websiteFactory,
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php
index b81b9acce9e089c67e54e8f6117d72fb67fc3ce0..14d2412226922c8e34c7de8f977a009b07162cf2 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php
@@ -26,7 +26,7 @@ class TransactionTest extends \PHPUnit_Framework_TestCase
protected $sessionTransparent;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Quote\Model\QuoteRepository
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -53,7 +53,7 @@ class TransactionTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->sessionTransparent = $this->getMock('Magento\Framework\Session\Generic', ['getQuoteId'], [], '', false);
- $this->quoteRepository = $this->getMock('Magento\Quote\Model\QuoteRepository', [], [], '', false);
+ $this->quoteRepository = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->transparent = $this->getMock('Magento\Paypal\Model\Payflow\Transparent', [], [], '', false);
$this->paymentMethodManagementInterface = $this->getMock(
'Magento\Quote\Api\PaymentMethodManagementInterface',
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Validator/AVSResponseTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Validator/AVSResponseTest.php
index 745ae62f8be19899d18bbff6c681d4a9d2fc91be..830f8022ac459df02177b72358e0fc272c7b51ad 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Validator/AVSResponseTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Validator/AVSResponseTest.php
@@ -31,9 +31,7 @@ class AVSResponseTest extends \PHPUnit_Framework_TestCase
*/
protected function setUp()
{
- $quoteRepositoryMock = $this->getMockBuilder('Magento\Quote\Model\QuoteRepository')
- ->disableOriginalConstructor()
- ->getMock();
+ $quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$sessionTransparentMock = $this->getMockBuilder('Magento\Framework\Session\Generic')
->setMethods(['getQuoteId'])
->disableOriginalConstructor()
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Validator/CVV2MatchTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Validator/CVV2MatchTest.php
index 4202cd7080ec5f46ac89212ca5f721b90375802f..7f45469cfd0fe5d8dcea22d359e85e72c95d169b 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Validator/CVV2MatchTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Validator/CVV2MatchTest.php
@@ -31,9 +31,7 @@ class CVV2MatchTest extends \PHPUnit_Framework_TestCase
*/
protected function setUp()
{
- $quoteRepositoryMock = $this->getMockBuilder('Magento\Quote\Model\QuoteRepository')
- ->disableOriginalConstructor()
- ->getMock();
+ $quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$sessionTransparentMock = $this->getMockBuilder('Magento\Framework\Session\Generic')
->setMethods(['getQuoteId'])
->disableOriginalConstructor()
diff --git a/app/code/Magento/Persistent/Model/QuoteManager.php b/app/code/Magento/Persistent/Model/QuoteManager.php
index a594a0d734120755a11f007834c51d48b5981cfe..bbf5667ea6423c994296b2e21c6957f699c32e4d 100644
--- a/app/code/Magento/Persistent/Model/QuoteManager.php
+++ b/app/code/Magento/Persistent/Model/QuoteManager.php
@@ -39,7 +39,7 @@ class QuoteManager
protected $_setQuotePersistent = true;
/**
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -47,13 +47,13 @@ class QuoteManager
* @param \Magento\Persistent\Helper\Session $persistentSession
* @param \Magento\Persistent\Helper\Data $persistentData
* @param \Magento\Checkout\Model\Session $checkoutSession
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
*/
public function __construct(
\Magento\Persistent\Helper\Session $persistentSession,
\Magento\Persistent\Helper\Data $persistentData,
\Magento\Checkout\Model\Session $checkoutSession,
- \Magento\Quote\Model\QuoteRepository $quoteRepository
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
) {
$this->persistentSession = $persistentSession;
$this->persistentData = $persistentData;
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
index b34259efc21ad9ece92cff34206e3826df18adf9..51c44b5bbfae72706409bb3ca8d1a8076bdf48e1 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
@@ -76,9 +76,7 @@ class QuoteManagerTest extends \PHPUnit_Framework_TestCase
$this->abstractCollectionMock =
$this->getMock('Magento\Eav\Model\Entity\Collection\AbstractCollection', [], [], '', false);
- $this->quoteRepositoryMock =
- $this->getMock('Magento\Quote\Model\QuoteRepository', [], [], '', false);
-
+ $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->quoteMock = $this->getMock('Magento\Quote\Model\Quote',
[
'getId',
diff --git a/app/code/Magento/Quote/Api/CartRepositoryInterface.php b/app/code/Magento/Quote/Api/CartRepositoryInterface.php
index ff00459a79136454d6eb91bec905506a264ebd80..7fcaa869b5ec1d282e068e21225fd7201fbb1eca 100644
--- a/app/code/Magento/Quote/Api/CartRepositoryInterface.php
+++ b/app/code/Magento/Quote/Api/CartRepositoryInterface.php
@@ -27,4 +27,50 @@ interface CartRepositoryInterface
* @return \Magento\Quote\Api\Data\CartSearchResultsInterface
*/
public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria);
+
+ /**
+ * Get quote by customer Id
+ *
+ * @param int $customerId
+ * @param int[] $sharedStoreIds
+ * @return \Magento\Quote\Api\Data\CartInterface
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ */
+ public function getForCustomer($customerId, array $sharedStoreIds = []);
+
+ /**
+ * Get active quote by id
+ *
+ * @param int $cartId
+ * @param int[] $sharedStoreIds
+ * @return \Magento\Quote\Api\Data\CartInterface
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ */
+ public function getActive($cartId, array $sharedStoreIds = []);
+
+ /**
+ * Get active quote by customer Id
+ *
+ * @param int $customerId
+ * @param int[] $sharedStoreIds
+ * @return \Magento\Quote\Api\Data\CartInterface
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ */
+ public function getActiveForCustomer($customerId, array $sharedStoreIds = []);
+
+ /**
+ * Save quote
+ *
+ * @param \Magento\Quote\Api\Data\CartInterface $quote
+ * @return void
+ */
+ public function save(\Magento\Quote\Api\Data\CartInterface $quote);
+
+ /**
+ * Delete quote
+ *
+ * @param \Magento\Quote\Api\Data\CartInterface $quote
+ * @return void
+ */
+ public function delete(\Magento\Quote\Api\Data\CartInterface $quote);
}
diff --git a/app/code/Magento/Quote/Model/BillingAddressManagement.php b/app/code/Magento/Quote/Model/BillingAddressManagement.php
index 02c8046d6880514533be508a9819751708dcac27..1c9dd809f89c7619b84dac57d39ddbed43240fd3 100644
--- a/app/code/Magento/Quote/Model/BillingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/BillingAddressManagement.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Quote\Model;
-use Magento\Quote\Model\QuoteRepository;
+use Magento\Quote\Api\CartRepositoryInterface;
use Magento\Framework\Exception\InputException;
use Psr\Log\LoggerInterface as Logger;
use Magento\Quote\Api\BillingAddressManagementInterface;
@@ -31,7 +31,7 @@ class BillingAddressManagement implements BillingAddressManagementInterface
/**
* Quote repository.
*
- * @var QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -43,13 +43,13 @@ class BillingAddressManagement implements BillingAddressManagementInterface
/**
* Constructs a quote billing address service object.
*
- * @param QuoteRepository $quoteRepository Quote repository.
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository Quote repository.
* @param QuoteAddressValidator $addressValidator Address validator.
* @param Logger $logger Logger.
* @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
*/
public function __construct(
- QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
QuoteAddressValidator $addressValidator,
Logger $logger,
\Magento\Customer\Api\AddressRepositoryInterface $addressRepository
diff --git a/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php b/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php
index 77802348230abc4923fb529f29ff8011c297eaa5..c6b5d331bc7e76600117c87b21f1bba0385b5747 100644
--- a/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php
+++ b/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php
@@ -6,7 +6,7 @@
namespace Magento\Quote\Model\Cart;
use Magento\Quote\Api;
-use Magento\Quote\Model\QuoteRepository;
+use Magento\Quote\Api\CartRepositoryInterface;
use Magento\Quote\Api\CartTotalRepositoryInterface;
use Magento\Catalog\Helper\Product\ConfigurationPool;
use Magento\Framework\Api\DataObjectHelper;
@@ -29,7 +29,7 @@ class CartTotalRepository implements CartTotalRepositoryInterface
/**
* Quote repository.
*
- * @var QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
private $quoteRepository;
@@ -55,7 +55,7 @@ class CartTotalRepository implements CartTotalRepositoryInterface
/**
* @param Api\Data\TotalsInterfaceFactory $totalsFactory
- * @param QuoteRepository $quoteRepository
+ * @param CartRepositoryInterface $quoteRepository
* @param DataObjectHelper $dataObjectHelper
* @param CouponManagementInterface $couponService
* @param TotalsConverter $totalsConverter
@@ -63,7 +63,7 @@ class CartTotalRepository implements CartTotalRepositoryInterface
*/
public function __construct(
Api\Data\TotalsInterfaceFactory $totalsFactory,
- QuoteRepository $quoteRepository,
+ CartRepositoryInterface $quoteRepository,
DataObjectHelper $dataObjectHelper,
CouponManagementInterface $couponService,
TotalsConverter $totalsConverter,
diff --git a/app/code/Magento/Quote/Model/CouponManagement.php b/app/code/Magento/Quote/Model/CouponManagement.php
index c57172b122c8bf323810b012fd8c8414b49e0b0c..77732e6133c19cd2d1c91671e9b49cc072f76c1a 100644
--- a/app/code/Magento/Quote/Model/CouponManagement.php
+++ b/app/code/Magento/Quote/Model/CouponManagement.php
@@ -20,17 +20,17 @@ class CouponManagement implements CouponManagementInterface
/**
* Quote repository.
*
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
/**
* Constructs a coupon read service object.
*
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository Quote repository.
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository Quote repository.
*/
public function __construct(
- \Magento\Quote\Model\QuoteRepository $quoteRepository
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
) {
$this->quoteRepository = $quoteRepository;
}
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Repository.php b/app/code/Magento/Quote/Model/Quote/Item/Repository.php
index 3d28a4c84fbca31e970b6c2600b9664ec9ec2057..b5234d081be57a0a5bc4b9ee07347745fc3e6012 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Repository.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Repository.php
@@ -16,7 +16,7 @@ class Repository implements \Magento\Quote\Api\CartItemRepositoryInterface
/**
* Quote repository.
*
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -38,13 +38,13 @@ class Repository implements \Magento\Quote\Api\CartItemRepositoryInterface
protected $cartItemProcessors;
/**
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
* @param \Magento\Quote\Api\Data\CartItemInterfaceFactory $itemDataFactory
* @param CartItemProcessorInterface[] $cartItemProcessors
*/
public function __construct(
- \Magento\Quote\Model\QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
\Magento\Quote\Api\Data\CartItemInterfaceFactory $itemDataFactory,
array $cartItemProcessors = []
diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
index 89e1471e362310d508b6ba37f249786d6f664fb8..6e1cebb4b2d0e305019ea3e32ce864a4f4abc8e0 100644
--- a/app/code/Magento/Quote/Model/QuoteManagement.php
+++ b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -80,7 +80,7 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
protected $userContext;
/**
- * @var QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -130,7 +130,7 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
* @param ToOrderItemConverter $quoteItemToOrderItem
* @param ToOrderPaymentConverter $quotePaymentToOrderPayment
* @param UserContextInterface $userContext
- * @param QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
* @param \Magento\Customer\Model\CustomerFactory $customerModelFactory
* @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
@@ -151,7 +151,7 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
ToOrderItemConverter $quoteItemToOrderItem,
ToOrderPaymentConverter $quotePaymentToOrderPayment,
UserContextInterface $userContext,
- QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
\Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
\Magento\Customer\Model\CustomerFactory $customerModelFactory,
\Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
diff --git a/app/code/Magento/Quote/Model/QuoteRepository.php b/app/code/Magento/Quote/Model/QuoteRepository.php
index 58ba4a79e94f01b45b0853c22ea4bb85f63041a0..014e8759a117e567a941a5872620fa70643692ca 100644
--- a/app/code/Magento/Quote/Model/QuoteRepository.php
+++ b/app/code/Magento/Quote/Model/QuoteRepository.php
@@ -89,12 +89,7 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
}
/**
- * Get quote by id
- *
- * @param int $cartId
- * @param int[] $sharedStoreIds
- * @throws NoSuchEntityException
- * @return \Magento\Quote\Api\Data\CartInterface
+ * {@inheritdoc}
*/
public function get($cartId, array $sharedStoreIds = [])
{
@@ -107,12 +102,7 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
}
/**
- * Get quote by customer Id
- *
- * @param int $customerId
- * @param int[] $sharedStoreIds
- * @return Quote
- * @throws NoSuchEntityException
+ * {@inheritdoc}
*/
public function getForCustomer($customerId, array $sharedStoreIds = [])
{
@@ -125,12 +115,7 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
}
/**
- * Get active quote by id
- *
- * @param int $cartId
- * @param int[] $sharedStoreIds
- * @return Quote
- * @throws NoSuchEntityException
+ * {@inheritdoc}
*/
public function getActive($cartId, array $sharedStoreIds = [])
{
@@ -142,12 +127,7 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
}
/**
- * Get active quote by customer Id
- *
- * @param int $customerId
- * @param int[] $sharedStoreIds
- * @return Quote
- * @throws NoSuchEntityException
+ * {@inheritdoc}
*/
public function getActiveForCustomer($customerId, array $sharedStoreIds = [])
{
@@ -159,12 +139,9 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
}
/**
- * Save quote
- *
- * @param Quote $quote
- * @return void
+ * {@inheritdoc}
*/
- public function save(Quote $quote)
+ public function save(\Magento\Quote\Api\Data\CartInterface $quote)
{
$quote->save();
unset($this->quotesById[$quote->getId()]);
@@ -172,12 +149,9 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
}
/**
- * Delete quote
- *
- * @param Quote $quote
- * @return void
+ * {@inheritdoc}
*/
- public function delete(Quote $quote)
+ public function delete(\Magento\Quote\Api\Data\CartInterface $quote)
{
$quoteId = $quote->getId();
$customerId = $quote->getCustomerId();
diff --git a/app/code/Magento/Quote/Model/QuoteRepository/Plugin/Authorization.php b/app/code/Magento/Quote/Model/QuoteRepository/Plugin/Authorization.php
index 14b7752728d1143352592b7a567cac0f57653c48..8f710a2f9cb4f104b56e60a2c34c74c85d1021f5 100644
--- a/app/code/Magento/Quote/Model/QuoteRepository/Plugin/Authorization.php
+++ b/app/code/Magento/Quote/Model/QuoteRepository/Plugin/Authorization.php
@@ -28,14 +28,14 @@ class Authorization
/**
* Check if quote is allowed
*
- * @param \Magento\Quote\Model\QuoteRepository $subject
+ * @param \Magento\Quote\Api\CartRepositoryInterface $subject
* @param \Magento\Quote\Model\Quote $quote
* @return \Magento\Quote\Model\Quote
* @throws \Magento\Framework\Exception\NoSuchEntityException
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function afterGetActive(
- \Magento\Quote\Model\QuoteRepository $subject,
+ \Magento\Quote\Api\CartRepositoryInterface $subject,
\Magento\Quote\Model\Quote $quote
) {
if (!$this->isAllowed($quote)) {
@@ -47,14 +47,14 @@ class Authorization
/**
* Check if quote is allowed
*
- * @param \Magento\Quote\Model\QuoteRepository $subject
+ * @param \Magento\Quote\Api\CartRepositoryInterface $subject
* @param \Magento\Quote\Model\Quote $quote
* @return \Magento\Quote\Model\Quote
* @throws \Magento\Framework\Exception\NoSuchEntityException
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function afterGetActiveForCustomer(
- \Magento\Quote\Model\QuoteRepository $subject,
+ \Magento\Quote\Api\CartRepositoryInterface $subject,
\Magento\Quote\Model\Quote $quote
) {
if (!$this->isAllowed($quote)) {
diff --git a/app/code/Magento/Quote/Model/ShippingAddressManagement.php b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
index d87ea33696b52e134be3c2d659e2d68221b59c6e..00e1bd083ea6163cae9353212f44878aeeef3e6a 100644
--- a/app/code/Magento/Quote/Model/ShippingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
@@ -19,7 +19,7 @@ class ShippingAddressManagement implements ShippingAddressManagementInterface
/**
* Quote repository.
*
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -53,7 +53,7 @@ class ShippingAddressManagement implements ShippingAddressManagementInterface
protected $totalsCollector;
/**
- * @param QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param QuoteAddressValidator $addressValidator
* @param Logger $logger
* @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
@@ -62,7 +62,7 @@ class ShippingAddressManagement implements ShippingAddressManagementInterface
*
*/
public function __construct(
- \Magento\Quote\Model\QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
QuoteAddressValidator $addressValidator,
Logger $logger,
\Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
diff --git a/app/code/Magento/Quote/Model/ShippingMethodManagement.php b/app/code/Magento/Quote/Model/ShippingMethodManagement.php
index 88e778e4363bc43a771a67105dea70c08d5c0e22..6264eeab4bb91c7fa4ca491154e4d965eb41a19c 100644
--- a/app/code/Magento/Quote/Model/ShippingMethodManagement.php
+++ b/app/code/Magento/Quote/Model/ShippingMethodManagement.php
@@ -20,7 +20,7 @@ class ShippingMethodManagement implements ShippingMethodManagementInterface
/**
* Quote repository.
*
- * @var QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -46,13 +46,13 @@ class ShippingMethodManagement implements ShippingMethodManagementInterface
/**
* Constructs a shipping method read service object.
*
- * @param QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param Cart\ShippingMethodConverter $converter
* @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
* @param Quote\TotalsCollector $totalsCollector
*/
public function __construct(
- QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
Cart\ShippingMethodConverter $converter,
\Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
\Magento\Quote\Model\Quote\TotalsCollector $totalsCollector
diff --git a/app/code/Magento/Quote/Observer/Backend/CustomerQuoteObserver.php b/app/code/Magento/Quote/Observer/Backend/CustomerQuoteObserver.php
index 36ef6b156a074c428c667ada00be93013d345a61..479c8e731f8f039b40e71024161f310ea07082a1 100644
--- a/app/code/Magento/Quote/Observer/Backend/CustomerQuoteObserver.php
+++ b/app/code/Magento/Quote/Observer/Backend/CustomerQuoteObserver.php
@@ -7,7 +7,7 @@ namespace Magento\Quote\Observer\Backend;
use Magento\Store\Model\StoreManagerInterface;
use Magento\Customer\Model\Config\Share as ShareConfig;
-use Magento\Quote\Model\QuoteRepository;
+use Magento\Quote\Api\CartRepositoryInterface;
use Magento\Framework\Event\Observer;
use Magento\Framework\Event\ObserverInterface;
@@ -27,19 +27,19 @@ class CustomerQuoteObserver implements ObserverInterface
protected $storeManager;
/**
- * @var QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
/**
* @param StoreManagerInterface $storeManager
* @param ShareConfig $config
- * @param QuoteRepository $quoteRepository
+ * @param CartRepositoryInterface $quoteRepository
*/
public function __construct(
StoreManagerInterface $storeManager,
ShareConfig $config,
- QuoteRepository $quoteRepository
+ CartRepositoryInterface $quoteRepository
) {
$this->storeManager = $storeManager;
$this->config = $config;
diff --git a/app/code/Magento/Quote/Test/Unit/Model/BillingAddressManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/BillingAddressManagementTest.php
index 8ddc3c5f8b7fbd0d69f65f53280129243219e160..bf9600b344529aff76c7d097c2cda85c8a1efc30 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/BillingAddressManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/BillingAddressManagementTest.php
@@ -43,7 +43,7 @@ class BillingAddressManagementTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->objectManager = new ObjectManager($this);
- $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Model\QuoteRepository', [], [], '', false);
+ $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->validatorMock = $this->getMock('\Magento\Quote\Model\QuoteAddressValidator', [], [], '', false);
$this->addressRepository = $this->getMock('\Magento\Customer\Api\AddressRepositoryInterface');
$logger = $this->getMock('\Psr\Log\LoggerInterface');
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalRepositoryTest.php b/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalRepositoryTest.php
index bdc8c37af0cc38941b190b4b730628b8b5aa2c7a..11291ed01b8160328158865194e2acdf2c5f2baf 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalRepositoryTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalRepositoryTest.php
@@ -85,7 +85,7 @@ class CartTotalRepositoryTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->quoteRepositoryMock = $this->getMock('Magento\Quote\Model\QuoteRepository', [], [], '', false);
+ $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->addressMock = $this->getMock(
'Magento\Quote\Model\Quote\Address',
['getData', 'getTotals'],
diff --git a/app/code/Magento/Quote/Test/Unit/Model/CouponManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/CouponManagementTest.php
index dc119a34be8a532f02115b22d1482bac427f8b56..dc2a22b3aa15b365f4bd91f4f6c29624f2a81bfa 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/CouponManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/CouponManagementTest.php
@@ -40,7 +40,7 @@ class CouponManagementTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Model\QuoteRepository', [], [], '', false);
+ $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->storeMock = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
$this->quoteMock = $this->getMock(
'\Magento\Quote\Model\Quote',
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 e4a2901609c6eae9df103748002f446e176c8d36..fee1610ca16c1c36f68f2d4ec949f51b6f30380e 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
@@ -59,10 +59,8 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase
*/
protected function setUp()
{
- $this->quoteRepositoryMock =
- $this->getMock('\Magento\Quote\Model\QuoteRepository', [], [], '', false);
- $this->productRepositoryMock =
- $this->getMock('Magento\Catalog\Api\ProductRepositoryInterface', [], [], '', false);
+ $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
+ $this->productRepositoryMock = $this->getMock('Magento\Catalog\Api\ProductRepositoryInterface');
$this->itemDataFactoryMock =
$this->getMock('Magento\Quote\Api\Data\CartItemInterfaceFactory', ['create'], [], '', false);
$this->dataMock = $this->getMock('Magento\Quote\Model\Quote\Item', [], [], '', false);
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
index b316ad767ad7dd8de65cc94513a784c5f899d12b..bd8057b5c01d284687f3abf5ae41ce13f27f94e9 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
@@ -63,7 +63,7 @@ class QuoteManagementTest extends \PHPUnit_Framework_TestCase
protected $orderManagement;
/**
- * @var \Magento\Quote\Model\QuoteRepository|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Quote\Api\CartRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $quoteRepositoryMock;
@@ -157,7 +157,7 @@ class QuoteManagementTest extends \PHPUnit_Framework_TestCase
$this->quoteItemToOrderItem = $this->getMock('Magento\Quote\Model\Quote\Item\ToOrderItem', [], [], '', false);
$this->orderManagement = $this->getMock('Magento\Sales\Api\OrderManagementInterface', [], [], '', false);
$this->customerManagement = $this->getMock('Magento\Quote\Model\CustomerManagement', [], [], '', false);
- $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Model\QuoteRepository', [], [], '', false);
+ $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->userContextMock = $this->getMock('\Magento\Authorization\Model\UserContextInterface', [], [], '', false);
$this->customerRepositoryMock = $this->getMock(
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AuthorizationTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AuthorizationTest.php
index da8e89cb3435ed016de3acc05432047af14f8394..24c72dc676b437f4026ea0f6a87a89da4a64b0d4 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AuthorizationTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AuthorizationTest.php
@@ -37,7 +37,7 @@ class AuthorizationTest extends \PHPUnit_Framework_TestCase
{
// Quote without customer ID
$quoteMock = $this->getMock('Magento\Quote\Model\Quote', [], [], '', false);
- $quoteRepositoryMock = $this->getMock('Magento\Quote\Model\QuoteRepository', [], [], '', false);
+ $quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->userContextMock->expects($this->any())
->method('getUserType')
->willReturn(UserContextInterface::USER_TYPE_CUSTOMER);
@@ -48,7 +48,7 @@ class AuthorizationTest extends \PHPUnit_Framework_TestCase
public function testAfterGetActiveReturnsQuoteIfQuoteIsAllowedForCurrentUserContext()
{
$quoteMock = $this->getMock('Magento\Quote\Model\Quote', [], [], '', false);
- $quoteRepositoryMock = $this->getMock('Magento\Quote\Model\QuoteRepository', [], [], '', false);
+ $quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->userContextMock->expects($this->any())
->method('getUserType')
->willReturn(UserContextInterface::USER_TYPE_GUEST);
@@ -63,7 +63,7 @@ class AuthorizationTest extends \PHPUnit_Framework_TestCase
{
// Quote without customer ID
$quoteMock = $this->getMock('Magento\Quote\Model\Quote', [], [], '', false);
- $quoteRepositoryMock = $this->getMock('Magento\Quote\Model\QuoteRepository', [], [], '', false);
+ $quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->userContextMock->expects($this->any())->method('getUserType')->willReturn(
UserContextInterface::USER_TYPE_CUSTOMER
);
@@ -74,7 +74,7 @@ class AuthorizationTest extends \PHPUnit_Framework_TestCase
public function testAfterGetActiveForCustomerReturnsQuoteIfQuoteIsAllowedForCurrentUserContext()
{
$quoteMock = $this->getMock('Magento\Quote\Model\Quote', [], [], '', false);
- $quoteRepositoryMock = $this->getMock('Magento\Quote\Model\QuoteRepository', [], [], '', false);
+ $quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->userContextMock->expects($this->any())
->method('getUserType')
->willReturn(UserContextInterface::USER_TYPE_GUEST);
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php
index 3213329b5e1ec812d63c01ba85645909131d998f..f416395c55e8f62a41283d780e651cad6b2cec75 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php
@@ -7,7 +7,7 @@
namespace Magento\Quote\Test\Unit\Model;
-use \Magento\Quote\Model\QuoteRepository;
+use Magento\Quote\Api\CartRepositoryInterface;
use Magento\Framework\Api\SortOrder;
use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
@@ -15,7 +15,7 @@ use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
class QuoteRepositoryTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $model;
@@ -98,7 +98,7 @@ class QuoteRepositoryTest extends \PHPUnit_Framework_TestCase
);
$this->model = $objectManager->getObject(
- 'Magento\Quote\Model\QuoteRepository',
+ 'Magento\Quote\Api\CartRepositoryInterface',
[
'quoteFactory' => $this->quoteFactoryMock,
'storeManager' => $this->storeManagerMock,
diff --git a/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
index a62cb7f5598eb887ebe1573e16ab17be19af3571..55c9b862a60cbee55220ac6e3b8835454297cf53 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
@@ -50,7 +50,7 @@ class ShippingAddressManagementTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
- $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Model\QuoteRepository', [], [], '', false);
+ $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
$this->quoteAddressMock = $this->getMock(
diff --git a/app/code/Magento/Quote/Test/Unit/Model/ShippingMethodManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/ShippingMethodManagementTest.php
index fd760977a6c89f57308b2142d4acd827af06bfa4..64241f12923e6911c328a99bdadfdf2e4d9e8c6f 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/ShippingMethodManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/ShippingMethodManagementTest.php
@@ -57,7 +57,7 @@ class ShippingMethodManagementTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->objectManager = new ObjectManager($this);
- $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Model\QuoteRepository', [], [], '', false);
+ $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->methodDataFactoryMock = $this->getMock(
'\Magento\Quote\Api\Data\ShippingMethodInterfaceFactory',
[
diff --git a/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php b/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php
index 27470a6fad0ab6ed469995abcda0b6016228bdda..64813788601e5d8d4e3fe26e69d2a29fe82872a0 100644
--- a/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php
@@ -26,7 +26,7 @@ class CustomerQuoteObserverTest extends \PHPUnit_Framework_TestCase
protected $configMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject|\\Magento\Quote\Model\QuoteRepository
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepositoryMock;
@@ -48,10 +48,7 @@ class CustomerQuoteObserverTest extends \PHPUnit_Framework_TestCase
$this->configMock = $this->getMockBuilder('Magento\Customer\Model\Config\Share')
->disableOriginalConstructor()
->getMock();
- $this->quoteRepositoryMock = $this->getMockBuilder('\Magento\Quote\Model\QuoteRepository')
- ->disableOriginalConstructor()
- ->setMethods(['getForCustomer', 'save'])
- ->getMock();
+ $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
$this->observerMock = $this->getMockBuilder('Magento\Framework\Event\Observer')
->disableOriginalConstructor()
->getMock();
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Customer/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Customer/Collection.php
index 1f7fe62304519f215152ce6e5932b86ef27d9bbb..4a81d3d4c86ab03f9dad735cc511a67da8c5930e 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Customer/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Customer/Collection.php
@@ -57,7 +57,7 @@ class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collecti
protected $_orderEntityField;
/**
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -83,7 +83,7 @@ class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collecti
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
* @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot
* @param \Magento\Framework\DataObject\Copy\Config $fieldsetConfig
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param \Magento\Quote\Model\ResourceModel\Quote\Item\CollectionFactory $quoteItemFactory
* @param \Magento\Sales\Model\ResourceModel\Order\Collection $orderResource
* @param mixed $connection
@@ -103,7 +103,7 @@ class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collecti
\Magento\Framework\Validator\UniversalFactory $universalFactory,
\Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot,
\Magento\Framework\DataObject\Copy\Config $fieldsetConfig,
- \Magento\Quote\Model\QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
\Magento\Quote\Model\ResourceModel\Quote\Item\CollectionFactory $quoteItemFactory,
\Magento\Sales\Model\ResourceModel\Order\Collection $orderResource,
\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index 244cc11fdb3840949ca2e2927141ef51152fb424..e89b88062e06ddb1c20b6c3a242a4955d8915b00 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -200,7 +200,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
protected $customerMapper;
/**
- * @var \Magento\Quote\Model\QuoteRepository
+ * @var \Magento\Quote\Api\CartRepositoryInterface
*/
protected $quoteRepository;
@@ -239,7 +239,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
* @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
* @param Item\Updater $quoteItemUpdater
* @param \Magento\Framework\DataObject\Factory $objectFactory
- * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
* @param \Magento\Customer\Api\AccountManagementInterface $accountManagement
* @param \Magento\Customer\Api\Data\CustomerInterfaceFactory $customerFactory
* @param \Magento\Customer\Model\Customer\Mapper $customerMapper
@@ -269,7 +269,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
\Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
\Magento\Quote\Model\Quote\Item\Updater $quoteItemUpdater,
\Magento\Framework\DataObject\Factory $objectFactory,
- \Magento\Quote\Model\QuoteRepository $quoteRepository,
+ \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
\Magento\Customer\Api\AccountManagementInterface $accountManagement,
\Magento\Customer\Api\Data\CustomerInterfaceFactory $customerFactory,
\Magento\Customer\Model\Customer\Mapper $customerMapper,
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
index 0d7b1ea35f3b7ca356ea0e36875f68e454ebd040..b617f9b8fd2249b88d055c86d0c94c8c90ac302e 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
@@ -23,8 +23,8 @@ class QuoteRepositoryTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder */
$searchCriteriaBuilder = Bootstrap::getObjectManager()->create('Magento\Framework\Api\SearchCriteriaBuilder');
- /** @var \Magento\Quote\Model\QuoteRepository $quoteRepository */
- $quoteRepository = Bootstrap::getObjectManager()->create('Magento\Quote\Model\QuoteRepository');
+ /** @var \Magento\Quote\Api\CartRepositoryInterface $quoteRepository */
+ $quoteRepository = Bootstrap::getObjectManager()->create('Magento\Quote\Api\CartRepositoryInterface');
$searchResult = $quoteRepository->getList($searchCriteriaBuilder->create());
$items = $searchResult->getItems();
/** @var \Magento\Quote\Api\Data\CartInterface $actualQuote */