Skip to content

Commit be15d80

Browse files
glo60612glo60612
committed
Merge remote-tracking branch 'origin/AC-14425' into spartans_pr_28042025
2 parents eb491c0 + a97432d commit be15d80

File tree

54 files changed

+87
-626
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+87
-626
lines changed

‎app/code/Magento/OrderCancellationGraphQl/Model/Validator/ValidateOrderCancellationReason.php‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
/**
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
145
*/
156
declare(strict_types=1);
167

‎app/code/Magento/OrderCancellationGraphQl/Plugin/Model/CancelOrder.php‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
/**
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
145
*/
156
declare(strict_types=1);
167

‎app/code/Magento/OrderCancellationGraphQl/Plugin/Model/CancelOrderGuest.php‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
/**
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
145
*/
156
declare(strict_types=1);
167

‎app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
3-
* Copyright 2025 Adobe
2+
/**
3+
* Copyright 2014 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166
declare(strict_types=1);
177

‎app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/EditComment.php‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
2+
/**
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166

177
declare(strict_types=1);

‎app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
3-
* Copyright 2025 Adobe
2+
/**
3+
* Copyright 2014 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166
declare(strict_types=1);
177

‎app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/EditComment.php‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
2+
/**
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166

177
declare(strict_types=1);

‎app/code/Magento/Sales/Helper/SalesEntityCommentValidator.php‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
2+
/**
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166
declare(strict_types=1);
177

‎app/code/Magento/Sales/Model/Order/Creditmemo/Comment/Validator.php‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
3-
* Copyright 2025 Adobe
2+
/**
3+
* Copyright 2011 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166
declare(strict_types=1);
177

‎app/code/Magento/Sales/Model/Order/Creditmemo/CommentRepository.php‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
3-
* Copyright 2025 Adobe
2+
/**
3+
* Copyright 2017 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166
declare(strict_types=1);
177

0 commit comments

Comments
 (0)