Merge changes from 2.3.4-rc

magento · Jan 13, 2020 · 5f3b86a · 5f3b86a
1 parent 76984d7
commit 5f3b86a
Show file tree

Hide file tree

Showing 228 changed files with 2,083 additions and 1,310 deletions.
diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
@@ -27,5 +27,5 @@
             "Magento\\AdminNotification\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/AdvancedPricingImportExport/composer.json b/app/code/Magento/AdvancedPricingImportExport/composer.json
@@ -28,5 +28,5 @@
             "Magento\\AdvancedPricingImportExport\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/AdvancedSearch/composer.json b/app/code/Magento/AdvancedSearch/composer.json
@@ -28,5 +28,5 @@
             "Magento\\AdvancedSearch\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/Amqp/composer.json b/app/code/Magento/Amqp/composer.json
@@ -23,5 +23,5 @@
             "Magento\\Amqp\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/Analytics/composer.json b/app/code/Magento/Analytics/composer.json
@@ -22,5 +22,5 @@
             "Magento\\Analytics\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/AsynchronousOperations/composer.json b/app/code/Magento/AsynchronousOperations/composer.json
@@ -29,5 +29,5 @@
             "Magento\\AsynchronousOperations\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
@@ -22,5 +22,5 @@
             "Magento\\Authorization\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/Authorizenet/composer.json b/app/code/Magento/Authorizenet/composer.json
@@ -31,5 +31,5 @@
             "Magento\\Authorizenet\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/AuthorizenetAcceptjs/composer.json b/app/code/Magento/AuthorizenetAcceptjs/composer.json
@@ -28,5 +28,5 @@
             "Magento\\AuthorizenetAcceptjs\\": ""
         }
     },
-    "version": "100.3.2"
+    "version": "100.3.3"
 }
diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
@@ -40,5 +40,5 @@
             "Magento\\Backend\\": ""
         }
     },
-    "version": "101.0.3"
+    "version": "101.0.4"
 }
diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
@@ -24,5 +24,5 @@
             "Magento\\Backup\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json
@@ -22,11 +22,11 @@
         "magento/module-sales": "102.0.*",
         "magento/module-ui": "101.1.*",
         "magento/module-vault": "101.1.*",
-        "magento/module-multishipping": "100.3.*"
+        "magento/module-multishipping": "100.3.*",
+        "magento/module-theme": "101.0.*"
     },
     "suggest": {
-        "magento/module-checkout-agreements": "100.3.*",
-        "magento/module-theme": "101.0.*"
+        "magento/module-checkout-agreements": "100.3.*"
     },
     "type": "magento2-module",
     "license": [
@@ -41,5 +41,5 @@
             "Magento\\Braintree\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
@@ -41,5 +41,5 @@
             "Magento\\Bundle\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/BundleGraphQl/composer.json b/app/code/Magento/BundleGraphQl/composer.json
@@ -7,6 +7,8 @@
         "magento/module-catalog": "103.0.*",
         "magento/module-bundle": "100.3.*",
         "magento/module-catalog-graph-ql": "100.3.*",
+        "magento/module-quote": "101.1.*",
+        "magento/module-quote-graph-ql": "100.3.*",
         "magento/module-store": "101.0.*",
         "magento/framework": "102.0.*"
     },
@@ -22,5 +24,5 @@
             "Magento\\BundleGraphQl\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/BundleImportExport/composer.json b/app/code/Magento/BundleImportExport/composer.json
@@ -27,5 +27,5 @@
             "Magento\\BundleImportExport\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json
@@ -22,5 +22,5 @@
             "Magento\\CacheInvalidate\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
@@ -28,5 +28,5 @@
             "Magento\\Captcha\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
@@ -51,5 +51,5 @@
             "Magento\\Catalog\\": ""
         }
     },
-    "version": "103.0.3"
+    "version": "103.0.4"
 }
diff --git a/app/code/Magento/CatalogAnalytics/composer.json b/app/code/Magento/CatalogAnalytics/composer.json
@@ -20,5 +20,5 @@
             "Magento\\CatalogAnalytics\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/CatalogGraphQl/composer.json b/app/code/Magento/CatalogGraphQl/composer.json
@@ -10,6 +10,7 @@
         "magento/module-search": "101.0.*",
         "magento/module-store": "101.0.*",
         "magento/module-eav-graph-ql": "100.3.*",
+        "magento/module-catalog-search": "101.0.*",
         "magento/framework": "102.0.*"
     },
     "suggest": {
@@ -29,5 +30,5 @@
             "Magento\\CatalogGraphQl\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json
@@ -32,5 +32,5 @@
             "Magento\\CatalogImportExport\\": ""
         }
     },
-    "version": "101.0.3"
+    "version": "101.0.4"
 }
diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
@@ -29,5 +29,5 @@
         }
     },
     "abandoned": "magento/inventory-composer-metapackage",
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/CatalogInventoryGraphQl/composer.json b/app/code/Magento/CatalogInventoryGraphQl/composer.json
@@ -21,5 +21,5 @@
             "Magento\\CatalogInventoryGraphQl\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json
@@ -32,5 +32,5 @@
             "Magento\\CatalogRule\\": ""
         }
     },
-    "version": "101.1.3"
+    "version": "101.1.4"
 }
diff --git a/app/code/Magento/CatalogRuleConfigurable/composer.json b/app/code/Magento/CatalogRuleConfigurable/composer.json
@@ -28,5 +28,5 @@
             "Magento\\CatalogRuleConfigurable\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json
@@ -35,5 +35,5 @@
             "Magento\\CatalogSearch\\": ""
         }
     },
-    "version": "101.0.3"
+    "version": "101.0.4"
 }
diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json
@@ -32,5 +32,5 @@
             "Magento\\CatalogUrlRewrite\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json b/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
@@ -4,6 +4,7 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
+        "magento/module-store": "101.0.*",
         "magento/module-catalog": "103.0.*",
         "magento/framework": "102.0.*"
     },
@@ -24,5 +25,5 @@
             "Magento\\CatalogUrlRewriteGraphQl\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }
diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json
@@ -14,7 +14,8 @@
         "magento/module-rule": "100.3.*",
         "magento/module-store": "101.0.*",
         "magento/module-widget": "101.1.*",
-        "magento/module-wishlist": "101.1.*"
+        "magento/module-wishlist": "101.1.*",
+        "magento/module-theme": "101.0.*"
     },
     "type": "magento2-module",
     "license": [
@@ -29,5 +30,5 @@
             "Magento\\CatalogWidget\\": ""
         }
     },
-    "version": "100.3.3"
+    "version": "100.3.4"
 }