MAGETWO-97456: Cart's customer and address mismatch

StasKozar · StasKozar · commit 15cb4cbe8599 · 2019-01-28T10:22:43.000+02:00
diff --git a/app/code/Magento/Quote/Model/QuoteAddressValidator.php b/app/code/Magento/Quote/Model/QuoteAddressValidator.php
@@ -65,7 +65,7 @@ private function doValidate(AddressInterface $address, $customerId)
         //validate customer id
         if ($customerId) {
             try {
-                $customer = $this->customerRepository->getById($customerId);
+                $this->customerRepository->getById($customerId);
             } catch (NoSuchEntityException $exception) {
                 throw new NoSuchEntityException(__('Invalid customer id %1', $customerId));
             }
diff --git a/app/code/Magento/Quote/Model/ShippingAddressManagement.php b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
@@ -78,7 +78,7 @@ public function __construct(
     }
 
     /**
-     * @inheritDoc
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address)
@@ -122,7 +122,7 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
     }
 
     /**
-     * @inheritDoc
+     * @inheritdoc
      */
     public function get($cartId)
     {

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ private function doValidate(AddressInterface $address, $customerId)`
`65`	`65`	`//validate customer id`
`66`	`66`	`if ($customerId) {`
`67`	`67`	`try {`
`68`		`- $customer = $this->customerRepository->getById($customerId);`
	`68`	`+ $this->customerRepository->getById($customerId);`
`69`	`69`	`} catch (NoSuchEntityException $exception) {`
`70`	`70`	`throw new NoSuchEntityException(__('Invalid customer id %1', $customerId));`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function __construct(`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`/**`
`81`		`- * @inheritDoc`
	`81`	`+ * @inheritdoc`
`82`	`82`	`* @SuppressWarnings(PHPMD.NPathComplexity)`
`83`	`83`	`*/`
`84`	`84`	`public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address)`
`@@ -122,7 +122,7 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`/**`
`125`		`- * @inheritDoc`
	`125`	`+ * @inheritdoc`
`126`	`126`	`*/`
`127`	`127`	`public function get($cartId)`
`128`	`128`	`{`