Skip to content

Commit cfac88f

Browse files
engcom-Hotelengcom-Hotel
authored
Merge branch '2.4-develop' into 37919-cart-leadingzeros-issue
2 parents 8561b89 + 2217274 commit cfac88f

File tree

2,927 files changed

+23920
-12405
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,927 files changed

+23920
-12405
lines changed

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

+3-3
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

+1-1
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

+5-5
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

+4-4
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

+1-1
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

+1-1
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

+4-4
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

+3-5
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

+1-1
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

+3-3
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();

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"magento/framework": "*",
99
"magento/framework-amqp": "*",
1010
"magento/framework-message-queue": "*",
11-
"php": "~8.2.0||~8.3.0"
11+
"php": "~8.2.0||~8.3.0||~8.4.0"
1212
},
1313
"type": "magento2-module",
1414
"license": [

‎app/code/Magento/Analytics/Model/Config/Backend/CollectionTime.php

+6-6
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 2017 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Analytics\Model\Config\Backend;
77

@@ -23,7 +23,7 @@ class CollectionTime extends Value
2323
/**
2424
* The path to config setting of schedule of collection data cron.
2525
*/
26-
const CRON_SCHEDULE_PATH = 'crontab/default/jobs/analytics_collect_data/schedule/cron_expr';
26+
public const CRON_SCHEDULE_PATH = 'crontab/default/jobs/analytics_collect_data/schedule/cron_expr';
2727

2828
/**
2929
* @var WriterInterface
@@ -46,16 +46,16 @@ public function __construct(
4646
ScopeConfigInterface $config,
4747
TypeListInterface $cacheTypeList,
4848
WriterInterface $configWriter,
49-
AbstractResource $resource = null,
50-
AbstractDb $resourceCollection = null,
49+
?AbstractResource $resource = null,
50+
?AbstractDb $resourceCollection = null,
5151
array $data = []
5252
) {
5353
$this->configWriter = $configWriter;
5454
parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
5555
}
5656

5757
/**
58-
* {@inheritdoc}
58+
* @inheritdoc
5959
*
6060
* {@inheritdoc}. Set schedule setting for cron.
6161
*

‎app/code/Magento/Analytics/Model/Config/Backend/Enabled.php

+5-5
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 2017 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Analytics\Model\Config\Backend;
77

@@ -23,7 +23,7 @@ class Enabled extends Value
2323
/**
2424
* Path to field subscription enabled into config structure.
2525
*/
26-
const XML_ENABLED_CONFIG_STRUCTURE_PATH = 'analytics/general/enabled';
26+
public const XML_ENABLED_CONFIG_STRUCTURE_PATH = 'analytics/general/enabled';
2727

2828
/**
2929
* Service for processing of activation/deactivation MBI subscription.
@@ -48,8 +48,8 @@ public function __construct(
4848
ScopeConfigInterface $config,
4949
TypeListInterface $cacheTypeList,
5050
SubscriptionHandler $subscriptionHandler,
51-
AbstractResource $resource = null,
52-
AbstractDb $resourceCollection = null,
51+
?AbstractResource $resource = null,
52+
?AbstractDb $resourceCollection = null,
5353
array $data = []
5454
) {
5555
$this->subscriptionHandler = $subscriptionHandler;

‎app/code/Magento/Analytics/ReportXml/BatchReportProviderInterface.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/Analytics/ReportXml/DB/ReportValidator.php

+3-3
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 2017 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Analytics\ReportXml\DB;
77

@@ -46,7 +46,7 @@ public function __construct(ConnectionFactory $connectionFactory, QueryFactory $
4646
* @return array
4747
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
4848
*/
49-
public function validate($name, SearchCriteriaInterface $criteria = null)
49+
public function validate($name, ?SearchCriteriaInterface $criteria = null)
5050
{
5151
$query = $this->queryFactory->create($name);
5252
$connection = $this->connectionFactory->getConnection($query->getConnectionName());

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-analytics",
33
"description": "N/A",
44
"require": {
5-
"php": "~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0||~8.4.0",
66
"magento/module-backend": "*",
77
"magento/module-config": "*",
88
"magento/module-integration": "*",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
},
1414
"require": {
15-
"php": "~8.2.0||~8.3.0",
15+
"php": "~8.2.0||~8.3.0||~8.4.0",
1616
"magento/framework": "*"
1717
}
1818
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
},
1414
"require": {
15-
"php": "~8.2.0||~8.3.0",
15+
"php": "~8.2.0||~8.3.0||~8.4.0",
1616
"magento/framework": "*",
1717
"magento/module-application-performance-monitor": "*",
1818
"magento/module-new-relic-reporting": "*"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-async-config",
33
"description": "N/A",
44
"require": {
5-
"php": "~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0||~8.4.0",
66
"magento/framework": "*",
77
"magento/module-config": "*"
88
},

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"magento/module-authorization": "*",
1212
"magento/module-backend": "*",
1313
"magento/module-ui": "*",
14-
"php": "~8.2.0||~8.3.0"
14+
"php": "~8.2.0||~8.3.0||~8.4.0"
1515
},
1616
"suggest": {
1717
"magento/module-admin-notification": "*",

0 commit comments

Comments
 (0)