Skip to content

Commit e15fcef

Browse files
author
magento packaging service
committed
Magento Release 2.4.0-p1
1 parent 6729b6e commit e15fcef

File tree

319 files changed

+12868
-4800
lines changed

Some content is hidden

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

319 files changed

+12868
-4800
lines changed

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
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.0",
713
"require": {
814
"php": "~7.3.0||~7.4.0",
915
"magento/framework": "103.0.*",
@@ -12,18 +18,13 @@
1218
"magento/module-ui": "101.2.*",
1319
"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"
2324
],
2425
"psr-4": {
2526
"Magento\\AdminAnalytics\\": ""
2627
}
27-
},
28-
"version": "100.4.0"
28+
}
2929
}
30+

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
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": "*",
@@ -14,18 +20,13 @@
1420
"magento/module-ui": "101.2.*",
1521
"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"
2526
],
2627
"psr-4": {
2728
"Magento\\AdminNotification\\": ""
2829
}
29-
},
30-
"version": "100.4.0"
30+
}
3131
}
32+

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
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.0",
713
"require": {
814
"php": "~7.3.0||~7.4.0",
915
"magento/framework": "103.0.*",
@@ -15,18 +21,13 @@
1521
"magento/module-import-export": "101.0.*",
1622
"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"
2627
],
2728
"psr-4": {
2829
"Magento\\AdvancedPricingImportExport\\": ""
2930
}
30-
},
31-
"version": "100.4.0"
31+
}
3232
}
33+

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
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": {
814
"magento/framework": "103.0.*",
915
"magento/module-backend": "102.0.*",
@@ -15,18 +21,13 @@
1521
"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"
2627
],
2728
"psr-4": {
2829
"Magento\\AdvancedSearch\\": ""
2930
}
30-
},
31-
"version": "100.4.0"
31+
}
3232
}
33+

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
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": {
814
"magento/framework": "103.0.*",
915
"magento/framework-amqp": "100.4.*",
1016
"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"
2122
],
2223
"psr-4": {
2324
"Magento\\Amqp\\": ""
2425
}
25-
},
26-
"version": "100.4.0"
26+
}
2727
}
28+

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
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": {
814
"magento/framework": "103.0.*",
915
"magento/framework-amqp": "100.4.*",
@@ -14,18 +20,13 @@
1420
"magento/module-asynchronous-operations": "100.4.*",
1521
"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"
2526
],
2627
"psr-4": {
2728
"Magento\\AmqpStore\\": ""
2829
}
29-
},
30-
"version": "100.4.0"
30+
}
3131
}
32+

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
{
22
"name": "magento/module-analytics",
33
"description": "N/A",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
9+
"version": "100.4.0",
410
"require": {
511
"php": "~7.3.0||~7.4.0",
612
"magento/module-backend": "102.0.*",
@@ -9,18 +15,13 @@
915
"magento/module-store": "101.1.*",
1016
"magento/framework": "103.0.*"
1117
},
12-
"type": "magento2-module",
13-
"license": [
14-
"OSL-3.0",
15-
"AFL-3.0"
16-
],
1718
"autoload": {
1819
"files": [
1920
"registration.php"
2021
],
2122
"psr-4": {
2223
"Magento\\Analytics\\": ""
2324
}
24-
},
25-
"version": "100.4.0"
25+
}
2626
}
27+

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
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.0",
713
"require": {
814
"magento/framework": "103.0.*",
915
"magento/framework-message-queue": "100.4.*",
@@ -17,18 +23,13 @@
1723
"magento/module-admin-notification": "100.4.*",
1824
"magento/module-logging": "101.2.*"
1925
},
20-
"type": "magento2-module",
21-
"license": [
22-
"OSL-3.0",
23-
"AFL-3.0"
24-
],
2526
"autoload": {
2627
"files": [
2728
"registration.php"
2829
],
2930
"psr-4": {
3031
"Magento\\AsynchronousOperations\\": ""
3132
}
32-
},
33-
"version": "100.4.0"
33+
}
3434
}
35+

‎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

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ class Role extends \Magento\Framework\Model\AbstractModel
3333
*/
3434
protected $_eventPrefix = 'authorization_roles';
3535

36+
/**
37+
* @var string
38+
*/
39+
protected $_cacheTag = 'user_assigned_role';
40+
3641
/**
3742
* @param \Magento\Framework\Model\Context $context
3843
* @param \Magento\Framework\Registry $registry

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
{
22
"name": "magento/module-authorization",
33
"description": "Authorization module provides access to Magento ACL functionality.",
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-p1",
713
"require": {
814
"php": "~7.3.0||~7.4.0",
915
"magento/framework": "103.0.*",
1016
"magento/module-backend": "102.0.*"
1117
},
12-
"type": "magento2-module",
13-
"license": [
14-
"OSL-3.0",
15-
"AFL-3.0"
16-
],
1718
"autoload": {
1819
"files": [
1920
"registration.php"
2021
],
2122
"psr-4": {
2223
"Magento\\Authorization\\": ""
2324
}
24-
},
25-
"version": "100.4.0"
25+
}
2626
}
27+

0 commit comments

Comments
 (0)