Skip to content

Commit d4f64e8

Browse files
sidolovsidolov
authored
Merge branch '2.4.7-develop' into spartans_pr_29032024_AC-11661
2 parents 92a27de + b645958 commit d4f64e8

File tree

125 files changed

+164
-1476
lines changed

Some content is hidden

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

125 files changed

+164
-1476
lines changed

‎app/code/Magento/AdvancedSearch/Model/DataProvider/AutocompleteSuggestions.php

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
<?php
2-
/************************************************************************
3-
*
2+
/**
43
* Copyright 2023 Adobe
54
* All Rights Reserved.
6-
*
7-
* NOTICE: All information contained herein is, and remains
8-
* the property of Adobe and its suppliers, if any. The intellectual
9-
* and technical concepts contained herein are proprietary to Adobe
10-
* and its suppliers and are protected by all applicable intellectual
11-
* property laws, including trade secret and copyright laws.
12-
* Dissemination of this information or reproduction of this material
13-
* is strictly forbidden unless prior written permission is obtained
14-
* from Adobe.
15-
* ***********************************************************************
165
*/
176
declare(strict_types=1);
187

‎app/code/Magento/AdvancedSearch/Test/Unit/Model/DataProvider/AutocompleteSuggestionsTest.php

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
<?php
2-
/************************************************************************
3-
*
2+
/**
43
* Copyright 2023 Adobe
54
* All Rights Reserved.
6-
*
7-
* NOTICE: All information contained herein is, and remains
8-
* the property of Adobe and its suppliers, if any. The intellectual
9-
* and technical concepts contained herein are proprietary to Adobe
10-
* and its suppliers and are protected by all applicable intellectual
11-
* property laws, including trade secret and copyright laws.
12-
* Dissemination of this information or reproduction of this material
13-
* is strictly forbidden unless prior written permission is obtained
14-
* from Adobe.
15-
* ***********************************************************************
165
*/
176
declare(strict_types=1);
187

‎app/code/Magento/Catalog/Api/ProductAttributeIsFilterableManagementInterface.php

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
<?php
2-
/************************************************************************
3-
*
2+
/**
43
* Copyright 2023 Adobe
54
* All Rights Reserved.
6-
*
7-
* NOTICE: All information contained herein is, and remains
8-
* the property of Adobe and its suppliers, if any. The intellectual
9-
* and technical concepts contained herein are proprietary to Adobe
10-
* and its suppliers and are protected by all applicable intellectual
11-
* property laws, including trade secret and copyright laws.
12-
* Dissemination of this information or reproduction of this material
13-
* is strictly forbidden unless prior written permission is obtained
14-
* from Adobe.
15-
* ************************************************************************
165
*/
176
declare(strict_types=1);
187

‎app/code/Magento/Catalog/Model/Attribute/Backend/WebsiteSpecific/Scheduler.php

-11
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
<?php
22
/**
3-
* ADOBE CONFIDENTIAL
4-
*
53
* Copyright 2023 Adobe
64
* All Rights Reserved.
7-
*
8-
* NOTICE: All information contained herein is, and remains
9-
* the property of Adobe and its suppliers, if any. The intellectual
10-
* and technical concepts contained herein are proprietary to Adobe
11-
* and its suppliers and are protected by all applicable intellectual
12-
* property laws, including trade secret and copyright laws.
13-
* Dissemination of this information or reproduction of this material
14-
* is strictly forbidden unless prior written permission is obtained
15-
* from Adobe.
165
*/
176
declare(strict_types=1);
187

‎app/code/Magento/Catalog/Model/Attribute/Backend/WebsiteSpecific/ValueSynchronizer.php

-11
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
<?php
22
/**
3-
* ADOBE CONFIDENTIAL
4-
*
53
* Copyright 2023 Adobe
64
* All Rights Reserved.
7-
*
8-
* NOTICE: All information contained herein is, and remains
9-
* the property of Adobe and its suppliers, if any. The intellectual
10-
* and technical concepts contained herein are proprietary to Adobe
11-
* and its suppliers and are protected by all applicable intellectual
12-
* property laws, including trade secret and copyright laws.
13-
* Dissemination of this information or reproduction of this material
14-
* is strictly forbidden unless prior written permission is obtained
15-
* from Adobe.
165
*/
176
declare(strict_types=1);
187

‎app/code/Magento/Catalog/Model/Product/Attribute/IsFilterableManagement.php

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
<?php
2-
/************************************************************************
3-
*
2+
/**
43
* Copyright 2023 Adobe
54
* All Rights Reserved.
6-
*
7-
* NOTICE: All information contained herein is, and remains
8-
* the property of Adobe and its suppliers, if any. The intellectual
9-
* and technical concepts contained herein are proprietary to Adobe
10-
* and its suppliers and are protected by all applicable intellectual
11-
* property laws, including trade secret and copyright laws.
12-
* Dissemination of this information or reproduction of this material
13-
* is strictly forbidden unless prior written permission is obtained
14-
* from Adobe.
15-
* ************************************************************************
165
*/
176
declare(strict_types=1);
187

‎app/code/Magento/Catalog/Test/Fixture/ProductStock.php

-9
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
/**
33
* Copyright 2023 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 from
13-
* Adobe.
145
*/
156
declare(strict_types=1);
167

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckSpecialPriceWithCustomOptionAndTaxTest.xml

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/************************************************************************
4-
*
3+
/**
54
* Copyright 2023 Adobe
65
* All Rights Reserved.
7-
*
8-
* NOTICE: All information contained herein is, and remains
9-
* the property of Adobe and its suppliers, if any. The intellectual
10-
* and technical concepts contained herein are proprietary to Adobe
11-
* and its suppliers and are protected by all applicable intellectual
12-
* property laws, including trade secret and copyright laws.
13-
* Dissemination of this information or reproduction of this material
14-
* is strictly forbidden unless prior written permission is obtained
15-
* from Adobe.
16-
* ************************************************************************
176
*/
187
-->
198

‎app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js

+16-27
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
1-
/************************************************************************
2-
*
1+
/**
32
* Copyright 2018 Adobe
43
* 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-
* ***********************************************************************
154
*/
165

176
define([
@@ -47,21 +36,21 @@ define([
4736
return function (config) {
4837

4938
let options = {
50-
dataUrl: config.dataUrl,
51-
divId: config.divId,
52-
rootVisible: config.rootVisible,
53-
useAjax: config.useAjax,
54-
currentNodeId: config.currentNodeId,
55-
jsFormObject: window[config.jsFormObject],
56-
name: config.name,
57-
checked: config.checked,
58-
allowDrop: config.allowDrop,
59-
rootId: config.rootId,
60-
expanded: config.expanded,
61-
categoryId: config.categoryId,
62-
treeJson: addLastNodeProperty(config.treeJson)
63-
},
64-
checkedNodes = [];
39+
dataUrl: config.dataUrl,
40+
divId: config.divId,
41+
rootVisible: config.rootVisible,
42+
useAjax: config.useAjax,
43+
currentNodeId: config.currentNodeId,
44+
jsFormObject: window[config.jsFormObject],
45+
name: config.name,
46+
checked: config.checked,
47+
allowDrop: config.allowDrop,
48+
rootId: config.rootId,
49+
expanded: config.expanded,
50+
categoryId: config.categoryId,
51+
treeJson: addLastNodeProperty(config.treeJson)
52+
},
53+
checkedNodes = [];
6554

6655
/**
6756
* Get the jstree element by its ID

‎app/code/Magento/CatalogCustomerGraphQl/Test/Unit/Model/Resolver/PriceTiersTest.php

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
<?php
2-
/************************************************************************
3-
*
2+
/**
43
* Copyright 2023 Adobe
54
* All Rights Reserved.
6-
*
7-
* NOTICE: All information contained herein is, and remains
8-
* the property of Adobe and its suppliers, if any. The intellectual
9-
* and technical concepts contained herein are proprietary to Adobe
10-
* and its suppliers and are protected by all applicable intellectual
11-
* property laws, including trade secret and copyright laws.
12-
* Dissemination of this information or reproduction of this material
13-
* is strictly forbidden unless prior written permission is obtained
14-
* from Adobe.
15-
* ************************************************************************
165
*/
176
declare(strict_types=1);
187

‎app/code/Magento/CatalogUrlRewrite/Model/GetAttributeByStore.php

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
<?php
2-
/************************************************************************
3-
*
2+
/**
43
* Copyright 2023 Adobe
54
* All Rights Reserved.
6-
*
7-
* NOTICE: All information contained herein is, and remains
8-
* the property of Adobe and its suppliers, if any. The intellectual
9-
* and technical concepts contained herein are proprietary to Adobe
10-
* and its suppliers and are protected by all applicable intellectual
11-
* property laws, including trade secret and copyright laws.
12-
* Dissemination of this information or reproduction of this material
13-
* is strictly forbidden unless prior written permission is obtained
14-
* from Adobe.
15-
* ************************************************************************
165
*/
176
declare(strict_types=1);
187
namespace Magento\CatalogUrlRewrite\Model;

‎app/code/Magento/CatalogUrlRewrite/Model/GetVisibleForStores.php

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
<?php
2-
/************************************************************************
3-
*
2+
/**
43
* Copyright 2023 Adobe
54
* All Rights Reserved.
6-
*
7-
* NOTICE: All information contained herein is, and remains
8-
* the property of Adobe and its suppliers, if any. The intellectual
9-
* and technical concepts contained herein are proprietary to Adobe
10-
* and its suppliers and are protected by all applicable intellectual
11-
* property laws, including trade secret and copyright laws.
12-
* Dissemination of this information or reproduction of this material
13-
* is strictly forbidden unless prior written permission is obtained
14-
* from Adobe.
15-
* ************************************************************************
165
*/
176
declare(strict_types=1);
187
namespace Magento\CatalogUrlRewrite\Model;

‎app/code/Magento/Customer/Model/AccountManagement/Authenticate.php

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
<?php
2-
/************************************************************************
3-
*
2+
/**
43
* Copyright 2023 Adobe
54
* All Rights Reserved.
6-
*
7-
* NOTICE: All information contained herein is, and remains
8-
* the property of Adobe and its suppliers, if any. The intellectual
9-
* and technical concepts contained herein are proprietary to Adobe
10-
* and its suppliers and are protected by all applicable intellectual
11-
* property laws, including trade secret and copyright laws.
12-
* Dissemination of this information or reproduction of this material
13-
* is strictly forbidden unless prior written permission is obtained
14-
* from Adobe.
15-
* ************************************************************************
165
*/
176
declare(strict_types=1);
187

‎app/code/Magento/Customer/Model/Cache/GroupExcludedWebsiteCache.php

-9
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
/**
33
* Copyright 2023 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 from
13-
* Adobe.
145
*/
156
declare(strict_types=1);
167

‎app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php

-9
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
/**
33
* Copyright 2023 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/Customer/Test/Unit/Model/Address/CustomerAddressDataProviderTest.php

-9
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
/**
33
* Copyright 2023 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/CustomerGraphQl/Model/Resolver/ConfirmEmail.php

-9
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
/**
33
* Copyright 2024 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 from
13-
* Adobe.
145
*/
156
declare(strict_types=1);
167

‎app/code/Magento/CustomerGraphQl/Model/Resolver/ConfirmationStatus.php

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
<?php
2-
/************************************************************************
3-
*
2+
/**
43
* Copyright 2024 Adobe
54
* All Rights Reserved.
6-
*
7-
* NOTICE: All information contained herein is, and remains
8-
* the property of Adobe and its suppliers, if any. The intellectual
9-
* and technical concepts contained herein are proprietary to Adobe
10-
* and its suppliers and are protected by all applicable intellectual
11-
* property laws, including trade secret and copyright laws.
12-
* Dissemination of this information or reproduction of this material
13-
* is strictly forbidden unless prior written permission is obtained
14-
* from Adobe.
15-
* ************************************************************************
165
*/
176
declare(strict_types=1);
187

‎app/code/Magento/Fedex/Model/Carrier.php

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
<?php
2-
/************************************************************************
3-
*
2+
/**
43
* Copyright 2023 Adobe
54
* All Rights Reserved.
6-
*
7-
* NOTICE: All information contained herein is, and remains
8-
* the property of Adobe and its suppliers, if any. The intellectual
9-
* and technical concepts contained herein are proprietary to Adobe
10-
* and its suppliers and are protected by all applicable intellectual
11-
* property laws, including trade secret and copyright laws.
12-
* Dissemination of this information or reproduction of this material
13-
* is strictly forbidden unless prior written permission is obtained
14-
* from Adobe.
15-
* ***********************************************************************
165
*/
176

187
namespace Magento\Fedex\Model;

0 commit comments

Comments
 (0)