Skip to content

Commit a2342d5

Browse files
aplapanaaplapana
committed
Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into PR-2024-12-03
2 parents ce8665d + 6340fa1 commit a2342d5

File tree

2,082 files changed

+6211
-6401
lines changed

Some content is hidden

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

2,082 files changed

+6211
-6401
lines changed

‎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.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/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.2.0||~8.3.0",
8+
"php": "~8.2.0||~8.3.0||~8.4.0",
99
"lib-libxml": "*",
1010
"magento/framework": "*",
1111
"magento/module-backend": "*",

‎app/code/Magento/AdvancedPricingImportExport/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.2.0||~8.3.0",
8+
"php": "~8.2.0||~8.3.0||~8.4.0",
99
"magento/framework": "*",
1010
"magento/module-catalog": "*",
1111
"magento/module-catalog-import-export": "*",

‎app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.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 2015 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\AdvancedSearch\Model\ResourceModel;
77

@@ -67,8 +67,8 @@ public function __construct(
6767
StoreManagerInterface $storeManager,
6868
MetadataPool $metadataPool,
6969
$connectionName = null,
70-
TableResolver $tableResolver = null,
71-
DimensionCollectionFactory $dimensionCollectionFactory = null
70+
?TableResolver $tableResolver = null,
71+
?DimensionCollectionFactory $dimensionCollectionFactory = null
7272
) {
7373
parent::__construct($context, $connectionName);
7474
$this->storeManager = $storeManager;

‎app/code/Magento/AdvancedSearch/Model/ResourceModel/Search/Grid/Collection.php

Lines changed: 3 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 2015 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\AdvancedSearch\Model\ResourceModel\Search\Grid;
77

@@ -12,8 +12,6 @@
1212
class Collection extends \Magento\Search\Model\ResourceModel\Query\Collection
1313
{
1414
/**
15-
* Registry manager
16-
*
1715
* @var \Magento\Framework\Registry
1816
*/
1917
protected $_registryManager;
@@ -37,7 +35,7 @@ public function __construct(
3735
\Magento\Store\Model\StoreManagerInterface $storeManager,
3836
\Magento\Framework\DB\Helper $resourceHelper,
3937
\Magento\Framework\Registry $registry,
40-
\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
38+
?\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
4139
$resource = null
4240
) {
4341
$this->_registryManager = $registry;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"magento/module-customer": "*",
1414
"magento/module-search": "*",
1515
"magento/module-store": "*",
16-
"php": "~8.2.0||~8.3.0"
16+
"php": "~8.2.0||~8.3.0||~8.4.0"
1717
},
1818
"type": "magento2-module",
1919
"license": [

‎app/code/Magento/Amqp/Setup/ConnectionValidator.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 2015 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Amqp\Setup;
77

@@ -45,7 +45,7 @@ public function isConnectionValid(
4545
$password = '',
4646
$virtualHost = '',
4747
bool $ssl = false,
48-
array $sslOptions = null
48+
?array $sslOptions = null
4949
) {
5050
try {
5151
$options = new FactoryOptions();

0 commit comments

Comments
 (0)