From 60ccb72cd6c101dbd6d30a4fbef8fabb5044a476 Mon Sep 17 00:00:00 2001
From: Cari Spruiell <cspruiell@ebay.com>
Date: Wed, 22 Apr 2015 10:50:32 -0500
Subject: [PATCH] MAGETWO-36560: Fix builds
- fixed namespace error
- fixed code formatting issues
---
.../Model/GuestCart/GuestCouponManagement.php | 2 +-
.../GuestShippingAddressManagement.php | 1 +
.../GuestCart/GuestCartItemRepositoryTest.php | 24 ++++++++++---------
.../GuestCart/GuestCartRepositoryTest.php | 2 +-
.../Model/GuestCart/GuestCartTestHelper.php | 5 ++--
.../GuestCart/GuestCouponManagementTest.php | 2 +-
6 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCouponManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestCouponManagement.php
index 7f4d0985943..90b1047ee3c 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestCouponManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestCouponManagement.php
@@ -21,7 +21,7 @@ class GuestCouponManagement implements GuestCouponManagementInterface
*/
private $quoteIdMaskFactory;
- /**
+ /**
* @var CouponManagementInterface
*/
private $couponManagement;
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagement.php
index 11d4db9c516..f2ce3fb46fc 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagement.php
@@ -9,6 +9,7 @@ use Magento\Quote\Api\GuestShippingAddressManagementInterface;
use Magento\Quote\Model\QuoteIdMask;
use Magento\Quote\Model\QuoteIdMaskFactory;
use Magento\Quote\Api\ShippingAddressManagementInterface;
+
/**
* Shipping address management class for guest carts.
*/
diff --git a/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartItemRepositoryTest.php b/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartItemRepositoryTest.php
index f1b07635599..37b54ee8010 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartItemRepositoryTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartItemRepositoryTest.php
@@ -5,7 +5,7 @@
* See COPYING.txt for license details.
*/
-namespace Magento\Quote\Test\Unit\Model\Quote\Item;
+namespace Magento\Quote\Test\Unit\Model\GuestCart;
class GuestCartItemRepositoryTest extends \PHPUnit_Framework_TestCase
{
@@ -58,10 +58,11 @@ class GuestCartItemRepositoryTest extends \PHPUnit_Framework_TestCase
* @var \Magento\Quote\Test\Unit\Model\GuestCart\GuestCartTestHelper
*/
$guestCartTestHelper = new \Magento\Quote\Test\Unit\Model\GuestCart\GuestCartTestHelper($this);
- list($this->quoteIdMaskFactoryMock, $this->quoteIdMaskMock) = $guestCartTestHelper->mockQuoteIdMask(
- $this->maskedCartId,
- $this->cartId
- );
+ list($this->quoteIdMaskFactoryMock, $this->quoteIdMaskMock) =
+ $guestCartTestHelper->mockQuoteIdMask(
+ $this->maskedCartId,
+ $this->cartId
+ );
$this->quoteIdMaskMock->expects($this->any())
->method('getMaskedId')
@@ -80,12 +81,13 @@ class GuestCartItemRepositoryTest extends \PHPUnit_Framework_TestCase
$this->cartItemRepositoryMock = $this->getMock('\Magento\Quote\Model\Quote\Item\Repository', [], [], '', false);
$this->guestCartItemRepository =
- $objectManager->getObject('Magento\Quote\Model\GuestCart\GuestCartItemRepository',
- [
- 'repository' => $this->cartItemRepositoryMock,
- 'quoteIdMaskFactory' => $this->quoteIdMaskFactoryMock,
- ]
- );
+ $objectManager->getObject(
+ 'Magento\Quote\Model\GuestCart\GuestCartItemRepository',
+ [
+ 'repository' => $this->cartItemRepositoryMock,
+ 'quoteIdMaskFactory' => $this->quoteIdMaskFactoryMock,
+ ]
+ );
}
/**
diff --git a/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartRepositoryTest.php b/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartRepositoryTest.php
index 28096160fc0..3a7e2fac3ae 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartRepositoryTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartRepositoryTest.php
@@ -46,7 +46,7 @@ class GuestCartRepositoryTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
- $this->quoteRepositoryMock = $this->getMock( 'Magento\Quote\Api\CartRepositoryInterface', [], [], '', false);
+ $this->quoteRepositoryMock = $this->getMock('Magento\Quote\Api\CartRepositoryInterface', [], [], '', false);
$this->quoteMock = $this->getMock('Magento\Quote\Model\Quote', [], [], '', false);
$this->maskedCartId = 'f216207248d65c789b17be8545e0aa73';
diff --git a/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartTestHelper.php b/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartTestHelper.php
index fa878c0594e..25649077b5f 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartTestHelper.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartTestHelper.php
@@ -36,14 +36,15 @@ class GuestCartTestHelper
* @param $cartId
* @return array
*/
- public function mockQuoteIdMask( $maskedCartId, $cartId)
+ public function mockQuoteIdMask($maskedCartId, $cartId)
{
$quoteIdMaskMock = $this->testCase->getMock(
'Magento\Quote\Model\QuoteIdMask',
['load', 'getId', 'getMaskedId'],
[],
'',
- false);
+ false
+ );
$quoteIdMaskFactoryMock = $this->testCase->getMock('Magento\Quote\Model\QuoteIdMaskFactory', [], [], '', false);
$quoteIdMaskFactoryMock->expects($this->testCase->once())->method('create')->willReturn($quoteIdMaskMock);
$quoteIdMaskMock->expects($this->testCase->once())->method('load')->with($maskedCartId)->willReturnSelf();
diff --git a/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCouponManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCouponManagementTest.php
index b1b1d164748..74b00ed942f 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCouponManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCouponManagementTest.php
@@ -46,7 +46,7 @@ class GuestCouponManagementTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
- $this->couponManagementMock = $this->getMock( 'Magento\Quote\Api\CouponManagementInterface', [], [], '', false);
+ $this->couponManagementMock = $this->getMock('Magento\Quote\Api\CouponManagementInterface', [], [], '', false);
$this->couponCode = 'test_coupon_code';
$this->maskedCartId = 'f216207248d65c789b17be8545e0aa73';
--
GitLab