Skip to content

Commit 73a487b

Browse files
Merge branch '2.4-develop' of github.com:magento-gl/magento2ce into ACQE-8576
2 parents ed330b6 + 0b4a5b3 commit 73a487b

File tree

569 files changed

+18121
-2489
lines changed

Some content is hidden

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

569 files changed

+18121
-2489
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
# Magento_AdminAnalytics module
2+
13
The Magento\AdminAnalytics module gathers information about the features Magento administrators use. This information will be used to help improve the user experience on the Magento Admin.
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# Magento_AdminNotification module
22

3-
The Magento_AdminNotification module provides the ability to alert administrators via system messages and provides a message inbox for surveys and notifications.
3+
This module provides the ability to alert administrators via system messages and provides a message inbox for surveys and notifications.
44

55
## Installation details
66

7-
The Magento_AdminNotification module creates the following tables in the database:
7+
This module creates the following tables in the database:
88

99
- `adminnotification_inbox`
1010
- `admin_system_messages`
1111

1212
Before disabling or uninstalling this module, note that the Magento_Indexer module depends on this module.
1313

14-
For information about module installation in Magento 2, see [Enable or disable modules](https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/tutorials/manage-modules.html).
14+
For information about module installation, see [Enable or disable modules](https://experienceleague.adobe.com/en/docs/commerce-operations/installation-guide/tutorials/manage-modules).
1515

1616
## Extensibility
1717

18-
Extension developers can interact with the Magento_AdminNotification module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://developer.adobe.com/commerce/php/development/components/plugins/).
18+
Extension developers can interact with this module. For more information about the extension mechanism, see [Plugins](https://developer.adobe.com/commerce/php/development/components/plugins/).
1919

20-
[The Magento dependency injection mechanism](https://developer.adobe.com/commerce/php/development/components/dependency-injection/) enables you to override the functionality of the Magento_AdminNotification module.
20+
[The dependency injection mechanism](https://developer.adobe.com/commerce/php/development/components/dependency-injection/) enables you to override the functionality of this module.
2121

2222
### Events
2323

@@ -32,10 +32,10 @@ This module introduces the following layouts and layout handles in the `view/adm
3232
- `adminhtml_notification_index`
3333
- `adminhtml_notification_block`
3434

35-
For more information about layouts in Magento 2, see the [Layout documentation](https://developer.adobe.com/commerce/frontend-core/guide/layouts/).
35+
For more information about layouts, see the [Layout documentation](https://developer.adobe.com/commerce/frontend-core/guide/layouts/).
3636

3737
### UI components
3838

3939
You can extend admin notifications using the `view/adminhtml/ui_component/notification_area.xml` configuration file.
4040

41-
For information about UI components in Magento 2, see [Overview of UI components](https://developer.adobe.com/commerce/frontend-core/ui-components/).
41+
For information about UI components, see [Overview of UI components](https://developer.adobe.com/commerce/frontend-core/ui-components/).
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Magento_AdvancedPricingImportExport module
22

3-
The Magento_AdvancedPricingImportExport module handles the import and export of the advanced pricing.
3+
This module handles the import and export of the advanced pricing.
44

55
## Extensibility
66

7-
Extension developers can interact with the Magento_AdvancedPricingImportExport module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://developer.adobe.com/commerce/php/development/components/plugins/).
7+
Extension developers can interact with this module. For more information about the extension mechanism, see [Plugins](https://developer.adobe.com/commerce/php/development/components/plugins/).
88

9-
[The Magento dependency injection mechanism](https://developer.adobe.com/commerce/php/development/components/dependency-injection/) enables you to override the functionality of the Magento_AdvancedPricingImportExport module.
9+
[The dependency injection mechanism](https://developer.adobe.com/commerce/php/development/components/dependency-injection/) enables you to override the functionality of this module.

app/code/Magento/AdvancedSearch/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Magento_AdvancedSearch module
22

3-
The Magento_AdvancedSearch module introduces advanced search functionality and provides interfaces that allow third-party search engines to implement this functionality.
3+
This module introduces advanced search functionality and provides interfaces that allow third-party search engines to implement this functionality.
44

55
## Installation details
66

@@ -9,21 +9,21 @@ Before disabling or uninstalling this module, note that the following modules de
99
- Magento_Elasticsearch
1010
- Magento_Elasticsearch8
1111

12-
For information about module installation in Magento 2, see [Enable or disable modules](https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/tutorials/manage-modules.html).
12+
For information about module installation, see [Enable or disable modules](https://experienceleague.adobe.com/en/docs/commerce-operations/installation-guide/tutorials/manage-modules).
1313

1414
## Extensibility
1515

16-
Extension developers can interact with the Magento_AdvancedSearch module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://developer.adobe.com/commerce/php/development/components/plugins/).
16+
Extension developers can interact with this module. For more information about the extension mechanism, see [Plugins](https://developer.adobe.com/commerce/php/development/components/plugins/).
1717

18-
[The Magento dependency injection mechanism](https://developer.adobe.com/commerce/php/development/components/dependency-injection/) enables you to override the functionality of the Magento_AdvancedSearch module.
18+
[The dependency injection mechanism](https://developer.adobe.com/commerce/php/development/components/dependency-injection/) enables you to override the functionality of this module.
1919

2020
### Events
2121

2222
This module observes the following event:
2323

2424
- `catalogsearch_query_save_after` in the `Magento\AdvancedSearch\Model\Recommendations\SaveSearchQueryRelationsObserver` file.
2525

26-
For information about an event in Magento 2, see [Events and observers](https://developer.adobe.com/commerce/php/development/components/events-and-observers/#events).
26+
For information about an event, see [Events and observers](https://developer.adobe.com/commerce/php/development/components/events-and-observers/#events).
2727

2828
### Layouts
2929

@@ -37,4 +37,4 @@ The module interacts with the following layout handles in the `view/frontend/lay
3737

3838
- `catalogsearch_result_index`
3939

40-
For more information about layouts in Magento 2, see the [Layout documentation](https://developer.adobe.com/commerce/frontend-core/guide/layouts/).
40+
For more information about layouts, see the [Layout documentation](https://developer.adobe.com/commerce/frontend-core/guide/layouts/).

app/code/Magento/Amqp/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Magento_Amqp module
22

3-
Magento_Amqp module provides functionality to publish/consume messages with the Advanced Message Queuing Protocol (AMQP).
3+
This module provides functionality to publish/consume messages with the Advanced Message Queuing Protocol (AMQP).
44

55
## Extensibility
66

7-
Extension developers can interact with the Magento_Amqp module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://developer.adobe.com/commerce/php/development/components/plugins/).
7+
Extension developers can interact with this module. For more information about the extension mechanism, see [Plugins](https://developer.adobe.com/commerce/php/development/components/plugins/).
88

9-
[The Magento dependency injection mechanism](https://developer.adobe.com/commerce/php/development/components/dependency-injection/) enables you to override the functionality of the Magento_Amqp module.
9+
[The dependency injection mechanism](https://developer.adobe.com/commerce/php/development/components/dependency-injection/) enables you to override the functionality of this module.

app/code/Magento/Amqp/Setup/ConfigOptionsList.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
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
@@ -26,6 +26,7 @@ class ConfigOptionsList implements ConfigOptionsListInterface
2626
public const INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST = 'amqp-virtualhost';
2727
public const INPUT_KEY_QUEUE_AMQP_SSL = 'amqp-ssl';
2828
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
@@ -203,6 +204,11 @@ public function validate(array $options, DeploymentConfig $deploymentConfig)
203204
if (!$result) {
204205
$errors[] = "Could not connect to the Amqp Server.";
205206
}
207+
208+
if (isset($options[self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION])
209+
&& $options[self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION] !== 'amqp') {
210+
$errors = [];
211+
}
206212
}
207213

208214
return $errors;

app/code/Magento/Analytics/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Magento_Analytics module
22

3-
The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://business.adobe.com/products/magento/business-intelligence.html) to use [Advanced Reporting](https://developer.adobe.com/commerce/php/development/advanced-reporting/modules/) functionality.
3+
This module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://business.adobe.com/products/magento/business-intelligence.html) to use [Advanced Reporting](https://developer.adobe.com/commerce/php/development/advanced-reporting/modules/) functionality.
44

55
The module implements the following functionality:
66

@@ -15,7 +15,7 @@ The module implements the following functionality:
1515

1616
## Installation details
1717

18-
Before disabling or uninstalling this module, note that the following modules depends on this module:
18+
Before disabling or uninstalling this module, note that the following modules depend on this module:
1919

2020
- Magento_CatalogAnalytics
2121
- Magento_CustomerAnalytics
@@ -26,7 +26,7 @@ Before disabling or uninstalling this module, note that the following modules de
2626

2727
## Structure
2828

29-
Beyond the [usual module file structure](https://developer.adobe.com/commerce/php/architecture/modules/overview/) the module contains a directory `ReportXml`.
29+
Beyond the [usual module file structure](https://developer.adobe.com/commerce/php/architecture/modules/overview/), this module contains a directory `ReportXml`.
3030
[Report XML](https://developer.adobe.com/commerce/php/development/advanced-reporting/report-xml/) is a markup language used to build reports for Advanced Reporting.
3131
The language declares SQL queries using XML declaration.
3232

app/code/Magento/ApplicationPerformanceMonitor/README.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
# ApplicationPerformanceMonitor
1+
# Magento_ApplicationPerformanceMonitor module
22

3-
Monitors the Performance of the Application
3+
This module monitors the performance of the application.
44

5-
To configure, edit app/etc/env.php
6-
Add these lines.
5+
To configure, edit `app/etc/env.php` and add these lines:
76

87
```php
98
'application' => [
@@ -17,10 +16,10 @@ Add these lines.
1716
Use 0 or 1 as the value to enable or disable.
1817
Both `logger_output_enable` and `logger_output_verbose` default to 0.
1918

20-
The option `logger_output_enable` enables outputting performance metrics to the logger using `debug` method of logger.
19+
The option `logger_output_enable` enables outputting performance metrics to the logger using the `debug` method of the logger.
2120
The option `logger_output_verbose` adds additional metrics.
2221

23-
Example output in log file without verbose:
22+
Example output in the log file without verbose:
2423

2524
```log
2625
[2023-10-04T20:48:23.727037+00:00] report.ERROR: "Profile information": {
@@ -36,7 +35,7 @@ Example output in log file without verbose:
3635
}
3736
```
3837

39-
Example output in log file with verbose:
38+
Example output in the log file with verbose:
4039

4140
```log
4241
[2023-10-04T20:55:31.174304+00:00] report.ERROR: "Profile information": {
@@ -62,5 +61,5 @@ Example output in log file with verbose:
6261
}
6362
```
6463

65-
The additional options `newrelic_output_enable` and `newrelic_output_verbose` are only used if ApplicationPerformanceMonitorNewRelic module is also installed and enabled.
66-
See README.md in ApplicationPerformanceMonitorNewRelic for more details on that.
64+
The additional options `newrelic_output_enable` and `newrelic_output_verbose` are only used if the `ApplicationPerformanceMonitorNewRelic` module is also installed and enabled.
65+
See `README.md` in `ApplicationPerformanceMonitorNewRelic` for more details on that.
Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
# ApplicationPerformanceMonitorNewRelic
1+
# ApplicationPerformanceMonitorNewRelic module
22

3-
Monitors the Performance of the Application in New Relic
3+
This module monitors the performance of the application in New Relic.
44

5-
To use this module, it requires a New Relic account and the environment already by configured to use that account.
6-
For general New Relic PHP configuration information, see <https://docs.newrelic.com/docs/apm/agents/php-agent/configuration/php-agent-configuration/>.
5+
To use this module, you need a New Relic account and your environment must be configured to use that account.
6+
For general New Relic PHP configuration information, see [PHP agent configuration](https://docs.newrelic.com/docs/apm/agents/php-agent/configuration/php-agent-configuration/).
77

8-
To configure this module, edit `app/etc/env.php`.
9-
Add these lines.
8+
To configure this module, edit `app/etc/env.php` and add these lines:
109

1110
```php
1211
'application' => [
@@ -21,6 +20,6 @@ Use 0 or 1 as the value to enable or disable.
2120
`newrelic_output_enable` defaults to 1, and `newrelic_output_verbose` defaults to 0.
2221

2322
The option `newrelic_output_enable` enables outputting performance metrics to New Relic.
24-
The option `newrelic_output_verbose` adds additional metrics
23+
The option `newrelic_output_verbose` adds additional metrics.
2524

26-
See README.md in ApplicationPerformanceMonitor for details about what metrics are in each.
25+
See README.md in ApplicationPerformanceMonitor for details about the metrics.

app/code/Magento/AsyncConfig/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# AsyncConfig
1+
# Magento_AsyncConfig module
22

3-
The _AsyncConfig_ module enables admin config save asynchronously, which saves configuration in a queue, and processes it in a first-in-first-out basis.
3+
This module enables admin config save asynchronously, which saves configuration in a queue, and processes it in a first-in-first-out basis.
44

55
AsyncConfig values:
66

7-
- `0` — (_Default value_) Disable the AsyncConfig module and use the standard synchronous configuration save.
8-
- `1` — Enable the AsyncConfig module for asynchronous config save.
7+
- `0` — (_Default value_) Disable the module and use the standard synchronous configuration save.
8+
- `1` — Enable the module for asynchronous config save.
99

10-
To enable AsyncConfig, set the `config/async` variable in the `env.php` file. For example:
10+
To enable the module, set the `config/async` variable in the `env.php` file. For example:
1111

1212
```php
1313
<?php

0 commit comments

Comments
 (0)