Skip to content

Commit 387bf8e

Browse files
bubasumabubasuma
authored
Merge branch 'magento-commerce:2.4-develop' into ACP2E-1319
2 parents 740e276 + 9e4b4b2 commit 387bf8e

File tree

249 files changed

+1272
-654
lines changed

Some content is hidden

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

249 files changed

+1272
-654
lines changed

‎app/bootstrap.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
#ini_set('display_errors', 1);
1515

1616
/* PHP version validation */
17-
if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 70400) {
17+
if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 80100) {
1818
if (PHP_SAPI == 'cli') {
19-
echo 'Magento supports PHP 7.4.0 or later. ' .
19+
echo 'Magento supports PHP 8.1.0 or later. ' .
2020
'Please read https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements-tech.html';
2121
} else {
2222
echo <<<HTML
2323
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
24-
<p>Magento supports PHP 7.4.0 or later. Please read
24+
<p>Magento supports PHP 8.1.0 or later. Please read
2525
<a target="_blank" href="https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements-tech.html">
2626
Magento System Requirements</a>.
2727
</div>

‎app/code/Magento/AdminAdobeIms/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": "~7.4.0||~8.1.0",
8+
"php": "~8.1.0||~8.2.0",
99
"magento/framework": "*",
1010
"magento/module-adobe-ims": "*",
1111
"magento/module-adobe-ims-api": "*",

‎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": "~7.4.0||~8.1.0",
8+
"php": "~8.1.0||~8.2.0",
99
"magento/framework": "*",
1010
"magento/module-backend": "*",
1111
"magento/module-config": "*",

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-ims",
33
"description": "Magento module responsible for authentication to Adobe services",
44
"require": {
5-
"php": "~7.4.0||~8.1.0",
5+
"php": "~8.1.0||~8.2.0",
66
"magento/framework": "*",
77
"magento/module-adobe-ims-api": "*",
88
"magento/module-authorization": "*",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-ims-api",
33
"description": "Implementation of Magento module responsible for authentication to Adobe services",
44
"require": {
5-
"php": "~7.4.0||~8.1.0",
5+
"php": "~8.1.0||~8.2.0",
66
"magento/framework": "*"
77
},
88
"type": "magento2-module",

‎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": "~7.4.0||~8.1.0",
8+
"php": "~8.1.0||~8.2.0",
99
"magento/framework": "*",
1010
"magento/module-catalog": "*",
1111
"magento/module-catalog-import-export": "*",

‎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": "~7.4.0||~8.1.0"
16+
"php": "~8.1.0||~8.2.0"
1717
},
1818
"type": "magento2-module",
1919
"license": [

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

Lines changed: 1 addition & 1 deletion
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": "~7.4.0||~8.1.0"
11+
"php": "~8.1.0||~8.2.0"
1212
},
1313
"type": "magento2-module",
1414
"license": [

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

Lines changed: 1 addition & 1 deletion
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": "~7.4.0||~8.1.0",
5+
"php": "~8.1.0||~8.2.0",
66
"magento/module-backend": "*",
77
"magento/module-config": "*",
88
"magento/module-integration": "*",

0 commit comments

Comments
 (0)