Skip to content

Commit 214647d

Browse files
author
magento packaging service
committed
Magento Release 2.4.8-p3
1 parent bed72bd commit 214647d

File tree

875 files changed

+135130
-7888
lines changed

Some content is hidden

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

875 files changed

+135130
-7888
lines changed

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
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.7",
713
"require": {
814
"php": "~8.2.0||~8.3.0||~8.4.0",
9-
"magento/framework": "*",
10-
"magento/module-backend": "*",
11-
"magento/module-config": "*",
12-
"magento/module-store": "*",
13-
"magento/module-ui": "*",
14-
"magento/module-release-notification": "*",
15-
"magento/module-csp": "*"
15+
"magento/framework": "103.0.*",
16+
"magento/module-backend": "102.0.*",
17+
"magento/module-config": "101.2.*",
18+
"magento/module-store": "101.1.*",
19+
"magento/module-ui": "101.2.*",
20+
"magento/module-release-notification": "100.4.*",
21+
"magento/module-csp": "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/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.7",
713
"require": {
814
"php": "~8.2.0||~8.3.0||~8.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: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
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.8",
713
"require": {
814
"php": "~8.2.0||~8.3.0||~8.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": "*",
17-
"magento/module-directory": "*"
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.*",
23+
"magento/module-directory": "100.4.*"
1824
},
19-
"type": "magento2-module",
20-
"license": [
21-
"OSL-3.0",
22-
"AFL-3.0"
23-
],
2425
"autoload": {
2526
"files": [
2627
"registration.php"
@@ -30,3 +31,4 @@
3031
}
3132
}
3233
}
34+

‎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.6",
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": "~8.2.0||~8.3.0||~8.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/Setup/ConfigOptionsList.php‎

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2018 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Amqp\Setup;
77

8+
use Magento\Framework\App\DeploymentConfig;
89
use Magento\Framework\Config\Data\ConfigData;
910
use Magento\Framework\Config\File\ConfigFilePool;
1011
use Magento\Framework\Setup\ConfigOptionsListInterface;
1112
use Magento\Framework\Setup\Option\TextConfigOption;
12-
use Magento\Framework\App\DeploymentConfig;
1313

1414
/**
1515
* Deployment configuration options needed for Setup application
@@ -19,34 +19,35 @@ class ConfigOptionsList implements ConfigOptionsListInterface
1919
/**
2020
* Input key for the options
2121
*/
22-
const INPUT_KEY_QUEUE_AMQP_HOST = 'amqp-host';
23-
const INPUT_KEY_QUEUE_AMQP_PORT = 'amqp-port';
24-
const INPUT_KEY_QUEUE_AMQP_USER = 'amqp-user';
25-
const INPUT_KEY_QUEUE_AMQP_PASSWORD = 'amqp-password';
26-
const INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST = 'amqp-virtualhost';
27-
const INPUT_KEY_QUEUE_AMQP_SSL = 'amqp-ssl';
28-
const INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS = 'amqp-ssl-options';
22+
public const INPUT_KEY_QUEUE_AMQP_HOST = 'amqp-host';
23+
public const INPUT_KEY_QUEUE_AMQP_PORT = 'amqp-port';
24+
public const INPUT_KEY_QUEUE_AMQP_USER = 'amqp-user';
25+
public const INPUT_KEY_QUEUE_AMQP_PASSWORD = 'amqp-password';
26+
public const INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST = 'amqp-virtualhost';
27+
public const INPUT_KEY_QUEUE_AMQP_SSL = 'amqp-ssl';
28+
public const INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS = 'amqp-ssl-options';
29+
public const INPUT_KEY_QUEUE_DEFAULT_CONNECTION ='queue-default-connection';
2930

3031
/**
3132
* Path to the values in the deployment config
3233
*/
33-
const CONFIG_PATH_QUEUE_AMQP_HOST = 'queue/amqp/host';
34-
const CONFIG_PATH_QUEUE_AMQP_PORT = 'queue/amqp/port';
35-
const CONFIG_PATH_QUEUE_AMQP_USER = 'queue/amqp/user';
36-
const CONFIG_PATH_QUEUE_AMQP_PASSWORD = 'queue/amqp/password';
37-
const CONFIG_PATH_QUEUE_AMQP_VIRTUAL_HOST = 'queue/amqp/virtualhost';
38-
const CONFIG_PATH_QUEUE_AMQP_SSL = 'queue/amqp/ssl';
39-
const CONFIG_PATH_QUEUE_AMQP_SSL_OPTIONS = 'queue/amqp/ssl_options';
34+
public const CONFIG_PATH_QUEUE_AMQP_HOST = 'queue/amqp/host';
35+
public const CONFIG_PATH_QUEUE_AMQP_PORT = 'queue/amqp/port';
36+
public const CONFIG_PATH_QUEUE_AMQP_USER = 'queue/amqp/user';
37+
public const CONFIG_PATH_QUEUE_AMQP_PASSWORD = 'queue/amqp/password';
38+
public const CONFIG_PATH_QUEUE_AMQP_VIRTUAL_HOST = 'queue/amqp/virtualhost';
39+
public const CONFIG_PATH_QUEUE_AMQP_SSL = 'queue/amqp/ssl';
40+
public const CONFIG_PATH_QUEUE_AMQP_SSL_OPTIONS = 'queue/amqp/ssl_options';
4041

4142
/**
4243
* Default values
4344
*/
44-
const DEFAULT_AMQP_HOST = '';
45-
const DEFAULT_AMQP_PORT = '5672';
46-
const DEFAULT_AMQP_USER = '';
47-
const DEFAULT_AMQP_PASSWORD = '';
48-
const DEFAULT_AMQP_VIRTUAL_HOST = '/';
49-
const DEFAULT_AMQP_SSL = '';
45+
public const DEFAULT_AMQP_HOST = '';
46+
public const DEFAULT_AMQP_PORT = '5672';
47+
public const DEFAULT_AMQP_USER = '';
48+
public const DEFAULT_AMQP_PASSWORD = '';
49+
public const DEFAULT_AMQP_VIRTUAL_HOST = '/';
50+
public const DEFAULT_AMQP_SSL = '';
5051

5152
/**
5253
* @var ConnectionValidator
@@ -64,7 +65,7 @@ public function __construct(ConnectionValidator $connectionValidator)
6465
}
6566

6667
/**
67-
* {@inheritdoc}
68+
* @inheritdoc
6869
*/
6970
public function getOptions()
7071
{
@@ -122,7 +123,7 @@ public function getOptions()
122123
}
123124

124125
/**
125-
* {@inheritdoc}
126+
* @inheritdoc
126127
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
127128
*/
128129
public function createConfig(array $data, DeploymentConfig $deploymentConfig)
@@ -170,7 +171,7 @@ public function createConfig(array $data, DeploymentConfig $deploymentConfig)
170171
}
171172

172173
/**
173-
* {@inheritdoc}
174+
* @inheritdoc
174175
*/
175176
public function validate(array $options, DeploymentConfig $deploymentConfig)
176177
{
@@ -205,6 +206,11 @@ public function validate(array $options, DeploymentConfig $deploymentConfig)
205206
if (!$result) {
206207
$errors[] = "Could not connect to the Amqp Server.";
207208
}
209+
210+
if (isset($options[self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION])
211+
&& $options[self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION] !== 'amqp') {
212+
$errors = [];
213+
}
208214
}
209215

210216
return $errors;

‎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.5-p3",
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": "~8.2.0||~8.3.0||~8.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/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": "~8.2.0||~8.3.0||~8.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.8",
10+
"require": {
11+
"php": "~8.2.0||~8.3.0||~8.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/ApplicationPerformanceMonitor/composer.json‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
{
2-
"name": "magento/module-application-performance-monitor",
3-
"license": "OSL-3.0",
4-
"type": "magento2-module",
5-
"description": "Performance Monitor for Application",
6-
"autoload": {
7-
"files": [
8-
"registration.php"
9-
],
10-
"psr-4": {
11-
"Magento\\ApplicationPerformanceMonitor\\": ""
2+
"name": "magento/module-application-performance-monitor",
3+
"description": "Performance Monitor for Application",
4+
"type": "magento2-module",
5+
"license": "OSL-3.0",
6+
"version": "100.4.1",
7+
"require": {
8+
"php": "~8.2.0||~8.3.0||~8.4.0",
9+
"magento/framework": "103.0.*"
10+
},
11+
"autoload": {
12+
"files": [
13+
"registration.php"
14+
],
15+
"psr-4": {
16+
"Magento\\ApplicationPerformanceMonitor\\": ""
17+
}
1218
}
13-
},
14-
"require": {
15-
"php": "~8.2.0||~8.3.0||~8.4.0",
16-
"magento/framework": "*"
17-
}
1819
}
20+

0 commit comments

Comments
 (0)