MAGETWO-98832: Multistore Allowed Countries List Problem

Author: ysapiga

app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php

@@ -2120,15 +2120,9 @@ public function testCreateAccountUnexpectedValueException(): void
             ->method('newAccount')
             ->willThrowException($exception);
         $this->logger->expects($this->once())->method('error')->with($exception);
-        $this->allowedCountriesReader
-            ->expects($this->atLeastOnce())
-            ->method('getAllowedCountries')
-            ->willReturn(['US' => 'US']);
-        $address
-            ->expects($this->atLeastOnce())
-            ->method('getCountryId')
-            ->willReturn('US');
-
+        $this->allowedCountriesReader->expects($this->atLeastOnce())
+            ->method('getAllowedCountries')->willReturn(['US' => 'US']);
+        $address->expects($this->atLeastOnce())->method('getCountryId')->willReturn('US');
         $this->accountManagement->createAccount($customer);
     }
 

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

@@ -409,6 +409,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * @param array $data
      * @param \Magento\Sales\Model\OrderIncrementIdChecker|null $orderIncrementIdChecker
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -929,6 +930,7 @@ public function assignCustomer(\Magento\Customer\Api\Data\CustomerInterface $cus
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
      * @param Address $billingAddress Quote billing address
      * @param Address $shippingAddress Quote shipping address
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @return $this
      */
     public function assignCustomerWithAddressChange(