Merge branch 'master' into 2.4.2-develop

Author: magento-docs

src/_data/toc/contributor-guide.yml

@@ -14,6 +14,10 @@ pages:
           url: /contributor-guide/backward-compatible-development/
           versionless: true
 
+        - label: Pull Request Tests
+          url: /contributor-guide/pull-request-tests.html
+          versionless: true
+
     - label: Docs Contributions
       children:
         - label: Contribution Guidelines

src/_data/toc/software-update-guide.yml

@@ -21,6 +21,28 @@ pages:
         - label: Update and upgrade checklist
           url: /comp-mgr/prereq/prereq_compman-checklist.html
 
+    - label: Safe Upgrade Tool
+      url: /safe-upgrade-tool/introduction.html
+      versionless: true
+      edition: ee-only
+      children:
+
+        - label: Prerequisites
+          url: /safe-upgrade-tool/prerequisites.html
+          versionless: true
+
+        - label: Install
+          url: /safe-upgrade-tool/install.html
+          versionless: true
+
+        - label: Run the tool
+          url: /safe-upgrade-tool/run.html
+          versionless: true
+
+        - label: Developer information
+          url: /safe-upgrade-tool/developer.html
+          versionless: true
+
     - label: Magento Marketplace example
       url: /comp-mgr/marketplace/marketplace.html
       include_versions: ["2.3"]

src/_data/toc/testing.yml

@@ -70,6 +70,9 @@ pages:
         - label: Running Static Tests
           url: /test/static/static_test_execution.html
 
+        - label: Setting up for Static Analysis
+          url: /test/static/static-analysis.html
+
     - label: Semantic Version Checker
       children:
 

src/_data/whats-new.yml

@@ -4,8 +4,23 @@ description: This page contains recent changes that we think you'd like to know
   We exclude from this list proofreading, spelling checks, and all minor updates.
 link: "/whats-new.html"
 thread: "/whatsnew-feed.xml"
-updated: Mon Jan 11 15:41:03 2021
+updated: Mon Jan 18 15:45:43 2021
 entries:
+- description: SendGrid DKIM signatures are available only on Magento Commerce Cloud
+    Pro projects.  For more information on SendGrid, see https://devdocs.magento.com/cloud/project/sendgrid.html.
+  versions: 2.4.x
+  type: Major Update
+  date: January 14, 2021
+  link: https://github.com/magento/devdocs/pull/8440
+  contributor: bdenham
+  profile: https://github.com/bdenham
+- description: New Relic Alerts now include Redis and MariaDB. See https://devdocs.magento.com/cloud/project/new-relic.html#monitor-performance-with-managed-alerts.
+  versions: 2.4.x
+  type: Major Update
+  date: January 12, 2021
+  link: https://github.com/magento/devdocs/pull/8503
+  contributor: bdenham
+  profile: https://github.com/bdenham
 - description: Added a [legal disclaimer](https://devdocs.magento.com/compliance/privacy/pi-data-reference-m2.html#customer-data)
     to references of the `date_of_birth` attribute of the `customer` database entity.
   versions: 2.3.x, 2.4.x
@@ -1644,7 +1659,7 @@ entries:
   type: Technical
   date: April 9, 2020
   link: https://github.com/magento/devdocs/pull/7016
-- description: Fixed a config entry in the the [Custom import entity](https://devdocs.magento.com/guides/v2.3/ext-best-practices/tutorials/custom-import-entity.html)
+- description: Fixed a config entry in the [Custom import entity](https://devdocs.magento.com/guides/v2.3/ext-best-practices/tutorials/custom-import-entity.html)
     topic.
   versions: 2.3.x
   type: Technical

src/_includes/cloud/error-codes.md

@@ -48,7 +48,7 @@ Critical errors indicate a problem with the {{ site.data.var.ece }} project conf
 | 106 |  | Unable to read the `.schema.yaml` file |  |
 | 107 | pre-deploy: clean-redis-cache | Failed to clean the Redis cache | Failed to clean the Redis cache. Check that the Redis cache configuration is correct and that the Redis service is available. See [Setup Redis service](https://devdocs.magento.com/cloud/project/services-redis.html). |
 | 108 | pre-deploy: set-production-mode | Command `/bin/magento maintenance:enable` failed | Check the `cloud.log` for more information. For more detailed command output, add the `VERBOSE_COMMANDS: '-vvv'` option to the `.magento.env.yaml` file. |
-| 109 | validate-config | Incorrect database configuration | Check that the the `DATABASE_CONFIGURATION` environment variable is configured correctly. |
+| 109 | validate-config | Incorrect database configuration | Check that the `DATABASE_CONFIGURATION` environment variable is configured correctly. |
 | 110 | validate-config | Incorrect session configuration | Check that the `SESSION_CONFIGURATION` environment variable is configured correctly. The configuration must contain at least the `save` parameter. |
 | 111 | validate-config | Incorrect search configuration | Check that the `SEARCH_CONFIGURATION` environment variable is configured correctly. The configuration must contain at least the `engine` parameter. |
 | 112 | validate-config | Incorrect resource configuration | Check that the `RESOURCE_CONFIGURATION` environment variable is configured correctly. The configuration must contain at least `connection` parameter. |

src/_includes/install/sampledata/sample-data-clone-24.md

@@ -87,6 +87,12 @@ To clone the Magento sample data GitHub repository using the SSH protocol:
 
 1. See [Set file system permissions and ownership](#samp-data-perms).
 
+1. Run the following command:
+
+   ```bash
+   bin/magento setup:upgrade
+   ```
+
 ### Clone with HTTPS {#instgde-prereq-compose-clone-https}
 
 To clone the Magento sample data GitHub repository using the HTTPS protocol:

src/_includes/install/sampledata/sample-data-clone.md

@@ -87,6 +87,12 @@ To clone the Magento sample data GitHub repository using the SSH protocol:
 
 1. See [Set file system permissions and ownership](#samp-data-perms).
 
+1. Run the following command:
+
+   ```bash
+   bin/magento setup:upgrade
+   ```
+
 ### Clone with HTTPS {#instgde-prereq-compose-clone-https}
 
 To clone the Magento sample data GitHub repository using the HTTPS protocol:

src/_includes/layout/page-header.html

@@ -49,4 +49,10 @@ <h2 class="page-subtitle no_toc">{{ page.subtitle }}</h2>
   </div>
   {% endif %}
 
+  {% if page.url contains "safe-upgrade-tool/" %}
+  <div class="message-banner">
+    This tool is an ALPHA version with limited scope, available for all Magento Commerce merchants, and only validating PHP Magento APIs and GraphQL schema. If you are a Magento Commerce user you can download it at the <a href="https://repo.magento.com/">Magento repo</a>.
+  </div>
+  {% endif %}
+
 </section>

src/_videos/fundamentals/add-new-product-attribute.md

@@ -87,7 +87,7 @@ xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
 
 {% endcollapsible %}
 
-## Step 2 Create an InstallData script
+## Step 2 Create an InstallData script {#CreateProductAttributeByUpgradeScript}
 
 Next, we need to create the InstallData script.
 Because adding an attribute technically adds records into several tables, such as `eav_attribute` and `catalog_eav_attribute,` this is data manipulation, not a schema change.
@@ -196,7 +196,7 @@ For now, we’ll just quickly go through most important ones:
 *  **visible_on_front:** A flag that defines whether an attribute should be shown on the “More Information” tab on the frontend
 *  **is_html_allowed_on_front:** Defines whether an attribute value may contain HTML
 
-## Step 3: Add a source model
+## Step 3: Add a source model {#AddSourceModel}
 
 Next, we need to create the source model:
 
@@ -337,3 +337,54 @@ backend model has executed successfully, so now we’ll set it to Wool and save
 
 Having saved the product, we’ll now move to the frontend.
 It should be visible and in bold text.
+
+## Product Attribute Option Creation
+
+A product attribute of type multiselect or select will present selectable options to the user. These options may be added manually through the admin panel or by upgrade script. The script process is slightly different depending on whether the options are being added at the moment of attribute creation or whether the options are being added at a later time to an existing attribute.
+
+### Add options to a new prouduct attribute {#AddOptionsAlongNewProductAttribute}
+
+Basic instructions for creating a product attribute by setup or upgrade script can be found [above](#CreateProductAttributeByUpgradeScript). Before scripting the attribute creation, pick one of these two use cases for your options:
+
+1. You want a set of options which cannot be modified by a user through the admin panel and which can only be changed through a future code push.
+1. You want a set of options which can be modified, added or deleted through the admin panel.
+
+For use case `1` (an 'immutable' set of options), follow the above instructions ["Add a source model"](#AddSourceModel). You will create a model that contains and dynamically returns the attribute's selectable options to the client.
+
+For use case `2` (a 'mutable' set of options), see ["EAV and extension attributes"]({{ site.baseurl }}/guides/v2.4/extension-dev-guide/attributes.html). Make sure to declare 'Magento\Eav\Model\Entity\Attribute\Source\Table' as the value for the 'source' attribute option. This ensures that Magento will store options in the appropriate database table.
+
+With `\Magento\Eav\Setup\EavSetup.php::addAttribute()` and `\Magento\Eav\Setup\EavSetup.php::addAttributeOptions()` you can add a series of options with the following array:
+
+```php
+'option' => ['values' => ['Option 1', 'Option 2', 'Option 3', etc.]];
+```
+
+Alternatively, you may designate a specific option sorting order as follows:
+
+```php
+'option' => ['values' => [8 => 'Option 1', 3 => 'Option 2', 11 => 'Option 3', etc.]]
+```
+
+### Add options to an existing product attribute
+
+*  To add options to an 'immutable' set of options, modify the custom source model with the additional options you wish to provide.
+
+*  Adding options to a 'mutable' set of options leverages the same `EavSetup` object as you use when creating an attribute with options, but requires an additional step because `EavSetup` needs to know to which attribute you want to assign new options.
+
+1. Assign an array of new options to a variable:
+
+```php
+   $options = ['attribute_id' => null, 'values' => 'Option 1', 'Option 2', etc]];
+```
+
+1. Update your array with the attribute ID from the database:
+
+```php
+   $options['attribute_id'] = $eavSetup->getAttributeId($eavSetup->getEntityTypeId('catalog_product'), 'your_attribute_code');
+```
+
+1. Add your options:
+
+```php
+   $eavSetup->addAttributeOption($options);
+```

src/cloud/env/environment-vars_magento.md

@@ -12,7 +12,7 @@ Users that have administrative access to the {{site.data.var.ece}} project can u
 
 Use the ADMIN variables in the following table to override credentials for the Magento Admin user during installation.
 
-If you want to change the values after installation, connect to your environment using ssh and use the the Magento CLI [`admin:user` command]({{ site.baseurl }}/guides/v2.3/install-gde/install/cli/install-cli-subcommands-admin.html) to create or edit the Magento Admin user credentials.
+If you want to change the values after installation, connect to your environment using ssh and use the Magento CLI [`admin:user` command]({{ site.baseurl }}/guides/v2.3/install-gde/install/cli/install-cli-subcommands-admin.html) to create or edit the Magento Admin user credentials.
 
 | Variable       | Default                     | Description |
 | -------------- | --------------------------- | ----------- |