Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 21ebf3f

Browse files
committed
Merge branch 'master' into 2.4.2-develop
2 parents c38bf2f + b7e0dbb commit 21ebf3f

File tree

13 files changed

+143
-19
lines changed

13 files changed

+143
-19
lines changed

src/_data/var.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ mcp-package: magento/magento-cloud-patches
3131
mcp-release: 1.0.8
3232
mcd-package: magento/magento-cloud-docker
3333
mcd-prod: Magento Cloud Docker
34-
mcd-release: 1.2.0
34+
mcd-release: 1.2.1
3535
mcc-prod: Magento Cloud Components
3636
mcc-package: magento/magento-cloud-components
3737
mcc-release: 1.0.7

src/cloud/docker/docker-development.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ You can use the Docker environment to emulate the {{site.data.var.ece}} Integrat
4444

4545
{{site.data.var.mcd-prod}} is a Magento Community Engineering project supported by the Magento developer community. You have several options to get support and learn more about {{site.data.var.mcd-prod}} and Magento local development.
4646

47-
- **[Magento Community Engineering Slack organization]**–For support, questions, or discussion, chat with us in the **#cloud-docker** and **#cloud** channels. To join, send a request to _engcom@magento.com_ or [sign yourself up] using Slack.
47+
- **[Magento Community Engineering Slack organization]**–For support, questions, or discussion, chat with us in the **#cloud-docker** and **#cloud** channels. To join, send a request to _engcom@adobe.com_ or [sign yourself up] using Slack.
4848

4949
- **[{{site.data.var.mcd-package}} GitHub repository]**–Visit the GitHub repository to read discussions about current issues, check current development, and submit issues or pull requests to improve the project.
5050

src/cloud/project/new-relic.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,8 @@ Based on industry best practices, the policy includes a collection of alerts tha
259259
| disk space | NRI | Pro
260260
| CPU usage | NRI | Pro
261261
| memory usage | NRI | Pro
262+
| Redis | NRI | Pro
263+
| MariaDB | NRI | Pro
262264

263265
When site infrastructure or application conditions trigger an alert threshold, New Relic sends alert notifications so that you can proactively address the issue. See [Managed Alerts for Magento Commerce] in the _Magento Help Center_ for details about alert thresholds and troubleshooting steps to resolve the issues that triggered the alert.
264266

src/cloud/project/sendgrid.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ s2.example.com IN CNAME <s2.example.sendgrid.net>
2424
{: .bs-callout-tip}
2525
You can find Sendgrid details for your account in the Onboarding UI. Use the `https://cloud.magento.com/project/_project-id_/setup/project_details` URL and select the **Project Details** > **Hosting Info** tab.
2626

27-
The CNAME records resolve to the Domain Keys Identified Mail (DKIM) and Sender Policy Framework (SPF) records managed by SendGrid, so that spam filters are less likely to inhibit your messages.
27+
For {{site.data.var.ece}} Pro, the CNAME records resolve to the Domain Keys Identified Mail (DKIM) and Sender Policy Framework (SPF) records managed by SendGrid, so that spam filters are less likely to inhibit your messages.
28+
29+
{: .bs-callout-info}
30+
**SendGrid DKIM signatures** are not available in Commerce Cloud Starter. They are only available in Commerce Cloud Pro.
2831

2932
Magento does not support allowlists, but you can review the [Sender Policy Framework (SPF)](https://sendgrid.com/docs/Glossary/spf.html) guidelines to improve delivery.

src/cloud/project/user-admin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ To enable TFA on your {{site.data.var.ece}} user account:
259259

260260
- Log in with your username and password.
261261

262-
- When prompted, enter the two-factor authentication code for the magento.cloufrom the authenticator application on your mobile device
262+
- When prompted, enter the two-factor authentication code for the `accounts.magento.cloud` entry from the authenticator application on your mobile device.
263263

264264
### Manage TFA configuration and recovery codes
265265

src/guides/v2.3/config-guide/cli/config-cli-subcommands-catalog-sync.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ title: Catalog Sync
55

66
Magento compiles catalog data into tables using indexers. This process is automatically [triggered by several events](https://docs.magento.com/user-guide/system/index-management-events.html), such as changes to a product's price or inventory levels. To allow some Magento services to use that catalog data, a catalog sync process runs hourly. The catalog sync process exports product data from the Magento server to SaaS services on an ongoing basis. For example, the [Product Recommendations](https://docs.magento.com/user-guide/marketing/product-recommendations.html) feature needs up-to-date catalog information so that it can accurately return recommendations with correct names, pricing, and availability. Use the command-line interface to trigger the catalog sync and reindex product data for consumption by SaaS services.
77

8+
{:.bs-callout-info}
9+
To use the catalog sync commands, you must have an [API key and a SaaS environment configured](https://docs.magento.com/user-guide/system/saas.html). If you do not have an API key and have not configured a SaaS environment, you can still reindex product data but that data will not be exported to SaaS services.
10+
811
The commands used to sync catalog data are part of the `magento/saas-export` package. See [Install and configure Product Recommendations]({{ site.baseurl }}/recommendations/install-configure.html) for more information.
912

1013
{:.bs-callout-info}

src/guides/v2.3/extension-dev-guide/cache/page-caching/private-content.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Customer sections was designed to cache private data in browser storage. This me
6767
The are some exception cases:
6868
6969
- Store and website switching, after any of these action customer section `cart` will be updated.
70-
- Customer cart lifetime option `section_data_lifetime` which is 60 minutes by default. After scheduled time passe section `cart` will be updated.
70+
- Customer cart lifetime option `section_data_lifetime` which is 60 minutes by default. After scheduled time passes, section `cart` will be updated.
7171
7272
{: .bs-callout-info }
7373
Product information will not be simultaneously updated in customer cart (product name, price, product enabled/disabled). Information will be updated after what comes first: `section_data_lifetime` time passed or an action that the update cart triggered.

src/guides/v2.3/extension-dev-guide/framework/array-manager.md

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,16 @@ The library is primarily used to handle data from UI components within [DataProv
1313
|Method|Description|
1414
|--- |--- |
1515
| `exists` | Checks if the node exists in a given associative array |
16-
| `get` | Returns the value of the key (or node) at the end of the path, `null` is returned if the node hasn't been found. |
16+
| `find` | Finds a node in a nested array and saves its index and parent node reference |
17+
| `findPaths` | Gets matching paths for elements with specified indexes. |
18+
| `get` | Returns the value of the key (or node) at the end of the path. `null` is returned if the node could not be found. |
1719
| `move` | Moves a value from one path to another |
18-
| `remove` | Removes node and returns modified array |
20+
| `merge` | Merges a value with a node and returns the modified data. |
21+
| `populate` | Populates a nested array, if possible and necessary. |
22+
| `remove` | Removes a node and returns the modified array. |
1923
| `replace` | Updates the existing nodes and returns the modified array |
20-
| `set` | Set value into node and returns modified data |
24+
| `set` | Sets the value into a node and returns modified data. |
25+
| `slicePath` | Retrieves a slice of the specified path. |
2126

2227
### Example 1
2328

@@ -129,3 +134,13 @@ if ($this->arrayManager->get('response/status', $data) === 'OK') {
129134

130135
...
131136
```
137+
138+
You can use the `Magento\Framework\Stdlib\ArrayManager` library to populate an array from the given path:
139+
140+
```php
141+
...
142+
143+
$this->arrayManager->populate('response/result/items', $data)
144+
145+
...
146+
```

src/guides/v2.3/extension-dev-guide/message-queues/async-message-queue-config-files.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ When using the Magento message queue, four configuration files in your module mu
1616

1717
More information can be found in [Configure message queues]({{ page.baseurl }}/extension-dev-guide/message-queues/config-mq.html).
1818

19-
Asynchronous and Bulk APIs are built on top of the usual REST API and use the Magento Message Queue Framework for processing messages. To easy development efforts, the Asynchronous API pre-generates the following configuration files:
19+
Asynchronous and Bulk APIs are built on top of the usual REST API and use the Magento Message Queue Framework for processing messages. To ease development efforts, the Asynchronous API pre-generates the following configuration files:
2020

2121
* communication.xml
2222
* queue_publisher.xml
2323

24-
and provides the `queue_topology.xml` and `queue_consumer.xml` file within the `Magento/WebapiAsync` module.
24+
and provides the `queue_topology.xml` and `queue_consumer.xml` files within the `Magento/WebapiAsync` module.
2525

2626
### communication.xml
2727

2828
Information about the auto-generation of `communication.xml` can be found in [Topics in Asynchronous API]({{ page.baseurl }}/extension-dev-guide/message-queues/async-topics.html)
2929

3030
### queue_publisher.xml
3131

32-
`queue_publisher.xml` is generated by the `\Magento\WebapiAsync\Code\Generator\Config\RemoteServiceReader\Publisher` class, which implements `\Magento\Framework\Config\ReaderInterface` and is injected into the `\Magento\Framework\MessageQueue\Publisher\Config\CompositeReader` constructor argument in the main `di.xml` file.
32+
The `queue_publisher.xml` file is generated by the `\Magento\WebapiAsync\Code\Generator\Config\RemoteServiceReader\Publisher` class, which implements `\Magento\Framework\Config\ReaderInterface` and is injected into the `\Magento\Framework\MessageQueue\Publisher\Config\CompositeReader` constructor argument in the main `di.xml` file.
3333

3434
```xml
3535
<type name="Magento\Framework\MessageQueue\Publisher\Config\CompositeReader">
@@ -57,7 +57,7 @@ The asynchronous/bulk API has one defined consumer which processes all asynchron
5757

5858
### queue_topology.xml
5959

60-
The nessage queue topology configuration links all auto-generated topic names with prefix `async.` to the `magento` exchange and defines the queue named `async.operations.all` as the destination for all messages.
60+
The message queue topology configuration links all auto-generated topic names with prefix `async.` to the `magento` exchange and defines the queue named `async.operations.all` as the destination for all messages.
6161

6262
```xml
6363
<exchange name="magento" type="topic" connection="amqp">

src/guides/v2.3/migration/bk-migration-guide.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ We have developed the **Magento 2 Data Migration Tool** to help you efficiently
2121
### Extensions and custom code {#migrate-extensions-code}
2222
We have been working hard with the development community to help you use your Magento 1 extensions in Magento 2. Now we are proud to present the [Magento Marketplace](https://marketplace.magento.com/){:target="_blank"}, where you can download or purchase the latest versions of your favorite extensions.
2323

24-
Also, we have developed the [Code Migration Toolkit](https://github.com/magento/code-migration){:target="_blank"}, which will help to port your extensions and custom code to Magento 2, significantly reducing your efforts.
25-
2624
More information on developing extensions for Magento 2 is available in the [PHP Developer Guide]({{ page.baseurl }}/extension-dev-guide/bk-extension-dev-guide.html){:target="_blank"}.
2725

2826
### Themes and customizations {#migrate-themes-customizations}

0 commit comments

Comments
 (0)