Merge remote-tracking branch 'origin/2.3-develop' into 141-add-simple…

…-product-to-cart
magento · Oct 1, 2018 · fa5940a · fa5940a
2 parents d43164b + 8460e4e
commit fa5940a
Show file tree

Hide file tree

Showing 119 changed files with 1,510 additions and 629 deletions.
diff --git a/CHANGELOG.md b/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")

diff --git a/app/code/Magento/Analytics/ReportXml/DB/SelectBuilder.php b/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;
     }
 }
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/SelectBuilderTest.php b/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)

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php b/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()

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php b/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

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php b/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()

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
@@ -43,7 +43,7 @@
                        data-validate="{required:true}"
                        value=""
                        placeholder="<?= /* @escapeNotVerified */ __('password') ?>"
-                       autocomplete="new-password"
+                       autocomplete="off"
                     />
             </div>
         </div>

diff --git a/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml b/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-->

diff --git a/app/code/Magento/Bundle/etc/db_schema.xml b/app/code/Magento/Bundle/etc/db_schema.xml
@@ -120,11 +120,11 @@
     <table name="catalog_product_bundle_price_index" resource="default" engine="innodb"
            comment="Catalog Product Bundle Price Index">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
                 comment="Website Id"/>
         <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Customer Group Id"/>
+                comment="Customer Group ID"/>
         <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="false"
                 comment="Min Price"/>
         <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="false"
@@ -153,11 +153,11 @@
     <table name="catalog_product_bundle_stock_index" resource="default" engine="innodb"
            comment="Catalog Product Bundle Stock Index">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                comment="Website Id"/>
+                comment="Website ID"/>
         <column xsi:type="smallint" name="stock_id" padding="5" unsigned="true" nullable="false" identity="false"
-                comment="Stock Id"/>
+                comment="Stock ID"/>
         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Option Id"/>
         <column xsi:type="smallint" name="stock_status" padding="6" unsigned="false" nullable="true" identity="false"
@@ -172,13 +172,13 @@
     <table name="catalog_product_index_price_bundle_idx" resource="default" engine="innodb"
            comment="Catalog Product Index Price Bundle Idx">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
                 identity="false"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                comment="Website Id"/>
+                comment="Website ID"/>
         <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
-                default="0" comment="Tax Class Id"/>
+                default="0" comment="Tax Class ID"/>
         <column xsi:type="smallint" name="price_type" padding="5" unsigned="true" nullable="false" identity="false"
                 comment="Price Type"/>
         <column xsi:type="decimal" name="special_price" scale="4" precision="12" unsigned="false" nullable="true"
@@ -206,13 +206,13 @@
     <table name="catalog_product_index_price_bundle_tmp" resource="default" engine="memory"
            comment="Catalog Product Index Price Bundle Tmp">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
                 identity="false"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                comment="Website Id"/>
+                comment="Website ID"/>
         <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
-                default="0" comment="Tax Class Id"/>
+                default="0" comment="Tax Class ID"/>
         <column xsi:type="smallint" name="price_type" padding="5" unsigned="true" nullable="false" identity="false"
                 comment="Price Type"/>
         <column xsi:type="decimal" name="special_price" scale="4" precision="12" unsigned="false" nullable="true"
@@ -240,11 +240,11 @@
     <table name="catalog_product_index_price_bundle_sel_idx" resource="default" engine="innodb"
            comment="Catalog Product Index Price Bundle Sel Idx">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
                 identity="false"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                comment="Website Id"/>
+                comment="Website ID"/>
         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Option Id"/>
         <column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
@@ -268,11 +268,11 @@
     <table name="catalog_product_index_price_bundle_sel_tmp" resource="default" engine="memory"
            comment="Catalog Product Index Price Bundle Sel Tmp">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
                 identity="false"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                comment="Website Id"/>
+                comment="Website ID"/>
         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Option Id"/>
         <column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
@@ -296,11 +296,11 @@
     <table name="catalog_product_index_price_bundle_opt_idx" resource="default" engine="innodb"
            comment="Catalog Product Index Price Bundle Opt Idx">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
                 identity="false"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                comment="Website Id"/>
+                comment="Website ID"/>
         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Option Id"/>
         <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
@@ -323,11 +323,11 @@
     <table name="catalog_product_index_price_bundle_opt_tmp" resource="default" engine="memory"
            comment="Catalog Product Index Price Bundle Opt Tmp">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
                 identity="false"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                comment="Website Id"/>
+                comment="Website ID"/>
         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Option Id"/>
         <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Image/Upload.php b/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()];
         }