Merge branch 'master' into db_guild

Author: dobooth

src/_includes/upgrade/uct-error-reference.md

@@ -47,8 +47,15 @@ Now create two files:
 
 ```php
 <?php
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(
+    ComponentRegistrar::MODULE,
     'Learning_Js',
     __DIR__
 );

src/_videos/fundamentals/add-a-javascript-module.md

@@ -75,11 +75,14 @@ xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
 ```php
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(
+    ComponentRegistrar::MODULE,
     'Learning_ClothingMaterial',
     __DIR__
 );
@@ -100,12 +103,15 @@ Create the file `app/code/Learning/ClothingMaterial/Setup/InstallData.php`:
 ```php
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 namespace Learning\ClothingMaterial\Setup;
 
+use Magento\Catalog\Model\Product;
+use Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
+use Magento\Eav\Setup\EavSetupFactory;
 use Magento\Framework\Setup\InstallDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
@@ -125,13 +131,13 @@ class InstallData implements InstallDataInterface
      * Init
      * @param EavSetupFactory $eavSetupFactory
      */
-    public function __construct(\Magento\Eav\Setup\EavSetupFactory $eavSetupFactory)
+    public function __construct(EavSetupFactory $eavSetupFactory)
     {
         $this->eavSetupFactory = $eavSetupFactory;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -140,7 +146,7 @@ class InstallData implements InstallDataInterface
     {
         $eavSetup = $this->eavSetupFactory->create();
         $eavSetup->addAttribute(
-            \Magento\Catalog\Model\Product::ENTITY,
+            Product::ENTITY,
             'clothing_material',
             [
                 'group' => 'General',
@@ -152,7 +158,7 @@ class InstallData implements InstallDataInterface
                 'backend' => 'Learning\ClothingMaterial\Model\Attribute\Backend\Material',
                 'required' => false,
                 'sort_order' => 50,
-                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
+                'global' => ScopedAttributeInterface::SCOPE_GLOBAL,
                 'is_used_in_grid' => false,
                 'is_visible_in_grid' => false,
                 'is_filterable_in_grid' => false,
@@ -207,13 +213,15 @@ Next, we need to create the source model:
 ```php
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 namespace Learning\ClothingMaterial\Model\Attribute\Source;
 
-class Material extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
+use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
+
+class Material extends AbstractSource
 {
     /**
      * Get all options
@@ -251,25 +259,29 @@ Now we will create a backend model:
 ```php
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 namespace Learning\ClothingMaterial\Model\Attribute\Backend;
 
-class Material extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
+use Magento\Catalog\Model\Product;
+use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
+use Magento\Framework\Exception\LocalizedException;
+
+class Material extends AbstractBackend
 {
     /**
      * Validate
-     * @param \Magento\Catalog\Model\Product $object
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @param Product $object
+     * @throws LocalizedException
      * @return bool
      */
     public function validate($object)
     {
         $value = $object->getData($this->getAttribute()->getAttributeCode());
         if ( ($object->getAttributeSetId() == 10) && ($value == 'wool')) {
-            throw new \Magento\Framework\Exception\LocalizedException(
+            throw new LocalizedException(
                 __('Bottom can not be wool.')
             );
         }
@@ -297,11 +309,19 @@ And finally, we create a frontend model to make our value bold:
 
 ```php
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
 namespace Learning\ClothingMaterial\Model\Attribute\Frontend;
 
-class Material extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend
+use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
+use Magento\Framework\DataObject;
+
+class Material extends AbstractFrontend
 {
-    public function getValue(\Magento\Framework\DataObject $object)
+    public function getValue(DataObject $object)
     {
         $value = $object->getData($this->getAttribute()->getAttributeCode());
         return "<b>$value</b>";
@@ -387,4 +407,4 @@ Alternatively, you may designate a specific option sorting order as follows:
 
 ```php
    $eavSetup->addAttributeOption($options);
-```
+```

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

@@ -86,9 +86,18 @@ Each module must have this file, which tells Magento how to locate the module. C
 `app/code/Learning/FirstUnit/registration.php`. Then put the following content into it:
 
 ```php
-<?php \Magento\Framework\Component\ComponentRegistrar::register(
-\Magento\Framework\Component\ComponentRegistrar::MODULE, 'Learning_FirstUnit',
-__DIR__
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(
+    ComponentRegistrar::MODULE,
+    'Learning_FirstUnit',
+    __DIR__
 );
 ```
 

src/_videos/fundamentals/create-a-new-module.md

@@ -59,11 +59,18 @@ Learning/HelloPage/etc/module.xml
 ### registration.php
 
 ```php
-<?php /**
-* Copyright © 2016 Magento. All rights reserved. * See COPYING.txt for license details.
-*/
-\Magento\Framework\Component\ComponentRegistrar::register( \Magento\Framework\Component\ComponentRegistrar::MODULE, 'Learning_HelloPage',
-__DIR__
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(
+    ComponentRegistrar::MODULE,
+    'Learning_HelloPage',
+    __DIR__
 );
 ```
 
@@ -94,8 +101,9 @@ Now, since we’re working in the frontend area, we’ll add the `etc/frontend/r
 <?xml version="1.0"?>
 <!--
 /**
-* Copyright © 2016 Magento. All rights reserved. * See COPYING.txt for license details.
-*/
+ * Copyright © Magento, Inc. All rights reserved.
+ * * See COPYING.txt for license details.
+ */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
     <router id="standard">
@@ -130,40 +138,51 @@ mkdir Controller/Page
 Let’s create an action file `Controller/Page/View.php`:
 
 ```php
-<?php /**
- * Copyright © 2016 Magento. All rights reserved.
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Learning\HelloPage\Controller\Page;
-class View extends \Magento\Framework\App\Action\Action
+
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Controller\ResultInterface;
+
+class View extends Action
 {
     /**
-     * @var \Magento\Framework\Controller\Result\JsonFactory
+     * @var JsonFactory
      */
     protected $resultJsonFactory;
+
     /**
-     * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     * @param Context $context
+     * @param JsonFactory $resultJsonFactory
      */
     public function __construct(
-       \Magento\Framework\App\Action\Context $context,
-       \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory)
-{
-       $this->resultJsonFactory = $resultJsonFactory;
-       parent::__construct($context);
-}
+        Context $context,
+        JsonFactory $resultJsonFactory
+    ) {
+        parent::__construct($context);
+        $this->resultJsonFactory = $resultJsonFactory;
+    }
+
     /**
      * View  page action
      *
-     * @return \Magento\Framework\Controller\ResultInterface
+     * @return ResultInterface
      */
     public function execute()
     {
-       $result = $this->resultJsonFactory->create();
-       $data = ['message' => 'Hello world!'];
+        $result = $this->resultJsonFactory->create();
+        $data = ['message' => 'Hello world!'];
 
-return $result->setData($data);
-} }
+        return $result->setData($data);
+    }
+}
 ```
 
 Note we created a JSON-type page. This can be seen in the results factory that we specify in our constructor. In order to activate our module and our page we should run the Magento setup upgrade:

src/_videos/fundamentals/create-a-new-page.md

@@ -368,7 +368,7 @@ stage:
 ```
 
 {:.bs-callout-info}
-If you specify `\magento\Framework\Cache\Backend\RemoteSynchronizedCache` as the Redis backend model, {{ site.data.var.ct }} generates the cache configuration automatically. See an example [configuration file]({{site.baseurl}}/guides/v2.4/config-guide/cache/two-level-cache.html#configuration-example) in the _{{site.data.var.ee}} Configuration Guide_. To override the generated cache configuration, use the [CACHE_CONFIGURATION]({{site.baseurl}}/cloud/env/variables-deploy.html#cache_configuration) deploy variable.
+If you specify `\Magento\Framework\Cache\Backend\RemoteSynchronizedCache` as the Redis backend model, {{ site.data.var.ct }} generates the cache configuration automatically. See an example [configuration file]({{site.baseurl}}/guides/v2.4/config-guide/cache/two-level-cache.html#configuration-example) in the _{{site.data.var.ee}} Configuration Guide_. To override the generated cache configuration, use the [CACHE_CONFIGURATION]({{site.baseurl}}/cloud/env/variables-deploy.html#cache_configuration) deploy variable.
 
 ### `REDIS_USE_SLAVE_CONNECTION`
 

src/cloud/env/variables-deploy.md

@@ -498,7 +498,7 @@ The ece-tools version 2002.0.11 is required for 2.2.4 compatibility.
 
 ## v2002.0.9
 
-{.bs-callout-info}
+{:.bs-callout-info}
 You must [upgrade the {{site.data.var.ece}} metapackage]({{ site.baseurl }}/cloud/project/project-upgrade-parent.html) to get this and all future updates.
 
 -  {:.new}<!-- MAGECLOUD-1086 -->**ece-tools**—The `{{site.data.var.ct}}` package now supports {{site.data.var.ee}} 2.1.x.

src/cloud/release-notes/cloud-release-archive.md

@@ -136,6 +136,14 @@ Prefix the type name with a question mark when declaring a parameter with a `nul
 {% collapsible Example Code %}
 
 ```php
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\App\ObjectManager;
+
 class ExistingClass
 {
     /** @var \New\Dependency\Interface */
@@ -145,10 +153,10 @@ class ExistingClass
         \Old\Dependency\Interface $oldDependency,
         $oldRequiredConstructorParameter,
         $oldOptionalConstructorParameter = null,
-        ?\New\Dependency\Interface $newDependency = null
+        \New\Dependency\Interface $newDependency = null
     ) {
         ...
-        $this->newDependency = $newDependency ?: \Magento\Framework\App\ObjectManager::getInstance()->get(\New\Dependency\Interface::class);
+        $this->newDependency = $newDependency ?: ObjectManager::getInstance()->get(\New\Dependency\Interface::class);
     }
 
     public function existingFunction()