Skip to content

Commit 8b6d6e5

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'mainline/2.4' into MC-38620
2 parents a1e5689 + 445b0f1 commit 8b6d6e5

File tree

488 files changed

+19578
-6906
lines changed

Some content is hidden

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

488 files changed

+19578
-6906
lines changed

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
{
22
"name": "magento/module-admin-analytics",
33
"description": "N/A",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
49
"config": {
510
"sort-packages": true
611
},
12+
"version": "100.4.1",
713
"require": {
814
"php": "~7.3.0||~7.4.0",
9-
"magento/framework": "*",
10-
"magento/module-backend": "*",
11-
"magento/module-config": "*",
12-
"magento/module-ui": "*",
13-
"magento/module-release-notification": "*"
15+
"magento/framework": "103.0.*",
16+
"magento/module-backend": "102.0.*",
17+
"magento/module-config": "101.2.*",
18+
"magento/module-ui": "101.2.*",
19+
"magento/module-release-notification": "100.4.*"
1420
},
15-
"type": "magento2-module",
16-
"license": [
17-
"OSL-3.0",
18-
"AFL-3.0"
19-
],
2021
"autoload": {
2122
"files": [
2223
"registration.php"
@@ -26,3 +27,4 @@
2627
}
2728
}
2829
}
30+

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
{
22
"name": "magento/module-admin-notification",
33
"description": "N/A",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
49
"config": {
510
"sort-packages": true
611
},
12+
"version": "100.4.0",
713
"require": {
814
"php": "~7.3.0||~7.4.0",
915
"lib-libxml": "*",
10-
"magento/framework": "*",
11-
"magento/module-backend": "*",
12-
"magento/module-media-storage": "*",
13-
"magento/module-store": "*",
14-
"magento/module-ui": "*",
15-
"magento/module-config": "*"
16+
"magento/framework": "103.0.*",
17+
"magento/module-backend": "102.0.*",
18+
"magento/module-media-storage": "100.4.*",
19+
"magento/module-store": "101.1.*",
20+
"magento/module-ui": "101.2.*",
21+
"magento/module-config": "101.2.*"
1622
},
17-
"type": "magento2-module",
18-
"license": [
19-
"OSL-3.0",
20-
"AFL-3.0"
21-
],
2223
"autoload": {
2324
"files": [
2425
"registration.php"
@@ -28,3 +29,4 @@
2829
}
2930
}
3031
}
32+

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

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
{
22
"name": "magento/module-advanced-pricing-import-export",
33
"description": "N/A",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
49
"config": {
510
"sort-packages": true
611
},
12+
"version": "100.4.1",
713
"require": {
814
"php": "~7.3.0||~7.4.0",
9-
"magento/framework": "*",
10-
"magento/module-catalog": "*",
11-
"magento/module-catalog-import-export": "*",
12-
"magento/module-catalog-inventory": "*",
13-
"magento/module-customer": "*",
14-
"magento/module-eav": "*",
15-
"magento/module-import-export": "*",
16-
"magento/module-store": "*"
15+
"magento/framework": "103.0.*",
16+
"magento/module-catalog": "104.0.*",
17+
"magento/module-catalog-import-export": "101.1.*",
18+
"magento/module-catalog-inventory": "100.4.*",
19+
"magento/module-customer": "103.0.*",
20+
"magento/module-eav": "102.1.*",
21+
"magento/module-import-export": "101.0.*",
22+
"magento/module-store": "101.1.*"
1723
},
18-
"type": "magento2-module",
19-
"license": [
20-
"OSL-3.0",
21-
"AFL-3.0"
22-
],
2324
"autoload": {
2425
"files": [
2526
"registration.php"
@@ -29,3 +30,4 @@
2930
}
3031
}
3132
}
33+

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

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
{
22
"name": "magento/module-advanced-search",
33
"description": "N/A",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
49
"config": {
510
"sort-packages": true
611
},
12+
"version": "100.4.0",
713
"require": {
8-
"magento/framework": "*",
9-
"magento/module-backend": "*",
10-
"magento/module-catalog": "*",
11-
"magento/module-catalog-search": "*",
12-
"magento/module-config": "*",
13-
"magento/module-customer": "*",
14-
"magento/module-search": "*",
15-
"magento/module-store": "*",
14+
"magento/framework": "103.0.*",
15+
"magento/module-backend": "102.0.*",
16+
"magento/module-catalog": "104.0.*",
17+
"magento/module-catalog-search": "102.0.*",
18+
"magento/module-config": "101.2.*",
19+
"magento/module-customer": "103.0.*",
20+
"magento/module-search": "101.1.*",
21+
"magento/module-store": "101.1.*",
1622
"php": "~7.3.0||~7.4.0"
1723
},
18-
"type": "magento2-module",
19-
"license": [
20-
"OSL-3.0",
21-
"AFL-3.0"
22-
],
2324
"autoload": {
2425
"files": [
2526
"registration.php"
@@ -29,3 +30,4 @@
2930
}
3031
}
3132
}
33+

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
{
22
"name": "magento/module-amqp",
33
"description": "N/A",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
49
"config": {
510
"sort-packages": true
611
},
12+
"version": "100.4.0",
713
"require": {
8-
"magento/framework": "*",
9-
"magento/framework-amqp": "*",
10-
"magento/framework-message-queue": "*",
14+
"magento/framework": "103.0.*",
15+
"magento/framework-amqp": "100.4.*",
16+
"magento/framework-message-queue": "100.4.*",
1117
"php": "~7.3.0||~7.4.0"
1218
},
13-
"type": "magento2-module",
14-
"license": [
15-
"OSL-3.0",
16-
"AFL-3.0"
17-
],
1819
"autoload": {
1920
"files": [
2021
"registration.php"
@@ -24,3 +25,4 @@
2425
}
2526
}
2627
}
28+

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
{
22
"name": "magento/module-amqp-store",
33
"description": "N/A",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
49
"config": {
510
"sort-packages": true
611
},
12+
"version": "100.4.0",
713
"require": {
8-
"magento/framework": "*",
9-
"magento/framework-amqp": "*",
10-
"magento/module-store": "*",
14+
"magento/framework": "103.0.*",
15+
"magento/framework-amqp": "100.4.*",
16+
"magento/module-store": "101.1.*",
1117
"php": "~7.3.0||~7.4.0"
1218
},
1319
"suggest": {
14-
"magento/module-asynchronous-operations": "*",
15-
"magento/framework-message-queue": "*"
20+
"magento/module-asynchronous-operations": "100.4.*",
21+
"magento/framework-message-queue": "100.4.*"
1622
},
17-
"type": "magento2-module",
18-
"license": [
19-
"OSL-3.0",
20-
"AFL-3.0"
21-
],
2223
"autoload": {
2324
"files": [
2425
"registration.php"
@@ -28,3 +29,4 @@
2829
}
2930
}
3031
}
32+

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
{
22
"name": "magento/module-analytics",
33
"description": "N/A",
4-
"require": {
5-
"php": "~7.3.0||~7.4.0",
6-
"magento/module-backend": "*",
7-
"magento/module-config": "*",
8-
"magento/module-integration": "*",
9-
"magento/module-store": "*",
10-
"magento/framework": "*"
11-
},
124
"type": "magento2-module",
135
"license": [
146
"OSL-3.0",
157
"AFL-3.0"
168
],
9+
"version": "100.4.1",
10+
"require": {
11+
"php": "~7.3.0||~7.4.0",
12+
"magento/module-backend": "102.0.*",
13+
"magento/module-config": "101.2.*",
14+
"magento/module-integration": "100.4.*",
15+
"magento/module-store": "101.1.*",
16+
"magento/framework": "103.0.*"
17+
},
1718
"autoload": {
1819
"files": [
1920
"registration.php"
@@ -23,3 +24,4 @@
2324
}
2425
}
2526
}
27+

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
{
22
"name": "magento/module-asynchronous-operations",
33
"description": "N/A",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
49
"config": {
510
"sort-packages": true
611
},
12+
"version": "100.4.1",
713
"require": {
8-
"magento/framework": "*",
9-
"magento/framework-message-queue": "*",
10-
"magento/framework-bulk": "*",
11-
"magento/module-authorization": "*",
12-
"magento/module-backend": "*",
13-
"magento/module-ui": "*",
14+
"magento/framework": "103.0.*",
15+
"magento/framework-message-queue": "100.4.*",
16+
"magento/framework-bulk": "101.0.*",
17+
"magento/module-authorization": "100.4.*",
18+
"magento/module-backend": "102.0.*",
19+
"magento/module-ui": "101.2.*",
1420
"php": "~7.3.0||~7.4.0"
1521
},
1622
"suggest": {
17-
"magento/module-admin-notification": "*",
23+
"magento/module-admin-notification": "100.4.*",
1824
"magento/module-logging": "*"
1925
},
20-
"type": "magento2-module",
21-
"license": [
22-
"OSL-3.0",
23-
"AFL-3.0"
24-
],
2526
"autoload": {
2627
"files": [
2728
"registration.php"
@@ -31,3 +32,4 @@
3132
}
3233
}
3334
}
35+

‎app/code/Magento/Authorization/Model/CompositeUserContext.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ protected function add(UserContextInterface $userContext)
5656
}
5757

5858
/**
59-
* {@inheritdoc}
59+
* @inheritDoc
6060
*/
6161
public function getUserId()
6262
{
6363
return $this->getUserContext() ? $this->getUserContext()->getUserId() : null;
6464
}
6565

6666
/**
67-
* {@inheritdoc}
67+
* @inheritDoc
6868
*/
6969
public function getUserType()
7070
{
@@ -78,7 +78,7 @@ public function getUserType()
7878
*/
7979
protected function getUserContext()
8080
{
81-
if ($this->chosenUserContext === null) {
81+
if (!$this->chosenUserContext) {
8282
/** @var UserContextInterface $userContext */
8383
foreach ($this->userContexts as $userContext) {
8484
if ($userContext->getUserType() && $userContext->getUserId() !== null) {

‎app/code/Magento/Authorization/Model/ResourceModel/Role.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ protected function _afterDelete(\Magento\Framework\Model\AbstractModel $role)
119119

120120
$connection->delete($this->_ruleTable, ['role_id = ?' => (int)$role->getId()]);
121121

122+
$this->_cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [\Magento\Backend\Block\Menu::CACHE_TAGS]);
123+
122124
return $this;
123125
}
124126

0 commit comments

Comments
 (0)