Skip to content

Commit d717e1c

Browse files
committed
Merge remote-tracking branch 'act4/ACP2E-3403' into ACP2E-3403
2 parents 128a79a + 5e81096 commit d717e1c

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Quote\Model\Quote\Item;
77

app/code/Magento/Quote/Test/Unit/Model/Quote/Item/AbstractItemTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2014 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -50,7 +50,8 @@ public function testGetTotalDiscountAmount($expectedDiscountAmount, $children, $
5050
$this->assertEquals($expectedDiscountAmount, $totalDiscountAmount);
5151
}
5252

53-
protected function getMockForAbstractItem($childDiscountAmount) {
53+
protected function getMockForAbstractItem($childDiscountAmount)
54+
{
5455
$childItemMock = $this->getMockForAbstractClass(
5556
AbstractItem::class,
5657
[],

app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2014 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\SalesRule\Model\Rule\Action\Discount;
77

0 commit comments

Comments
 (0)