Skip to content

Commit 60ccb72

Browse files
author
Cari Spruiell
committed
MAGETWO-36560: Fix builds
- fixed namespace error - fixed code formatting issues
1 parent 04a4335 commit 60ccb72

File tree

6 files changed

+20
-16
lines changed

6 files changed

+20
-16
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class GuestCouponManagement implements GuestCouponManagementInterface
2121
*/
2222
private $quoteIdMaskFactory;
2323

24-
/**
24+
/**
2525
* @var CouponManagementInterface
2626
*/
2727
private $couponManagement;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Magento\Quote\Model\QuoteIdMask;
1010
use Magento\Quote\Model\QuoteIdMaskFactory;
1111
use Magento\Quote\Api\ShippingAddressManagementInterface;
12+
1213
/**
1314
* Shipping address management class for guest carts.
1415
*/

app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartItemRepositoryTest.php

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77

8-
namespace Magento\Quote\Test\Unit\Model\Quote\Item;
8+
namespace Magento\Quote\Test\Unit\Model\GuestCart;
99

1010
class GuestCartItemRepositoryTest extends \PHPUnit_Framework_TestCase
1111
{
@@ -58,10 +58,11 @@ protected function setUp()
5858
* @var \Magento\Quote\Test\Unit\Model\GuestCart\GuestCartTestHelper
5959
*/
6060
$guestCartTestHelper = new \Magento\Quote\Test\Unit\Model\GuestCart\GuestCartTestHelper($this);
61-
list($this->quoteIdMaskFactoryMock, $this->quoteIdMaskMock) = $guestCartTestHelper->mockQuoteIdMask(
62-
$this->maskedCartId,
63-
$this->cartId
64-
);
61+
list($this->quoteIdMaskFactoryMock, $this->quoteIdMaskMock) =
62+
$guestCartTestHelper->mockQuoteIdMask(
63+
$this->maskedCartId,
64+
$this->cartId
65+
);
6566

6667
$this->quoteIdMaskMock->expects($this->any())
6768
->method('getMaskedId')
@@ -80,12 +81,13 @@ protected function setUp()
8081

8182
$this->cartItemRepositoryMock = $this->getMock('\Magento\Quote\Model\Quote\Item\Repository', [], [], '', false);
8283
$this->guestCartItemRepository =
83-
$objectManager->getObject('Magento\Quote\Model\GuestCart\GuestCartItemRepository',
84-
[
85-
'repository' => $this->cartItemRepositoryMock,
86-
'quoteIdMaskFactory' => $this->quoteIdMaskFactoryMock,
87-
]
88-
);
84+
$objectManager->getObject(
85+
'Magento\Quote\Model\GuestCart\GuestCartItemRepository',
86+
[
87+
'repository' => $this->cartItemRepositoryMock,
88+
'quoteIdMaskFactory' => $this->quoteIdMaskFactoryMock,
89+
]
90+
);
8991
}
9092

9193
/**

app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartRepositoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class GuestCartRepositoryTest extends \PHPUnit_Framework_TestCase
4646
protected function setUp()
4747
{
4848
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
49-
$this->quoteRepositoryMock = $this->getMock( 'Magento\Quote\Api\CartRepositoryInterface', [], [], '', false);
49+
$this->quoteRepositoryMock = $this->getMock('Magento\Quote\Api\CartRepositoryInterface', [], [], '', false);
5050
$this->quoteMock = $this->getMock('Magento\Quote\Model\Quote', [], [], '', false);
5151

5252
$this->maskedCartId = 'f216207248d65c789b17be8545e0aa73';

app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartTestHelper.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,15 @@ public function __construct(\PHPUnit_Framework_TestCase $testCase)
3636
* @param $cartId
3737
* @return array
3838
*/
39-
public function mockQuoteIdMask( $maskedCartId, $cartId)
39+
public function mockQuoteIdMask($maskedCartId, $cartId)
4040
{
4141
$quoteIdMaskMock = $this->testCase->getMock(
4242
'Magento\Quote\Model\QuoteIdMask',
4343
['load', 'getId', 'getMaskedId'],
4444
[],
4545
'',
46-
false);
46+
false
47+
);
4748
$quoteIdMaskFactoryMock = $this->testCase->getMock('Magento\Quote\Model\QuoteIdMaskFactory', [], [], '', false);
4849
$quoteIdMaskFactoryMock->expects($this->testCase->once())->method('create')->willReturn($quoteIdMaskMock);
4950
$quoteIdMaskMock->expects($this->testCase->once())->method('load')->with($maskedCartId)->willReturnSelf();

app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCouponManagementTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class GuestCouponManagementTest extends \PHPUnit_Framework_TestCase
4646
protected function setUp()
4747
{
4848
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
49-
$this->couponManagementMock = $this->getMock( 'Magento\Quote\Api\CouponManagementInterface', [], [], '', false);
49+
$this->couponManagementMock = $this->getMock('Magento\Quote\Api\CouponManagementInterface', [], [], '', false);
5050

5151
$this->couponCode = 'test_coupon_code';
5252
$this->maskedCartId = 'f216207248d65c789b17be8545e0aa73';

0 commit comments

Comments
 (0)