Merge branch '2.2-develop' into ENGCOM-2911-magento-magento2-17889

Author: nmalevanec

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.2/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/AdminNotification/Test/Mftf/composer.json

@@ -87,11 +87,13 @@ public function getJoins()
      * Set joins conditions
      *
      * @param array $joins
-     * @return void
+     * @return $this
      */
     public function setJoins($joins)
     {
         $this->joins = $joins;
+
+        return $this;
     }
 
     /**
@@ -108,11 +110,13 @@ public function getConnectionName()
      * Set connection name
      *
      * @param string $connectionName
-     * @return void
+     * @return $this
      */
     public function setConnectionName($connectionName)
     {
         $this->connectionName = $connectionName;
+
+        return $this;
     }
 
     /**
@@ -129,11 +133,13 @@ public function getColumns()
      * Set columns
      *
      * @param array $columns
-     * @return void
+     * @return $this
      */
     public function setColumns($columns)
     {
         $this->columns = $columns;
+
+        return $this;
     }
 
     /**
@@ -150,11 +156,13 @@ public function getFilters()
      * Set filters
      *
      * @param array $filters
-     * @return void
+     * @return $this
      */
     public function setFilters($filters)
     {
         $this->filters = $filters;
+
+        return $this;
     }
 
     /**
@@ -171,11 +179,13 @@ public function getFrom()
      * Set from condition
      *
      * @param array $from
-     * @return void
+     * @return $this
      */
     public function setFrom($from)
     {
         $this->from = $from;
+
+        return $this;
     }
 
     /**
@@ -238,11 +248,13 @@ public function getGroup()
      * Set group
      *
      * @param array $group
-     * @return void
+     * @return $this
      */
     public function setGroup($group)
     {
         $this->group = $group;
+
+        return $this;
     }
 
     /**
@@ -259,11 +271,13 @@ public function getParams()
      * Set parameters
      *
      * @param array $params
-     * @return void
+     * @return $this
      */
     public function setParams($params)
     {
         $this->params = $params;
+
+        return $this;
     }
 
     /**
@@ -280,10 +294,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/AdvancedPricingImportExport/Test/Mftf/composer.json

@@ -67,12 +67,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/Analytics/ReportXml/DB/SelectBuilder.php

@@ -76,16 +76,23 @@ class Menu extends \Magento\Backend\Block\Template
      */
     private $anchorRenderer;
 
+    /**
+     * @var ConfigInterface
+     */
+    private $routeConfig;
+
     /**
      * @param Template\Context $context
      * @param \Magento\Backend\Model\UrlInterface $url
      * @param \Magento\Backend\Model\Menu\Filter\IteratorFactory $iteratorFactory
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Backend\Model\Menu\Config $menuConfig
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
+     * @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
      * @param array $data
      * @param MenuItemChecker|null $menuItemChecker
      * @param AnchorRenderer|null $anchorRenderer
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -96,7 +103,8 @@ public function __construct(
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
         array $data = [],
         MenuItemChecker $menuItemChecker = null,
-        AnchorRenderer $anchorRenderer = null
+        AnchorRenderer $anchorRenderer = null,
+        \Magento\Framework\App\Route\ConfigInterface $routeConfig = null
     ) {
         $this->_url = $url;
         $this->_iteratorFactory = $iteratorFactory;
@@ -105,6 +113,9 @@ public function __construct(
         $this->_localeResolver = $localeResolver;
         $this->menuItemChecker =  $menuItemChecker;
         $this->anchorRenderer = $anchorRenderer;
+        $this->routeConfig = $routeConfig ?:
+            \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\Framework\App\Route\ConfigInterface::class);
         parent::__construct($context, $data);
     }
 
@@ -203,8 +214,9 @@ protected function _afterToHtml($html)
      */
     protected function _callbackSecretKey($match)
     {
+        $routeId = $this->routeConfig->getRouteByFrontName($match[1]);
         return \Magento\Backend\Model\UrlInterface::SECRET_KEY_PARAM_NAME . '/' . $this->_url->getSecretKey(
-            $match[1],
+            $routeId,
             $match[2],
             $match[3]
         );

app/code/Magento/Analytics/Test/Mftf/composer.json

@@ -127,12 +127,6 @@ public function getItems()
      */
     public function sortButtons(Item $itemA, Item $itemB)
     {
-        $sortOrderA = intval($itemA->getSortOrder());
-        $sortOrderB = intval($itemB->getSortOrder());
-
-        if ($sortOrderA == $sortOrderB) {
-            return 0;
-        }
-        return ($sortOrderA < $sortOrderB) ? -1 : 1;
+        return (int)$itemA->getSortOrder() <=> (int)$itemB->getSortOrder();
     }
 }