Merge pull request #2 from magento/2.3-develop

Update repo
magento · Oct 27, 2018 · 8ea303b · 8ea303b
2 parents 1c820be + eb27ac2
commit 8ea303b
Show file tree

Hide file tree

Showing 514 changed files with 11,607 additions and 5,988 deletions.
diff --git a/README.md b/README.md
@@ -6,11 +6,11 @@
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
 
 ## Magento system requirements
-[Magento system requirements](http://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html).
+[Magento system requirements](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html).
 
 ## Install Magento
 
-*	[Installation guide](http://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
+*	[Installation guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
 
 <h2>Contributing to the Magento 2 code base</h2>
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
@@ -21,10 +21,10 @@ To learn about issues, click [here][2]. To open an issue, click [here][3].
 
 To suggest documentation improvements, click [here][4].
 
-[1]: <http://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html>
-[2]: <http://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report>
+[1]: <https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html>
+[2]: <https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report>
 [3]: <https://github.com/magento/magento2/issues>
-[4]: <http://devdocs.magento.com>
+[4]: <https://devdocs.magento.com>
 
 <h3>Community Maintainers</h3>
 The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.
@@ -53,9 +53,9 @@ Stay up-to-date on the latest security news and patches for Magento by signing u
 
 Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license.
 
-http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-Please see LICENSE.txt for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
+[Open Software License (OSL 3.0)](https://opensource.org/licenses/osl-3.0.php).
+Please see [LICENSE.txt](https://github.com/magento/magento2/blob/2.3-develop/LICENSE.txt) for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
 
 Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
-Please see LICENSE_EE.txt for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.
+Please see LICENSE_EE.txt for the full text of the MEE License or visit https://magento.com/legal/terms/enterprise.
 
diff --git a/app/code/Magento/AdminNotification/Block/Window.php b/app/code/Magento/AdminNotification/Block/Window.php
@@ -8,6 +8,8 @@
 namespace Magento\AdminNotification\Block;
 
 /**
+ * Admin notification window block
+ *
  * @api
  * @since 100.0.2
  */
@@ -40,7 +42,7 @@ class Window extends \Magento\Backend\Block\Template
     protected $_criticalCollection;
 
     /**
-     * @var \Magento\Adminnotification\Model\Inbox
+     * @var \Magento\AdminNotification\Model\Inbox
      */
     protected $_latestItem;
 
@@ -92,7 +94,7 @@ protected function _toHtml()
     /**
      * Retrieve latest critical item
      *
-     * @return bool|\Magento\Adminnotification\Model\Inbox
+     * @return bool|\Magento\AdminNotification\Model\Inbox
      */
     protected function _getLatestItem()
     {

diff --git a/app/code/Magento/AdminNotification/etc/db_schema.xml b/app/code/Magento/AdminNotification/etc/db_schema.xml
@@ -21,16 +21,16 @@
                 default="0" comment="Flag if notification read"/>
         <column xsi:type="smallint" name="is_remove" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Flag if notification might be removed"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="notification_id"/>
         </constraint>
-        <index name="ADMINNOTIFICATION_INBOX_SEVERITY" indexType="btree">
+        <index referenceId="ADMINNOTIFICATION_INBOX_SEVERITY" indexType="btree">
             <column name="severity"/>
         </index>
-        <index name="ADMINNOTIFICATION_INBOX_IS_READ" indexType="btree">
+        <index referenceId="ADMINNOTIFICATION_INBOX_IS_READ" indexType="btree">
             <column name="is_read"/>
         </index>
-        <index name="ADMINNOTIFICATION_INBOX_IS_REMOVE" indexType="btree">
+        <index referenceId="ADMINNOTIFICATION_INBOX_IS_REMOVE" indexType="btree">
             <column name="is_remove"/>
         </index>
     </table>
@@ -40,7 +40,7 @@
                 default="0" comment="Problem type"/>
         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
                 comment="Create date"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="identity"/>
         </constraint>
     </table>

diff --git a/app/code/Magento/AdvancedSearch/etc/db_schema.xml b/app/code/Magento/AdvancedSearch/etc/db_schema.xml
@@ -14,13 +14,13 @@
                 default="0" comment="Query Id"/>
         <column xsi:type="int" name="relation_id" padding="10" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Relation Id"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
         </constraint>
-        <constraint xsi:type="foreign" name="CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID"
+        <constraint xsi:type="foreign" referenceId="CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID"
                     table="catalogsearch_recommendations" column="query_id" referenceTable="search_query"
                     referenceColumn="query_id" onDelete="CASCADE"/>
-        <constraint xsi:type="foreign" name="CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID"
+        <constraint xsi:type="foreign" referenceId="CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID"
                     table="catalogsearch_recommendations" column="relation_id" referenceTable="search_query"
                     referenceColumn="query_id" onDelete="CASCADE"/>
     </table>

diff --git a/app/code/Magento/AsynchronousOperations/etc/db_schema.xml b/app/code/Magento/AsynchronousOperations/etc/db_schema.xml
@@ -21,13 +21,13 @@
                 comment="Total number of operations scheduled within this bulk"/>
         <column xsi:type="timestamp" name="start_time" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
                 comment="Bulk start time"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
         </constraint>
-        <constraint xsi:type="unique" name="MAGENTO_BULK_UUID">
+        <constraint xsi:type="unique" referenceId="MAGENTO_BULK_UUID">
             <column name="uuid"/>
         </constraint>
-        <index name="MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID" indexType="btree">
+        <index referenceId="MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID" indexType="btree">
             <column name="user_id"/>
         </index>
     </table>
@@ -47,12 +47,12 @@
                 comment="Code of the error that appeared during operation execution (used to aggregate related failed operations)"/>
         <column xsi:type="varchar" name="result_message" nullable="true" length="255"
                 comment="Operation result message"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
         </constraint>
-        <constraint xsi:type="foreign" name="MAGENTO_OPERATION_BULK_UUID_MAGENTO_BULK_UUID" table="magento_operation"
+        <constraint xsi:type="foreign" referenceId="MAGENTO_OPERATION_BULK_UUID_MAGENTO_BULK_UUID" table="magento_operation"
                     column="bulk_uuid" referenceTable="magento_bulk" referenceColumn="uuid" onDelete="CASCADE"/>
-        <index name="MAGENTO_OPERATION_BULK_UUID_ERROR_CODE" indexType="btree">
+        <index referenceId="MAGENTO_OPERATION_BULK_UUID_ERROR_CODE" indexType="btree">
             <column name="bulk_uuid"/>
             <column name="error_code"/>
         </index>
@@ -62,13 +62,13 @@
         <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Internal ID"/>
         <column xsi:type="varbinary" name="bulk_uuid" nullable="true" length="39" comment="Related Bulk UUID"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
         </constraint>
-        <constraint xsi:type="foreign" name="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID_MAGENTO_BULK_UUID"
+        <constraint xsi:type="foreign" referenceId="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID_MAGENTO_BULK_UUID"
                     table="magento_acknowledged_bulk" column="bulk_uuid" referenceTable="magento_bulk"
                     referenceColumn="uuid" onDelete="CASCADE"/>
-        <constraint xsi:type="unique" name="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID">
+        <constraint xsi:type="unique" referenceId="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID">
             <column name="bulk_uuid"/>
         </constraint>
     </table>

diff --git a/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json b/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json
@@ -15,7 +15,8 @@
         },
         "constraint": {
             "PRIMARY": true,
-            "MAGENTO_BULK_UUID": true
+            "MAGENTO_BULK_UUID": true,
+            "MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID": true
         }
     },
     "magento_operation": {

diff --git a/app/code/Magento/Authorization/etc/db_schema.xml b/app/code/Magento/Authorization/etc/db_schema.xml
@@ -21,14 +21,14 @@
                 comment="User ID"/>
         <column xsi:type="varchar" name="user_type" nullable="true" length="16" comment="User Type"/>
         <column xsi:type="varchar" name="role_name" nullable="true" length="50" comment="Role Name"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="role_id"/>
         </constraint>
-        <index name="AUTHORIZATION_ROLE_PARENT_ID_SORT_ORDER" indexType="btree">
+        <index referenceId="AUTHORIZATION_ROLE_PARENT_ID_SORT_ORDER" indexType="btree">
             <column name="parent_id"/>
             <column name="sort_order"/>
         </index>
-        <index name="AUTHORIZATION_ROLE_TREE_LEVEL" indexType="btree">
+        <index referenceId="AUTHORIZATION_ROLE_TREE_LEVEL" indexType="btree">
             <column name="tree_level"/>
         </index>
     </table>
@@ -40,17 +40,17 @@
         <column xsi:type="varchar" name="resource_id" nullable="true" length="255" comment="Resource ID"/>
         <column xsi:type="varchar" name="privileges" nullable="true" length="20" comment="Privileges"/>
         <column xsi:type="varchar" name="permission" nullable="true" length="10" comment="Permission"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="rule_id"/>
         </constraint>
-        <constraint xsi:type="foreign" name="AUTHORIZATION_RULE_ROLE_ID_AUTHORIZATION_ROLE_ROLE_ID"
+        <constraint xsi:type="foreign" referenceId="AUTHORIZATION_RULE_ROLE_ID_AUTHORIZATION_ROLE_ROLE_ID"
                     table="authorization_rule" column="role_id" referenceTable="authorization_role"
                     referenceColumn="role_id" onDelete="CASCADE"/>
-        <index name="AUTHORIZATION_RULE_RESOURCE_ID_ROLE_ID" indexType="btree">
+        <index referenceId="AUTHORIZATION_RULE_RESOURCE_ID_ROLE_ID" indexType="btree">
             <column name="resource_id"/>
             <column name="role_id"/>
         </index>
-        <index name="AUTHORIZATION_RULE_ROLE_ID_RESOURCE_ID" indexType="btree">
+        <index referenceId="AUTHORIZATION_RULE_ROLE_ID_RESOURCE_ID" indexType="btree">
             <column name="role_id"/>
             <column name="resource_id"/>
         </index>

diff --git a/app/code/Magento/Backend/view/adminhtml/web/js/validate-store.js b/app/code/Magento/Backend/view/adminhtml/web/js/validate-store.js
@@ -67,6 +67,7 @@ define([
                              * 'Confirm' action handler.
                              */
                             confirm: function () {
+                                $('body').trigger('processStart');
                                 dataPost().postData(requestData);
                             }
                         }

diff --git a/app/code/Magento/Braintree/Controller/Paypal/Review.php b/app/code/Magento/Braintree/Controller/Paypal/Review.php
@@ -12,11 +12,12 @@
 use Magento\Braintree\Gateway\Config\PayPal\Config;
 use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
 /**
  * Class Review
  */
-class Review extends AbstractAction
+class Review extends AbstractAction implements HttpPostActionInterface
 {
     /**
      * @var QuoteUpdater
@@ -60,7 +61,7 @@ public function execute()
         try {
             $this->validateQuote($quote);
 
-            if ($this->validateRequestData($requestData)) {
+            if ($requestData && $this->validateRequestData($requestData)) {
                 $this->quoteUpdater->execute(
                     $requestData['nonce'],
                     $requestData['details'],
@@ -91,6 +92,8 @@ public function execute()
     }
 
     /**
+     * Validate request data
+     *
      * @param array $requestData
      * @return boolean
      */