MAGETWO-36934: Pull request processing MAGETWO-34646

Michael Logvin · Michael Logvin · commit 9f5a0995fd66 · 2015-05-06T15:11:58.000+03:00
diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestPaymentMethodManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestPaymentMethodManagementTest.php
@@ -48,7 +48,8 @@ protected function deleteCart($reservedOrderId)
             $cart->delete();
             /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
             $quoteIdMask = $this->objectManager->create('Magento\Quote\Model\QuoteIdMask');
-            $quoteIdMask->delete($cart->getId());
+            $quoteIdMask->load($cart->getId(), 'quote_id');
+            $quoteIdMask->delete();
         } catch (\InvalidArgumentException $e) {
             // Do nothing if cart fixture was not used
         }
@@ -327,7 +328,7 @@ protected function getMaskedCartId($cartId)
         $quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create('Magento\Quote\Model\QuoteIdMaskFactory')
             ->create();
-        $quoteIdMask->load($cartId);
+        $quoteIdMask->load($cartId, 'quote_id');
         return $quoteIdMask->getMaskedId();
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestShippingAddressManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestShippingAddressManagementTest.php
@@ -35,15 +35,16 @@ public function tearDown()
             $quote->delete();
             /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
             $quoteIdMask = $this->objectManager->create('Magento\Quote\Model\QuoteIdMask');
-            $quoteIdMask->delete($quote->getId());
+            $quoteIdMask->load($quote->getId(), 'quote_id');
+            $quoteIdMask->delete();
         }
     }
 
     protected function getQuoteMaskedId($quoteId)
     {
         /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->objectManager->create('Magento\Quote\Model\QuoteIdMaskFactory')->create();
-        $quoteIdMask->load($quoteId);
+        $quoteIdMask->load($quoteId, 'quote_id');
         return $quoteIdMask->getMaskedId();
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestShippingMethodManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestShippingMethodManagementTest.php
@@ -59,7 +59,7 @@ public function testSetMethod()
         $quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create('Magento\Quote\Model\QuoteIdMaskFactory')
             ->create();
-        $quoteIdMask->load($cartId);
+        $quoteIdMask->load($cartId, 'quote_id');
         //Use masked cart Id
         $cartId = $quoteIdMask->getMaskedId();
 
@@ -88,7 +88,7 @@ public function testSetMethodWrongMethod()
         $quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create('Magento\Quote\Model\QuoteIdMaskFactory')
             ->create();
-        $quoteIdMask->load($cartId);
+        $quoteIdMask->load($cartId, 'quote_id');
         //Use masked cart Id
         $cartId = $quoteIdMask->getMaskedId();
 
@@ -125,7 +125,7 @@ public function testSetMethodWithoutShippingAddress()
         $quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create('Magento\Quote\Model\QuoteIdMaskFactory')
             ->create();
-        $quoteIdMask->load($cartId);
+        $quoteIdMask->load($cartId, 'quote_id');
         //Use masked cart Id
         $cartId = $quoteIdMask->getMaskedId();
 
@@ -158,7 +158,7 @@ public function testGetMethod()
         $quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create('Magento\Quote\Model\QuoteIdMaskFactory')
             ->create();
-        $quoteIdMask->load($cartId);
+        $quoteIdMask->load($cartId, 'quote_id');
         //Use masked cart Id
         $cartId = $quoteIdMask->getMaskedId();
 
@@ -191,7 +191,7 @@ public function testGetMethodOfVirtualCart()
         $quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create('Magento\Quote\Model\QuoteIdMaskFactory')
             ->create();
-        $quoteIdMask->load($cartId);
+        $quoteIdMask->load($cartId, 'quote_id');
         //Use masked cart Id
         $cartId = $quoteIdMask->getMaskedId();
 
@@ -211,7 +211,7 @@ public function testGetMethodOfCartWithNoShippingMethod()
         $quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create('Magento\Quote\Model\QuoteIdMaskFactory')
             ->create();
-        $quoteIdMask->load($cartId);
+        $quoteIdMask->load($cartId, 'quote_id');
         //Use masked cart Id
         $cartId = $quoteIdMask->getMaskedId();
 
@@ -232,7 +232,7 @@ public function testGetListForVirtualCart()
         $quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create('Magento\Quote\Model\QuoteIdMaskFactory')
             ->create();
-        $quoteIdMask->load($cartId);
+        $quoteIdMask->load($cartId, 'quote_id');
         //Use masked cart Id
         $cartId = $quoteIdMask->getMaskedId();
 
@@ -256,7 +256,7 @@ public function testGetList()
         $quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create('Magento\Quote\Model\QuoteIdMaskFactory')
             ->create();
-        $quoteIdMask->load($cartId);
+        $quoteIdMask->load($cartId, 'quote_id');
         //Use masked cart Id
         $cartId = $quoteIdMask->getMaskedId();
 
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_payment_saved.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_payment_saved.php
@@ -30,6 +30,6 @@
 $quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
     ->create('Magento\Quote\Model\QuoteIdMaskFactory')
     ->create();
-$quoteIdMask->setId($quote->getId());
+$quoteIdMask->setQuoteId($quote->getId());
 $quoteIdMask->setDataChanges(true);
 $quoteIdMask->save();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved.php
@@ -31,6 +31,6 @@
 $quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
     ->create('Magento\Quote\Model\QuoteIdMaskFactory')
     ->create();
-$quoteIdMask->setId($quote->getId());
+$quoteIdMask->setQuoteId($quote->getId());
 $quoteIdMask->setDataChanges(true);
 $quoteIdMask->save();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address.php
@@ -57,6 +57,6 @@
 $quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
     ->create('Magento\Quote\Model\QuoteIdMaskFactory')
     ->create();
-$quoteIdMask->setId($quote->getId());
+$quoteIdMask->setQuoteId($quote->getId());
 $quoteIdMask->setDataChanges(true);
 $quoteIdMask->save();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved.php
@@ -24,6 +24,6 @@
 $quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
     ->create('Magento\Quote\Model\QuoteIdMaskFactory')
     ->create();
-$quoteIdMask->setId($quote->getId());
+$quoteIdMask->setQuoteId($quote->getId());
 $quoteIdMask->setDataChanges(true);
 $quoteIdMask->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_customer.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_customer.php
@@ -20,6 +20,6 @@
 $quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
     ->create('Magento\Quote\Model\QuoteIdMaskFactory')
     ->create();
-$quoteIdMask->setId($quote->getId());
+$quoteIdMask->setQuoteId($quote->getId());
 $quoteIdMask->setDataChanges(true);
 $quoteIdMask->save();

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@ protected function deleteCart($reservedOrderId)`
`48`	`48`	`$cart->delete();`
`49`	`49`	`/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */`
`50`	`50`	`$quoteIdMask = $this->objectManager->create('Magento\Quote\Model\QuoteIdMask');`
`51`		`- $quoteIdMask->delete($cart->getId());`
	`51`	`+ $quoteIdMask->load($cart->getId(), 'quote_id');`
	`52`	`+ $quoteIdMask->delete();`
`52`	`53`	`} catch (\InvalidArgumentException $e) {`
`53`	`54`	`// Do nothing if cart fixture was not used`
`54`	`55`	`}`
`@@ -327,7 +328,7 @@ protected function getMaskedCartId($cartId)`
`327`	`328`	`$quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()`
`328`	`329`	`->create('Magento\Quote\Model\QuoteIdMaskFactory')`
`329`	`330`	`->create();`
`330`		`- $quoteIdMask->load($cartId);`
	`331`	`+ $quoteIdMask->load($cartId, 'quote_id');`
`331`	`332`	`return $quoteIdMask->getMaskedId();`
`332`	`333`	`}`
`333`	`334`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,15 +35,16 @@ public function tearDown()`
`35`	`35`	`$quote->delete();`
`36`	`36`	`/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */`
`37`	`37`	`$quoteIdMask = $this->objectManager->create('Magento\Quote\Model\QuoteIdMask');`
`38`		`- $quoteIdMask->delete($quote->getId());`
	`38`	`+ $quoteIdMask->load($quote->getId(), 'quote_id');`
	`39`	`+ $quoteIdMask->delete();`
`39`	`40`	`}`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`protected function getQuoteMaskedId($quoteId)`
`43`	`44`	`{`
`44`	`45`	`/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */`
`45`	`46`	`$quoteIdMask = $this->objectManager->create('Magento\Quote\Model\QuoteIdMaskFactory')->create();`
`46`		`- $quoteIdMask->load($quoteId);`
	`47`	`+ $quoteIdMask->load($quoteId, 'quote_id');`
`47`	`48`	`return $quoteIdMask->getMaskedId();`
`48`	`49`	`}`
`49`	`50`