Merge remote-tracking branch 'origin/MC-21706' into 2.3-develop-pr35

Author: serhii-balko

app/code/Magento/Quote/Model/QuoteRepository.php

@@ -224,7 +224,7 @@ protected function loadQuote($loadMethod, $loadField, $identifier, array $shared
     {
         /** @var CartInterface $quote */
         $quote = $this->cartFactory->create();
-        if ($sharedStoreIds && method_exists($quote, 'setSharedStoreIds')) {
+        if ($sharedStoreIds && is_callable([$quote, 'setSharedStoreIds'])) {
             $quote->setSharedStoreIds($sharedStoreIds);
         }
         $quote->setStoreId($this->storeManager->getStore()->getId())->$loadMethod($identifier);

app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php

@@ -9,6 +9,7 @@
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SortOrder;
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use PHPUnit\Framework\MockObject\Matcher\InvokedCount as InvokedCountMatch;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Quote\Api\Data\CartInterface;
@@ -284,7 +285,14 @@ public function testGetWithSharedStoreIds()
         $this->assertEquals($this->quoteMock, $this->model->get($cartId, $sharedStoreIds));
     }
 
-    public function testGetForCustomer()
+    /**
+     * Test getForCustomer method
+     *
+     * @param InvokedCountMatch $invokeTimes
+     * @param array $sharedStoreIds
+     * @dataProvider getForCustomerDataProvider
+     */
+    public function testGetForCustomer(InvokedCountMatch $invokeTimes, array $sharedStoreIds)
     {
         $cartId = 17;
         $customerId = 23;
@@ -298,7 +306,7 @@ public function testGetForCustomer()
         $this->storeMock->expects(static::once())
             ->method('getId')
             ->willReturn(1);
-        $this->quoteMock->expects(static::never())
+        $this->quoteMock->expects($invokeTimes)
             ->method('setSharedStoreIds');
         $this->quoteMock->expects(static::once())
             ->method('loadByCustomer')
@@ -312,8 +320,27 @@ public function testGetForCustomer()
             ->method('load')
             ->with($this->quoteMock);
 
+        static::assertEquals($this->quoteMock, $this->model->getForCustomer($customerId, $sharedStoreIds));
         static::assertEquals($this->quoteMock, $this->model->getForCustomer($customerId));
-        static::assertEquals($this->quoteMock, $this->model->getForCustomer($customerId));
+    }
+
+    /**
+     * Checking how many times we invoke setSharedStoreIds() in protected method loadQuote()
+     *
+     * @return array
+     */
+    public function getForCustomerDataProvider()
+    {
+        return [
+            [
+                'invoke_number_times' => static::never(),
+                'shared_store_ids' => []
+            ],
+            [
+                'invoke_number_times' => static::once(),
+                'shared_store_ids' => [1]
+            ]
+        ];
     }
 
     /**