Skip to content

Commit 41847a2

Browse files
committed
Merge branch '2.4-develop' of https://github.com/magento/magento2ce into ACP2E-257
2 parents 6f28ff5 + 01c23b1 commit 41847a2

File tree

336 files changed

+2499
-406
lines changed

Some content is hidden

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

336 files changed

+2499
-406
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.4.0||~8.0.0||~8.1.0",
8+
"php": "~7.4.0||~8.1.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.0.0||~8.1.0",
8+
"php": "~7.4.0||~8.1.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.4.0||~8.0.0||~8.1.0",
8+
"php": "~7.4.0||~8.1.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.0.0||~8.1.0"
16+
"php": "~7.4.0||~8.1.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.0.0||~8.1.0"
11+
"php": "~7.4.0||~8.1.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.4.0||~8.0.0||~8.1.0"
11+
"php": "~7.4.0||~8.1.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.4.0||~8.0.0||~8.1.0",
5+
"php": "~7.4.0||~8.1.0",
66
"magento/module-backend": "*",
77
"magento/module-config": "*",
88
"magento/module-integration": "*",

app/code/Magento/AsynchronousOperations/composer.json

Lines changed: 1 addition & 1 deletion
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": "~7.4.0||~8.0.0||~8.1.0"
14+
"php": "~7.4.0||~8.1.0"
1515
},
1616
"suggest": {
1717
"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.4.0||~8.0.0||~8.1.0",
8+
"php": "~7.4.0||~8.1.0",
99
"magento/framework": "*",
1010
"magento/module-backend": "*"
1111
},

app/code/Magento/AwsS3/Test/Mftf/Helper/FileAssertions.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,18 @@ public function copy($source, $destination): void
9999
$this->helperInstance->copy($this->extractFilePath($source), $this->extractFilePath($destination));
100100
}
101101

102+
/**
103+
* {@inheritDoc}
104+
*
105+
* @param string $source - path to local file or json structure with paths by storage type.
106+
* @param string $destination - path to file or json structure with paths by storage type.
107+
* @throws \Magento\Framework\Exception\FileSystemException
108+
*/
109+
public function copyFromLocal($source, $destination): void
110+
{
111+
$this->helperInstance->copyFromLocal($this->extractFilePath($source), $this->extractFilePath($destination));
112+
}
113+
102114
/**
103115
* Create directory in the storage
104116
*

0 commit comments

Comments
 (0)