Skip to content

Commit 1444857

Browse files
authored
Merge pull request #6659 from magento-commerce/2.3-develop-php74
MC-34856: PHP 7.4 support for 2.3.x
2 parents 7865bf0 + b325d50 commit 1444857

File tree

275 files changed

+1134
-879
lines changed

Some content is hidden

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

275 files changed

+1134
-879
lines changed

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.1.3||~7.2.0||~7.3.0",
8+
"php": "~7.3.0||~7.4.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.1.3||~7.2.0||~7.3.0",
8+
"php": "~7.3.0||~7.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": "~7.1.3||~7.2.0||~7.3.0",
8+
"php": "~7.3.0||~7.4.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.1.3||~7.2.0||~7.3.0"
16+
"php": "~7.3.0||~7.4.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.1.3||~7.2.0||~7.3.0"
11+
"php": "~7.3.0||~7.4.0"
1212
},
1313
"type": "magento2-module",
1414
"license": [

app/code/Magento/AmqpStore/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/module-store": "*",
11-
"php": "~7.1.3||~7.2.0||~7.3.0"
11+
"php": "~7.3.0||~7.4.0"
1212
},
1313
"suggest": {
1414
"magento/module-asynchronous-operations": "*",

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.1.3||~7.2.0||~7.3.0",
5+
"php": "~7.3.0||~7.4.0",
66
"magento/module-backend": "*",
77
"magento/module-config": "*",
88
"magento/module-integration": "*",

app/code/Magento/AsynchronousOperations/Test/Unit/Model/ResourceModel/System/Message/Collection/Synchronized/PluginTest.php

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,19 @@ public function testAfterTo($operationDetails)
159159
public function afterToDataProvider()
160160
{
161161
return [
162-
['operations_successful' => 0,
163-
'operations_failed' => 0,
164-
'operations_total' => 10
162+
[
163+
[
164+
'operations_successful' => 0,
165+
'operations_failed' => 0,
166+
'operations_total' => 10
167+
]
165168
],
166-
['operations_successful' => 1,
167-
'operations_failed' => 2,
168-
'operations_total' => 10
169+
[
170+
[
171+
'operations_successful' => 1,
172+
'operations_failed' => 2,
173+
'operations_total' => 10
174+
]
169175
],
170176
];
171177
}

app/code/Magento/AsynchronousOperations/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"magento/module-authorization": "*",
1111
"magento/module-backend": "*",
1212
"magento/module-ui": "*",
13-
"php": "~7.1.3||~7.2.0||~7.3.0"
13+
"php": "~7.3.0||~7.4.0"
1414
},
1515
"suggest": {
1616
"magento/module-admin-notification": "*",

app/code/Magento/Authorization/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.1.3||~7.2.0||~7.3.0",
8+
"php": "~7.3.0||~7.4.0",
99
"magento/framework": "*",
1010
"magento/module-backend": "*"
1111
},

0 commit comments

Comments
 (0)