Skip to content

Commit 4a7368d

Browse files
engcom-Dashengcom-Dash
authored
Merge branch '2.4-develop' into gitignore-generated-unit-test-file
2 parents 32d6773 + 27217d0 commit 4a7368d

File tree

4,065 files changed

+66122
-48546
lines changed

Some content is hidden

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

4,065 files changed

+66122
-48546
lines changed

‎.github/app-projects-boards-automation.config.yaml

Lines changed: 402 additions & 0 deletions
Large diffs are not rendered by default.

‎app/code/Magento/AdminAnalytics/Test/Unit/Condition/CanViewNotificationTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright 2024 Adobe
4+
* All rights reserved.
45
* See COPYING.txt for license details.
56
*/
67
declare(strict_types=1);

‎app/code/Magento/AdminAnalytics/ViewModel/Metadata.php

Lines changed: 3 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 2019 Adobe
4+
* All Rights Reserved.
55
*/
66

77
declare(strict_types=1);
@@ -65,7 +65,7 @@ public function __construct(
6565
Session $authSession,
6666
State $appState,
6767
ScopeConfigInterface $config,
68-
CspNonceProvider $nonceProvider = null
68+
?CspNonceProvider $nonceProvider = null
6969
) {
7070
$this->productMetadata = $productMetadata;
7171
$this->authSession = $authSession;

‎app/code/Magento/AdminAnalytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"sort-packages": true
66
},
77
"require": {
8-
"php": "~8.1.0||~8.2.0||~8.3.0",
8+
"php": "~8.2.0||~8.3.0||~8.4.0",
99
"magento/framework": "*",
1010
"magento/module-backend": "*",
1111
"magento/module-config": "*",

‎app/code/Magento/AdminNotification/Model/Feed.php

Lines changed: 5 additions & 5 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\AdminNotification\Model;
77

@@ -107,10 +107,10 @@ public function __construct(
107107
DeploymentConfig $deploymentConfig,
108108
ProductMetadataInterface $productMetadata,
109109
UrlInterface $urlBuilder,
110-
AbstractResource $resource = null,
111-
AbstractDb $resourceCollection = null,
110+
?AbstractResource $resource = null,
111+
?AbstractDb $resourceCollection = null,
112112
array $data = [],
113-
Escaper $escaper = null
113+
?Escaper $escaper = null
114114
) {
115115
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
116116
$this->_backendConfig = $backendConfig;

‎app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection.php

Lines changed: 4 additions & 4 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 2013 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\AdminNotification\Model\ResourceModel\System\Message;
77

@@ -40,8 +40,8 @@ public function __construct(
4040
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
4141
\Magento\Framework\Event\ManagerInterface $eventManager,
4242
\Magento\Framework\Notification\MessageList $messageList,
43-
\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
44-
\Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
43+
?\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
44+
?\Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
4545
) {
4646
$this->_messageList = $messageList;
4747
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);

‎app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright 2024 Adobe
4+
* All rights reserved.
45
* See COPYING.txt for license details.
56
*/
67
declare(strict_types=1);

‎app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright 2024 Adobe
4+
* All rights reserved.
45
* See COPYING.txt for license details.
56
*/
67
declare(strict_types=1);

‎app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright 2024 Adobe
4+
* All rights reserved.
45
* See COPYING.txt for license details.
56
*/
67
declare(strict_types=1);

‎app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright 2024 Adobe
4+
* All rights reserved.
45
* See COPYING.txt for license details.
56
*/
67
declare(strict_types=1);

0 commit comments

Comments
 (0)