Merge pull request magento#18531 to magento#18529

Author: magento-engcom-team

CHANGELOG.md

@@ -1,3 +1,7 @@
+2.3.0
+=============
+To get detailed information about changes in Magento 2.3.0, see the [Release Notes](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html)
+
 2.1.0
 =============
 To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")

README.md

@@ -41,20 +41,8 @@ Magento is thankful for any contribution that can improve our code base, documen
 </a>
 
 <h3>Labels applied by the Magento team</h3>
-
-| Label        | Description           | 
-| ------------- |-------------|
-| ![DOC](http://devdocs.magento.com/common/images/github_DOC.png) | Affects Documentation domain. |
-| ![PROD](http://devdocs.magento.com/common/images/github_PROD.png) | Affects the Product team (mostly feature requests or business logic change). |
-| ![TECH](http://devdocs.magento.com/common/images/github_TECH.png) | Affects Architect Group (mostly to make decisions around technology changes). |
-| ![accept](http://devdocs.magento.com/common/images/github_accept.png) | The pull request has been accepted and will be merged into mainline code. |
-| ![reject](http://devdocs.magento.com/common/images/github_reject.png) | The pull request has been rejected and will not be merged into mainline code. Possible reasons can include but are not limited to: issue has already been fixed in another code contribution, or there is an issue with the code contribution. |
-| ![bug report](http://devdocs.magento.com/common/images/github_bug.png) | The Magento Team has confirmed that this issue contains the minimum required information to reproduce. |
-| ![acknowledged](http://devdocs.magento.com/common/images/gitHub_acknowledged.png) | The Magento Team has validated the issue and an internal ticket has been created. |
-| ![in progress](http://devdocs.magento.com/common/images/github_inProgress.png) | The internal ticket is currently in progress, fix is scheduled to be delivered. |
-| ![needs update](http://devdocs.magento.com/common/images/github_needsUpdate.png) | The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request. |
-
-To learn more about issue gate labels click [here](https://github.com/magento/magento2/wiki/Magento-Issue-Gates)
+We apply labels to public Pull Requests and Issues to help other participants retrieve additional information about current progress, component assignments, Magento release lines, and much more. 
+Please review the <a href="https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#labels">Code Contributions guide</a> for detailed information on labels used in Magento 2 repositories.
 
 <h2>Reporting security issues</h2>
 

app/code/Magento/Analytics/ReportXml/DB/SelectBuilder.php

@@ -11,6 +11,7 @@
 
 /**
  * Responsible for Select object creation, works as a builder. Returns Select as result;
+ *
  * Used in SQL assemblers.
  */
 class SelectBuilder
@@ -85,11 +86,13 @@ public function getJoins()
      * Set joins conditions
      *
      * @param array $joins
-     * @return void
+     * @return $this
      */
     public function setJoins($joins)
     {
         $this->joins = $joins;
+
+        return $this;
     }
 
     /**
@@ -106,11 +109,13 @@ public function getConnectionName()
      * Set connection name
      *
      * @param string $connectionName
-     * @return void
+     * @return $this
      */
     public function setConnectionName($connectionName)
     {
         $this->connectionName = $connectionName;
+
+        return $this;
     }
 
     /**
@@ -127,11 +132,13 @@ public function getColumns()
      * Set columns
      *
      * @param array $columns
-     * @return void
+     * @return $this
      */
     public function setColumns($columns)
     {
         $this->columns = $columns;
+
+        return $this;
     }
 
     /**
@@ -148,11 +155,13 @@ public function getFilters()
      * Set filters
      *
      * @param array $filters
-     * @return void
+     * @return $this
      */
     public function setFilters($filters)
     {
         $this->filters = $filters;
+
+        return $this;
     }
 
     /**
@@ -169,11 +178,13 @@ public function getFrom()
      * Set from condition
      *
      * @param array $from
-     * @return void
+     * @return $this
      */
     public function setFrom($from)
     {
         $this->from = $from;
+
+        return $this;
     }
 
     /**
@@ -236,11 +247,13 @@ public function getGroup()
      * Set group
      *
      * @param array $group
-     * @return void
+     * @return $this
      */
     public function setGroup($group)
     {
         $this->group = $group;
+
+        return $this;
     }
 
     /**
@@ -257,11 +270,13 @@ public function getParams()
      * Set parameters
      *
      * @param array $params
-     * @return void
+     * @return $this
      */
     public function setParams($params)
     {
         $this->params = $params;
+
+        return $this;
     }
 
     /**
@@ -278,10 +293,12 @@ public function getHaving()
      * Set having condition
      *
      * @param array $having
-     * @return void
+     * @return $this
      */
     public function setHaving($having)
     {
         $this->having = $having;
+
+        return $this;
     }
 }

app/code/Magento/Analytics/Test/Unit/ReportXml/DB/SelectBuilderTest.php

@@ -64,12 +64,12 @@ public function testCreate()
             ['link-type' => 'right', 'table' => 'attribute', 'condition' => 'neq'],
         ];
         $groups = ['id', 'name'];
-        $this->selectBuilder->setConnectionName($connectionName);
-        $this->selectBuilder->setFrom($from);
-        $this->selectBuilder->setColumns($columns);
-        $this->selectBuilder->setFilters([$filter]);
-        $this->selectBuilder->setJoins($joins);
-        $this->selectBuilder->setGroup($groups);
+        $this->selectBuilder->setConnectionName($connectionName)
+            ->setFrom($from)
+            ->setColumns($columns)
+            ->setFilters([$filter])
+            ->setJoins($joins)
+            ->setGroup($groups);
         $this->resourceConnectionMock->expects($this->once())
             ->method('getConnection')
             ->with($connectionName)

app/code/Magento/Backend/Block/Widget/Button/ButtonList.php

@@ -7,6 +7,8 @@
 namespace Magento\Backend\Block\Widget\Button;
 
 /**
+ * Button list widget
+ *
  * @api
  * @since 100.0.2
  */
@@ -127,12 +129,6 @@ public function getItems()
      */
     public function sortButtons(Item $itemA, Item $itemB)
     {
-        $sortOrderA = (int) $itemA->getSortOrder();
-        $sortOrderB = (int) $itemB->getSortOrder();
-
-        if ($sortOrderA == $sortOrderB) {
-            return 0;
-        }
-        return ($sortOrderA < $sortOrderB) ? -1 : 1;
+        return (int)$itemA->getSortOrder() <=> (int)$itemB->getSortOrder();
     }
 }

app/code/Magento/Backend/Block/Widget/Form.php

@@ -3,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Block\Widget;
 
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Backend form widget
  *
@@ -27,13 +30,23 @@ class Form extends \Magento\Backend\Block\Widget
      */
     protected $_template = 'Magento_Backend::widget/form.phtml';
 
+    /** @var Form\Element\ElementCreator */
+    private $creator;
+
     /**
+     * Constructs form
+     *
      * @param \Magento\Backend\Block\Template\Context $context
      * @param array $data
+     * @param Form\Element\ElementCreator|null $creator
      */
-    public function __construct(\Magento\Backend\Block\Template\Context $context, array $data = [])
-    {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        array $data = [],
+        Form\Element\ElementCreator $creator = null
+    ) {
         parent::__construct($context, $data);
+        $this->creator = $creator ?: ObjectManager::getInstance()->get(Form\Element\ElementCreator::class);
     }
 
     /**
@@ -148,6 +161,7 @@ protected function _beforeToHtml()
 
     /**
      * Initialize form fields values
+     *
      * Method will be called after prepareForm and can be used for field values initialization
      *
      * @return $this
@@ -173,32 +187,11 @@ protected function _setFieldset($attributes, $fieldset, $exclude = [])
             if (!$this->_isAttributeVisible($attribute)) {
                 continue;
             }
-            if (($inputType = $attribute->getFrontend()->getInputType()) && !in_array(
-                $attribute->getAttributeCode(),
-                $exclude
-            ) && ('media_image' != $inputType || $attribute->getAttributeCode() == 'image')
+            if (($inputType = $attribute->getFrontend()->getInputType())
+                && !in_array($attribute->getAttributeCode(), $exclude)
+                && ('media_image' !== $inputType || $attribute->getAttributeCode() == 'image')
             ) {
-                $fieldType = $inputType;
-                $rendererClass = $attribute->getFrontend()->getInputRendererClass();
-                if (!empty($rendererClass)) {
-                    $fieldType = $inputType . '_' . $attribute->getAttributeCode();
-                    $fieldset->addType($fieldType, $rendererClass);
-                }
-
-                $element = $fieldset->addField(
-                    $attribute->getAttributeCode(),
-                    $fieldType,
-                    [
-                        'name' => $attribute->getAttributeCode(),
-                        'label' => $attribute->getFrontend()->getLocalizedLabel(),
-                        'class' => $attribute->getFrontend()->getClass(),
-                        'required' => $attribute->getIsRequired(),
-                        'note' => $attribute->getNote()
-                    ]
-                )->setEntityAttribute(
-                    $attribute
-                );
-
+                $element = $this->creator->create($fieldset, $attribute);
                 $element->setAfterElementHtml($this->_getAdditionalElementHtml($element));
 
                 $this->_applyTypeSpecificConfig($inputType, $element, $attribute);