Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr36

Author: zakdma

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/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/Controller/Adminhtml/System/Store/DeleteGroupPost.php

@@ -1,16 +1,20 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Store;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class DeleteGroupPost extends \Magento\Backend\Controller\Adminhtml\System\Store
+/**
+ * Delete store.
+ */
+class DeleteGroupPost extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
 {
     /**
+     * @inheritDoc
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()

app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php

@@ -1,14 +1,17 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Store;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class DeleteStorePost extends \Magento\Backend\Controller\Adminhtml\System\Store
+/**
+ * Delete store view.
+ */
+class DeleteStorePost extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
 {
     /**
      * Delete store view post action

app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php

@@ -9,9 +9,13 @@
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
+/**
+ * Delete website.
+ */
 class DeleteWebsitePost extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
 {
     /**
+     * @inheritDoc
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()

app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml

@@ -17,7 +17,10 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-94176"/>
             <group value="backup"/>
-            <group value="skip"/>
+            <skip>
+                <issueId value="MQE-1187"/>
+                <issueId value="DEVOPS-3512"/>
+            </skip>
         </annotations>
 
         <!--Login to admin area-->

app/code/Magento/Bundle/Model/Product/Type.php

@@ -1014,10 +1014,8 @@ public function shakeSelections($firstItem, $secondItem)
             $secondItem->getPosition(),
             $secondItem->getSelectionId(),
         ];
-        if ($aPosition == $bPosition) {
-            return 0;
-        }
-        return $aPosition < $bPosition ? -1 : 1;
+
+        return $aPosition <=> $bPosition;
     }
 
     /**

app/code/Magento/Catalog/Controller/Adminhtml/Category/Image/Upload.php

@@ -5,12 +5,13 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Category\Image;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
 /**
  * Class Upload
  */
-class Upload extends \Magento\Backend\App\Action
+class Upload extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Image uploader
@@ -54,14 +55,6 @@ public function execute()
 
         try {
             $result = $this->imageUploader->saveFileToTmpDir($imageId);
-
-            $result['cookie'] = [
-                'name' => $this->_getSession()->getName(),
-                'value' => $this->_getSession()->getSessionId(),
-                'lifetime' => $this->_getSession()->getCookieLifetime(),
-                'path' => $this->_getSession()->getCookiePath(),
-                'domain' => $this->_getSession()->getCookieDomain(),
-            ];
         } catch (\Exception $e) {
             $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
         }

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml

@@ -117,7 +117,7 @@
         <element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first" />
         <element name="UploadImage" type="file" selector=".fileupload" />
         <element name="OkBtn" type="button" selector="//span[text()='Ok']"/>
-        <element name="InsertFile" type="text" selector="#insert_files"/>
+        <element name="InsertFile" type="text" selector="#insert_files" timeout="30"/>
         <element name="CreateFolder" type="button" selector="#new_folder" />
         <element name="DeleteSelectedBtn" type="text" selector="#delete_files"/>
         <element name="CancelBtn" type="button" selector="#cancel" />