Skip to content

Commit b2b606e

Browse files
pawan-adobe-securitypawan-adobe-security
committed
Merge branch 'AC-10815' into cia-2.4.8-beta1-develop-bugfix-05202024
2 parents c84c470 + 332b79a commit b2b606e

File tree

141 files changed

+237
-1552
lines changed

Some content is hidden

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

141 files changed

+237
-1552
lines changed

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

Lines changed: 1 addition & 12 deletions
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‎

Lines changed: 1 addition & 12 deletions
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‎

Lines changed: 1 addition & 12 deletions
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‎

Lines changed: 0 additions & 11 deletions
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‎

Lines changed: 0 additions & 11 deletions
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‎

Lines changed: 1 addition & 12 deletions
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‎

Lines changed: 0 additions & 9 deletions
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‎

Lines changed: 1 addition & 12 deletions
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/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ protected function setUp(): void
184184
$this->customOptionFactoryMock
185185
]
186186
];
187-
$this->prepareObjectManager($objects);
187+
$this->objectManager->prepareObjectManager($objects);
188188

189189
$this->helper = $this->objectManager->getObject(
190190
Helper::class,
@@ -772,22 +772,4 @@ private function assembleProductRepositoryMock($links)
772772
->method('getById')
773773
->willReturnMap($repositoryReturnMap);
774774
}
775-
776-
/**
777-
* @param $map
778-
*/
779-
private function prepareObjectManager($map)
780-
{
781-
$objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
782-
->addMethods(['getInstance'])
783-
->onlyMethods(['get'])
784-
->getMockForAbstractClass();
785-
786-
$objectManagerMock->method('getInstance')->willReturnSelf();
787-
$objectManagerMock->method('get')->willReturnMap($map);
788-
789-
$reflectionProperty = new \ReflectionProperty(\Magento\Framework\App\ObjectManager::class, '_instance');
790-
$reflectionProperty->setAccessible(true);
791-
$reflectionProperty->setValue($objectManagerMock);
792-
}
793775
}

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

Lines changed: 16 additions & 27 deletions
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

0 commit comments

Comments
 (0)