Merge branch 'develop' into bugfixes

chntylz · Aug 2, 2017 · 7be1a0e · 7be1a0e
2 parents 0fa9f19 + da064df
commit 7be1a0e
Show file tree

Hide file tree

Showing 209 changed files with 3,489 additions and 1,878 deletions.
diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-store": "100.2.*",
-        "magento/module-backend": "100.2.*",
-        "magento/module-media-storage": "100.2.*",
-        "magento/framework": "100.2.*",
-        "magento/module-ui": "100.2.*",
+        "magento/module-store": "100.3.*",
+        "magento/module-backend": "100.3.*",
+        "magento/module-media-storage": "100.3.*",
+        "magento/framework": "100.3.*",
+        "magento/module-ui": "100.3.*",
         "lib-libxml": "*"
     },
     "type": "magento2-module",
-    "version": "100.2.0-dev",
+    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/AdvancedPricingImportExport/composer.json b/app/code/Magento/AdvancedPricingImportExport/composer.json
@@ -3,17 +3,17 @@
     "description": "N/A",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-catalog": "101.1.*",
-        "magento/module-catalog-inventory": "100.2.*",
-        "magento/module-eav": "100.2.*",
-        "magento/module-import-export": "100.2.*",
-        "magento/module-catalog-import-export": "100.2.*",
-        "magento/module-customer": "100.2.*",
-        "magento/module-store": "100.2.*",
-        "magento/framework": "100.2.*"
+        "magento/module-catalog": "101.2.*",
+        "magento/module-catalog-inventory": "100.3.*",
+        "magento/module-eav": "100.3.*",
+        "magento/module-import-export": "100.3.*",
+        "magento/module-catalog-import-export": "100.3.*",
+        "magento/module-customer": "100.3.*",
+        "magento/module-store": "100.3.*",
+        "magento/framework": "100.3.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0-dev",
+    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Analytics/composer.json b/app/code/Magento/Analytics/composer.json
@@ -3,14 +3,14 @@
     "description": "N/A",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-backend": "100.2.*",
-        "magento/module-config": "100.2.*",
-        "magento/module-integration": "100.2.*",
-        "magento/module-store": "100.2.*",
-        "magento/framework": "100.2.*"
+        "magento/module-backend": "100.3.*",
+        "magento/module-config": "100.3.*",
+        "magento/module-integration": "100.3.*",
+        "magento/module-store": "100.3.*",
+        "magento/framework": "100.3.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0-dev",
+    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
@@ -3,11 +3,11 @@
     "description": "Authorization module provides access to Magento ACL functionality.",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-backend": "100.2.*",
-        "magento/framework": "100.2.*"
+        "magento/module-backend": "100.3.*",
+        "magento/framework": "100.3.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0-dev",
+    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Authorizenet/composer.json b/app/code/Magento/Authorizenet/composer.json
@@ -3,20 +3,20 @@
     "description": "N/A",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-sales": "100.2.*",
-        "magento/module-store": "100.2.*",
-        "magento/module-quote": "100.2.*",
-        "magento/module-checkout": "100.2.*",
-        "magento/module-backend": "100.2.*",
-        "magento/module-payment": "100.2.*",
-        "magento/module-catalog": "101.1.*",
-        "magento/framework": "100.2.*"
+        "magento/module-sales": "100.3.*",
+        "magento/module-store": "100.3.*",
+        "magento/module-quote": "100.3.*",
+        "magento/module-checkout": "100.3.*",
+        "magento/module-backend": "100.3.*",
+        "magento/module-payment": "100.3.*",
+        "magento/module-catalog": "101.2.*",
+        "magento/framework": "100.3.*"
     },
     "suggest": {
-        "magento/module-config": "100.2.*"
+        "magento/module-config": "100.3.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0-dev",
+    "version": "100.3.0-dev",
     "license": [
         "proprietary"
     ],

diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
@@ -3,28 +3,28 @@
     "description": "N/A",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-store": "100.2.*",
-        "magento/module-directory": "100.2.*",
-        "magento/module-developer": "100.2.*",
-        "magento/module-eav": "100.2.*",
-        "magento/module-reports": "100.2.*",
-        "magento/module-sales": "100.2.*",
-        "magento/module-quote": "100.2.*",
-        "magento/module-catalog": "101.1.*",
-        "magento/module-user": "100.2.*",
-        "magento/module-security": "100.2.*",
-        "magento/module-backup": "100.2.*",
-        "magento/module-customer": "100.2.*",
-        "magento/module-translation": "100.2.*",
-        "magento/module-require-js": "100.2.*",
-        "magento/module-config": "100.2.*",
-        "magento/framework": "100.2.*"
+        "magento/module-store": "100.3.*",
+        "magento/module-directory": "100.3.*",
+        "magento/module-developer": "100.3.*",
+        "magento/module-eav": "100.3.*",
+        "magento/module-reports": "100.3.*",
+        "magento/module-sales": "100.3.*",
+        "magento/module-quote": "100.3.*",
+        "magento/module-catalog": "101.2.*",
+        "magento/module-user": "100.3.*",
+        "magento/module-security": "100.3.*",
+        "magento/module-backup": "100.3.*",
+        "magento/module-customer": "100.3.*",
+        "magento/module-translation": "100.3.*",
+        "magento/module-require-js": "100.3.*",
+        "magento/module-config": "100.3.*",
+        "magento/framework": "100.3.*"
     },
     "suggest": {
-        "magento/module-theme": "100.2.*"
+        "magento/module-theme": "100.3.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0-dev",
+    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
@@ -3,13 +3,13 @@
     "description": "N/A",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-store": "100.2.*",
-        "magento/module-backend": "100.2.*",
-        "magento/module-cron": "100.2.*",
-        "magento/framework": "100.2.*"
+        "magento/module-store": "100.3.*",
+        "magento/module-backend": "100.3.*",
+        "magento/module-cron": "100.3.*",
+        "magento/framework": "100.3.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0-dev",
+    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json
@@ -3,28 +3,28 @@
     "description": "N/A",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.2.*",
+        "magento/framework": "100.3.*",
         "magento/magento-composer-installer": "*",
-        "magento/module-config": "100.2.*",
-        "magento/module-directory": "100.2.*",
-        "magento/module-payment": "100.2.*",
-        "magento/module-checkout": "100.2.*",
-        "magento/module-sales": "100.2.*",
-        "magento/module-backend": "100.2.*",
-        "magento/module-vault": "100.2.*",
-        "magento/module-customer": "100.2.*",
-        "magento/module-catalog": "101.1.*",
-        "magento/module-quote": "100.2.*",
-        "magento/module-paypal": "100.2.*",
-        "magento/module-ui": "100.2.*",
+        "magento/module-config": "100.3.*",
+        "magento/module-directory": "100.3.*",
+        "magento/module-payment": "100.3.*",
+        "magento/module-checkout": "100.3.*",
+        "magento/module-sales": "100.3.*",
+        "magento/module-backend": "100.3.*",
+        "magento/module-vault": "100.3.*",
+        "magento/module-customer": "100.3.*",
+        "magento/module-catalog": "101.2.*",
+        "magento/module-quote": "100.3.*",
+        "magento/module-paypal": "100.3.*",
+        "magento/module-ui": "100.3.*",
         "braintree/braintree_php": "3.22.0"
     },
     "suggest": {
-        "magento/module-checkout-agreements": "100.2.*",
-        "magento/module-theme": "100.2.*"
+        "magento/module-checkout-agreements": "100.3.*",
+        "magento/module-theme": "100.3.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0-dev",
+    "version": "100.3.0-dev",
     "license": [
         "proprietary"
     ],

diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
@@ -3,29 +3,29 @@
     "description": "N/A",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-store": "100.2.*",
-        "magento/module-catalog": "101.1.*",
-        "magento/module-tax": "100.2.*",
-        "magento/module-backend": "100.2.*",
-        "magento/module-sales": "100.2.*",
-        "magento/module-checkout": "100.2.*",
-        "magento/module-catalog-inventory": "100.2.*",
-        "magento/module-customer": "100.2.*",
-        "magento/module-catalog-rule": "100.2.*",
-        "magento/module-eav": "100.2.*",
-        "magento/module-config": "100.2.*",
-        "magento/module-gift-message": "100.2.*",
-        "magento/framework": "100.2.*",
-        "magento/module-quote": "100.2.*",
-        "magento/module-media-storage": "100.2.*",
-        "magento/module-ui": "100.2.*"
+        "magento/module-store": "100.3.*",
+        "magento/module-catalog": "101.2.*",
+        "magento/module-tax": "100.3.*",
+        "magento/module-backend": "100.3.*",
+        "magento/module-sales": "100.3.*",
+        "magento/module-checkout": "100.3.*",
+        "magento/module-catalog-inventory": "100.3.*",
+        "magento/module-customer": "100.3.*",
+        "magento/module-catalog-rule": "100.3.*",
+        "magento/module-eav": "100.3.*",
+        "magento/module-config": "100.3.*",
+        "magento/module-gift-message": "100.3.*",
+        "magento/framework": "100.3.*",
+        "magento/module-quote": "100.3.*",
+        "magento/module-media-storage": "100.3.*",
+        "magento/module-ui": "100.3.*"
     },
     "suggest": {
-        "magento/module-webapi": "100.2.*",
-        "magento/module-bundle-sample-data": "Sample Data version:100.2.*"
+        "magento/module-webapi": "100.3.*",
+        "magento/module-bundle-sample-data": "Sample Data version:100.3.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0-dev",
+    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Bundle/view/frontend/layout/checkout_onepage_review_item_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/checkout_onepage_review_item_renderers.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="checkout.onepage.review.item.renderers">
-            <block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::onepage/review/item.phtml"/>
+            <block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" name="checkout.onepage.review.item.renderers.bundle" as="bundle" template="Magento_Checkout::onepage/review/item.phtml"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_creditmemo_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_creditmemo_renderers.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="sales.email.order.creditmemo.renderers">
-            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="Magento_Bundle::email/order/items/creditmemo/default.phtml"/>
+            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" name="sales.email.order.creditmemo.renderers.bundle" as="bundle" template="Magento_Bundle::email/order/items/creditmemo/default.phtml"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_invoice_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_invoice_renderers.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="sales.email.order.invoice.renderers">
-            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="Magento_Bundle::email/order/items/invoice/default.phtml"/>
+            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" name="sales.email.order.invoice.renderers.bundle" as="bundle" template="Magento_Bundle::email/order/items/invoice/default.phtml"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_renderers.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="sales.email.order.renderers">
-            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="Magento_Bundle::email/order/items/order/default.phtml"/>
+            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" name="sales.email.order.renderers.bundle" as="bundle" template="Magento_Bundle::email/order/items/order/default.phtml"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_shipment_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_shipment_renderers.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="sales.email.order.shipment.renderers">
-            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="Magento_Bundle::email/order/items/shipment/default.phtml"/>
+            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" name="sales.email.order.shipment.renderers.bundle" as="bundle" template="Magento_Bundle::email/order/items/shipment/default.phtml"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_creditmemo_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_creditmemo_renderers.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="sales.order.creditmemo.renderers">
-            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="Magento_Bundle::sales/order/creditmemo/items/renderer.phtml"/>
+            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" name="sales.order.creditmemo.renderers.bundle" as="bundle" template="Magento_Bundle::sales/order/creditmemo/items/renderer.phtml"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_invoice_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_invoice_renderers.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="sales.order.invoice.renderers">
-            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="Magento_Bundle::sales/order/invoice/items/renderer.phtml"/>
+            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" name="sales.order.invoice.renderers.bundle" as="bundle" template="Magento_Bundle::sales/order/invoice/items/renderer.phtml"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_item_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_item_renderers.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="sales.order.items.renderers">
-            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="Magento_Bundle::sales/order/items/renderer.phtml"/>
+            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" name="sales.order.items.renderers.bundle" as="bundle" template="Magento_Bundle::sales/order/items/renderer.phtml"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_creditmemo_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_creditmemo_renderers.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="sales.order.print.creditmemo.renderers">
-            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="Magento_Bundle::sales/order/creditmemo/items/renderer.phtml"/>
+            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" name="sales.order.print.creditmemo.renderers.bundle" as="bundle" template="Magento_Bundle::sales/order/creditmemo/items/renderer.phtml"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_invoice_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_invoice_renderers.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="sales.order.print.invoice.renderers">
-            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="Magento_Bundle::sales/order/invoice/items/renderer.phtml"/>
+            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" name="sales.order.print.invoice.renderers.bundle" as="bundle" template="Magento_Bundle::sales/order/invoice/items/renderer.phtml"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_renderers.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="sales.order.print.renderers">
-            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="Magento_Bundle::sales/order/items/renderer.phtml"/>
+            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" name="sales.order.print.renderers.bundle" as="bundle" template="Magento_Bundle::sales/order/items/renderer.phtml"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_shipment_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_shipment_renderers.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="sales.order.print.shipment.renderers">
-            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="Magento_Bundle::sales/order/shipment/items/renderer.phtml"/>
+            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" name="sales.order.print.shipment.renderers.bundle" as="bundle" template="Magento_Bundle::sales/order/shipment/items/renderer.phtml"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_shipment_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_shipment_renderers.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="sales.order.shipment.renderers">
-            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="Magento_Bundle::sales/order/shipment/items/renderer.phtml"/>
+            <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" name="sales.order.shipment.renderers.bundle" as="bundle" template="Magento_Bundle::sales/order/shipment/items/renderer.phtml"/>
         </referenceBlock>
     </body>
 </page>