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

Commit bdd4a54

Browse files
authored
Merge branch 'master' into ds_upd-mftf-ref
2 parents c08d5f5 + 6614b94 commit bdd4a54

File tree

7 files changed

+29
-34
lines changed

7 files changed

+29
-34
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ The following guidelines may answer most of your questions and help you get star
6262
- Review existing [pull requests](https://github.com/magento/devdocs/pulls) and [issues](https://github.com/magento/devdocs/issues) to avoid duplicating work.
6363
- For large contributions, or changes that include multiple files, [open an issue](#report-an-issue) and discuss it with us first. This helps prevent duplicate or unnecessary work.
6464
- Do not make global find-and-replace changes without first creating an issue and discussing it with us. Global changes can have unintended consequences.
65+
- Do not make changes to content in the [`_data/codebase`](https://github.com/magento/devdocs/tree/master/src/_data/codebase) directory, which contains auto-generated data from Magento source code. Any manual changes will be lost when the file regenerates.
6566
- Combine multiple small changes (such as minor editorial and technical changes) into a single pull request. This helps us efficiently and effectively facilitate your contribution.
6667
- Familiarize yourself with the organization and conventions of our existing documentation before creating a pull request. Changes that are consistent with our style and conventions have a higher acceptance rate.
6768

src/guides/v2.3/coding-standards/code-standard-demarcation.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,25 +341,25 @@ this.element.parent().find('[data-action="edit"]').data('entity_id');
341341

342342
```php
343343
...
344-
$fieldset->addField('new_category_parent', 'text', array(
344+
$fieldset->addField('new_category_parent', 'text', [
345345
'label' => __('Parent Category'),
346346
'title' => __('Parent Category'),
347347
'required' => true,
348348
'class' => 'parent category',
349-
));
349+
]);
350350
...
351351
```
352352

353353
**Unacceptable PHP file:**
354354

355355
```php
356356
...
357-
$fieldset->addField('new_category_parent', 'text', array(
357+
$fieldset->addField('new_category_parent', 'text', [
358358
'label' => __('Parent Category'),
359359
'title' => __('Parent Category'),
360360
'required' => true,
361361
'style' => 'border: 1px solid #ccc;',
362-
));
362+
]);
363363
...
364364
```
365365

src/guides/v2.3/config-guide/mq/manage-message-queues.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ Edit the `/app/etc/env.php` file to configure the cron job `consumers_runner`.
4747

4848
```php
4949
...
50-
'cron_consumers_runner' => array(
50+
'cron_consumers_runner' => [
5151
'cron_run' => false,
5252
'max_messages' => 20000,
53-
'consumers' => array(
53+
'consumers' => [
5454
'consumer1',
5555
'consumer2',
56-
)
57-
),
56+
]
57+
],
5858
...
5959
```
6060

src/guides/v2.3/extension-dev-guide/test/test_object-mgr.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ $scopePool = $objectManagerHelper->getObject('\Magento\App\Config\ScopePool');
4545
// custom constructor arguments
4646
$cacheMock = $this->getMock('\Magento\Cache\FrontendInterface');
4747
...
48-
$arguments = array('cache' => $cacheMock);
48+
$arguments = ['cache' => $cacheMock];
4949
$scopePool = $objectManagerHelper->getObject('\Magento\App\Config\ScopePool',
5050
$arguments);
5151
```
@@ -70,14 +70,14 @@ $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
7070
// Prepare mock for collection elements
7171
$option = $this->getMock(
7272
'Magento\Bundle\Model\Option',
73-
array('getSelections', '__wakeup', 'getData'),
73+
['getSelections', '__wakeup', 'getData'],
7474
[],
7575
'',
7676
false
7777
);
7878
$optionCollection =
7979
$this->objectManagerHelper->getCollectionMock('Magento\Bundle\Model\Resource\Option\Collection',
80-
array($options));
80+
[$options]);
8181
```
8282

8383
### getConstructArguments {#getConstructArguments}
@@ -96,25 +96,25 @@ In the Magento system, several tests introduced mocks for abstract models and bl
9696
**Example**:
9797

9898
```php
99-
$attributeData = array(
99+
$attributeData = [
100100
'store_label' => 'Test',
101101
'attribute_code' => 'test',
102102
'is_required' => 1,
103-
'validate_rules' => array(
103+
'validate_rules' => [
104104
'min_text_length' => 0,
105105
'max_text_length' => 0,
106106
'input_validation' => 0,
107-
)
108-
);
107+
]
108+
];
109109
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
110110
$attributeClass = '\Magento\Eav\Model\Entity\Attribute\AbstractAttribute';
111111
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
112112
// Retrieve mocked constructor arguments
113113
$arguments = $objectManagerHelper->getConstructArguments(
114114
$attributeClass,
115-
array(
115+
[
116116
'data' => $attributeData,
117-
)
117+
]
118118
);
119119

120120
/** @var $attribute \Magento\Eav\Model\Entity\Attribute\AbstractAttribute|\PHPUnit\Framework\MockObject\MockObject */

src/guides/v2.3/get-started/soap/soap-web-api-calls.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ The following [PHP](https://glossary.magento.com/php) script illustrates how to
7474

7575
```php
7676
<?php
77-
$opts = array(
78-
'http'=>array(
77+
$opts = [
78+
'http'=> [
7979
'header' => 'Authorization: Bearer 36849300bca4fbff758d93a3379f1b8e'
80-
)
81-
);
80+
]
81+
];
8282
$wsdlUrl = 'http://magento.ll/soap/default?wsdl=1&services=testModule1AllSoapAndRestV1';
83-
$serviceArgs = array("id"=>1);
83+
$serviceArgs = ["id" => 1];
8484

8585
$context = stream_context_create($opts);
8686
$soapClient = new SoapClient($wsdlUrl, ['version' => SOAP_1_2, 'stream_context' => $context]);

src/guides/v2.4/release-notes/release-notes-2-4-0-commerce.md

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -744,10 +744,6 @@ We have fixed hundreds of issues in the Magento 2.4.0 core code.
744744

745745
* Magento now saves custom customer address attributes and implements them in registration forms as expected. Previously, when you created a new custom customer address attribute while creating an account from the cart, Magento did not save the attribute information.
746746

747-
<!--- MC-32301-->
748-
749-
* Magento no longer throws an error when you include an empty customer attribute field in the **Forms to Use In** field while creating a Company account on the storefront. Previously, Magento threw this error: `PHP Fatal error: Uncaught TypeError: Argument 2 passed to Magento\Eav\Model\Attribute\Data\Text::validateLength() must be of the type string, null given`.
750-
751747
### Customer
752748

753749
<!--- MC-29102-->
@@ -2202,25 +2198,23 @@ We have fixed hundreds of issues in the Magento 2.4.0 core code.
22022198

22032199
**Issue**: Anomalies in storefront error messages occur in deployments where PHP 7.4.2 is installed. When Magento 2.4.0 is deployed with PHP 7.4.2, the space symbols in storefront error messages are replaced with plus (+) characters. This bug is native to PHP 7.4.2 and cannot be corrected by Magento. **Workaround**: Magento recommends using other versions of PHP 7.4.x. See [Raw message data display on storefront](https://support.magento.com/hc/en-us/articles/360045804332) Knowledge Base article. <!--- MC-34170-->
22042200

2205-
**Issue**: Merchants cannot add ordered products to a package from the Admin Create Package page and save the package. The **MC-35514-2.4.0-CE-composer.patch** hotfix for this issue is now available from [Releases](https://magento.com/tech-resources/download). <!--- MC-35514-->
2201+
**Issue**: Merchants cannot add ordered products to a package from the Admin Create Package page and save the package. See [Shipping labels creation](https://support.magento.com/hc/en-us/articles/360046750171) Knowledge Base article. The **MC-35514-2.4.0-CE-composer.patch** hotfix for this issue is now available from [Releases](https://magento.com/tech-resources/download). <!--- MC-35514-->
22062202

22072203
**Issue**: Magento displays this error message during installation of Magento with third-party extensions that have dependencies on APIs for the `Store` module in CLI commands: `The default website isn't defined. Set the website and try again`. **Workaround**: Remove dependencies on third-party extensions from Composer, install Magento, and then install third-party extensions.
22082204

22092205
**Issue**: The **Add selections to my cart** button on the bottom of the shopping cart does not work. **Workaround**: Use the **Add selections to my cart** button on the top of the page. See [Add selections to my cart button does not work](https://support.magento.com/hc/en-us/articles/360045838312) Knowledge Base article. <!--- MC-35313-->
22102206

2211-
**Issue**: Merchants cannot interact with any page elements on the Returns page after creating a shipping label for a Return Merchandise Authorization (RMA). The **MC-35984-2.4.0-CE-composer.patch** hotfix for this issue is now available from [Releases](https://magento.com/tech-resources/download).
2212-
2213-
<!--- MC-35984-->
2207+
**Issue**: Merchants cannot interact with any page elements on the Returns page after creating a shipping label for a Return Merchandise Authorization (RMA). See [Returns Edit page stops working when creating shipping label](https://support.magento.com/hc/en-us/articles/360046441312) Knowledge Base article. The **MC-35984-2.4.0-CE-composer.patch** hotfix for this issue is now available from [Releases](https://magento.com/tech-resources/download). <!--- MC-35984-->
22142208

2215-
**Issue**: Administrators cannot add a configurable product by SKU to a quote. When an administrator clicks on the **Add to Quote** button, the Quote Edit page remained in a loading state, and the administrator could not save their changes. **Workaround**: There is no workaround for B2B Quote editing. However, you can still order products by selecting the products from the products list instead of adding them by SKU. <!--- MC-35513-->
2209+
**Issue**: Administrators cannot add a configurable product by SKU to a quote. When an administrator clicks on the **Add to Quote** button, the Quote Edit page remained in a loading state, and the administrator could not save their changes. **Workaround**: There is no workaround for B2B Quote editing. However, you can still order products by selecting the products from the products list instead of adding them by SKU. See B2B Admin cannot add a configurable product to a quote](https://support.magento.com/hc/en-us/articles/360046801971) Knowledge Base article. <!--- MC-35513-->
22162210

22172211
**Issue**: Merchants can’t create a new order from the Admin because the **Add Products By SKU** and **Add Products**  buttons are missing from the order creation page when JavaScript bundling is enabled. **Workaround**: Disable the JavaScript bundling for your Magento deployment. <!--- MC-36044-->
22182212

22192213
**Issue**: Magento throws a `404 not found` error when a customer tries to remove reward points when checking out an order being shipped to multiple addresses. <!--- MC-35955-->
22202214

22212215
**Issue**: Editing a configurable product from a customer’s wishlist results in the following unexpected behavior: An unexpected field appears on the Configure Product page, and the Configure Product page does not disappear after you click **OK**. Magento also displays this message: `Please load Wish List item`. **Workaround**: Reload the Configure Product page. <!--- MC-35617-->
22222216

2223-
**Issue**: Customers cannot change the number of orders displayed per page when the Orders list spans multiple pages. Currently, Magento displays this message when you navigate to the last page of orders and try to change the number of orders displayed per page: `You have placed no orders`. **Workaround**: Re-opening the My Orders page will result in the display of the Orders list. <!--- MC-34153-->
2217+
**Issue**: Customers cannot change the number of orders displayed per page when the Orders list spans multiple pages. Currently, Magento displays this message when you navigate to the last page of orders and try to change the number of orders displayed per page: `You have placed no orders`. See [Orders display error](https://support.magento.com/hc/en-us/articles/360046802271) Knowledge Base article. **Workaround**: Re-opening the My Orders page will result in the display of the Orders list. <!--- MC-34153-->
22242218

22252219
**Issue**: Directly clicking on the **Export Tax Rates** button of the Add New Tax Rule page ( **Stores** > **Tax Rules**) does not download the `tax_rates.csv` file as expected. **Workaround**: Click the edge of the **Export Tax Rates** button. See [Export Tax Rates does not work](https://support.magento.com/hc/en-us/articles/360045850032) Knowledge Base article. <!--- MC-35345-->
22262220

src/guides/v2.4/release-notes/release-notes-2-4-0-open-source.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2025,7 +2025,7 @@ We have fixed hundreds of issues in the Magento 2.4.0 core code.
20252025

20262026
**Issue**: Anomalies in storefront error messages occur in deployments where PHP 7.4.2 is installed. When Magento 2.4.0 is deployed with PHP 7.4.2, the space symbols in storefront error messages are replaced with plus (+) characters. This bug is native to PHP 7.4.2 and cannot be corrected by Magento. **Workaround**: Magento recommends using other versions of PHP 7.4.x. See [Raw message data display on storefront](https://support.magento.com/hc/en-us/articles/360045804332) Knowledge Base article. <!--- MC-34170-->
20272027

2028-
**Issue**: Merchants cannot add ordered products to a package from the Admin Create Package page and save the package. The **MC-35514-2.4.0-CE-composer.patch** hotfix for this issue is now available from [Releases](https://magento.com/tech-resources/download). <!--- MC-35514-->
2028+
**Issue**: Merchants cannot add ordered products to a package from the Admin Create Package page and save the package. See [Shipping labels creation](https://support.magento.com/hc/en-us/articles/360046750171) Knowledge Base article. The **MC-35514-2.4.0-CE-composer.patch** hotfix for this issue is now available from [Releases](https://magento.com/tech-resources/download). <!--- MC-35514-->
20292029

20302030
**Issue**: Magento displays this error message during installation of Magento with third-party extensions that have dependencies on APIs for the `Store` module in CLI commands: `The default website isn't defined. Set the website and try again`. **Workaround**: Remove dependencies on third-party extensions from Composer, install Magento, and then install third-party extensions.
20312031

@@ -2037,7 +2037,7 @@ We have fixed hundreds of issues in the Magento 2.4.0 core code.
20372037

20382038
**Issue**: Editing a configurable product from a customer’s wishlist results in the following unexpected behavior: An unexpected field appears on the Configure Product page, and the Configure Product page does not disappear after you click **OK**. Magento also displays this message: `Please load Wish List item`. **Workaround**: Reload the Configure Product page. <!--- MC-35617-->
20392039

2040-
**Issue**: Customers cannot change the number of orders displayed per page when the Orders list spans multiple pages. Currently, Magento displays this message when you navigate to the last page of orders and try to change the number of orders displayed per page: `You have placed no orders`. **Workaround**: Re-opening the My Orders page will result in the display of the Orders list. <!--- MC-34153-->
2040+
**Issue**: Customers cannot change the number of orders displayed per page when the Orders list spans multiple pages. Currently, Magento displays this message when you navigate to the last page of orders and try to change the number of orders displayed per page: `You have placed no orders`. See [Orders display error](https://support.magento.com/hc/en-us/articles/360046802271) Knowledge Base article. **Workaround**: Re-opening the My Orders page will result in the display of the Orders list. <!--- MC-34153-->
20412041

20422042
**Issue**: Directly clicking on the **Export Tax Rates** button of the Add New Tax Rule page (**Stores** > **Tax Rules**) does not download the `tax_rates.csv` file as expected. **Workaround**: Click the edge of the **Export Tax Rates** button. See [Export Tax Rates does not work](https://support.magento.com/hc/en-us/articles/360045850032) Knowledge Base article. <!--- MC-35345-->
20432043

0 commit comments

Comments
 (0)