MAGETWO-32775: Prepare pull request for Checkout related modules MSC

Olexii Korshenko · Olexii Korshenko · commit c7e3fdad942b · 2015-01-21T10:24:02.000+02:00
- fixed REST tests
diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -167,8 +167,9 @@ public function assignCustomer($cartId, $customerId, $storeId)
         }
         try {
             $this->quoteRepository->getForCustomer($customerId);
-        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
             throw new StateException('Cannot assign customer to the given cart. Customer already has active cart.');
+        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+
         }
 
         $quote->setCustomer($customer);
@@ -205,8 +206,9 @@ protected function createCustomerCart($storeId)
 
         try {
             $this->quoteRepository->getActiveForCustomer($this->userContext->getUserId());
-        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
             throw new CouldNotSaveException('Cannot create quote');
+        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+
         }
 
         /** @var \Magento\Quote\Model\Quote $quote */

Original file line number	Diff line number	Diff line change
`@@ -167,8 +167,9 @@ public function assignCustomer($cartId, $customerId, $storeId)`
`167`	`167`	`}`
`168`	`168`	`try {`
`169`	`169`	`$this->quoteRepository->getForCustomer($customerId);`
`170`		`- } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {`
`171`	`170`	`throw new StateException('Cannot assign customer to the given cart. Customer already has active cart.');`
	`171`	`+ } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {`
	`172`	`+`
`172`	`173`	`}`
`173`	`174`
`174`	`175`	`$quote->setCustomer($customer);`
`@@ -205,8 +206,9 @@ protected function createCustomerCart($storeId)`
`205`	`206`
`206`	`207`	`try {`
`207`	`208`	`$this->quoteRepository->getActiveForCustomer($this->userContext->getUserId());`
`208`		`- } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {`
`209`	`209`	`throw new CouldNotSaveException('Cannot create quote');`
	`210`	`+ } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {`
	`211`	`+`
`210`	`212`	`}`
`211`	`213`
`212`	`214`	`/** @var \Magento\Quote\Model\Quote $quote */`