Merge pull request #1607 from magento-engcom/develop-prs

#11546 Add AuthenticationInterface to the public API by @navarr #11659 [TASK] Removed Typo in Paypal TestCase didgit => digit by @lewisvoncken #11649 #7915: customer objects are equal to eachother after observing event customer_save_after_data_object by @RomaKis #11587 #11586 Fix duplicated crontab 2>&1 expression by @adrian-martinez-interactiv4 #11609 Fix a typo by @ajpevers #11582 M2 11581 by @tzyganu #11452 #11328 : app:config:dump adds extra space every time in multiline array value by @adrian-martinez-interactiv4 #11457 Added carrier code to ID to distinguish shipping methods [port 2.3] by @peterjaap #10769 Fix: Keep packages sorted by @localheinz
magento · Oct 24, 2017 · c6e891d · c6e891d
2 parents e7c5bb5 + 7e773c5
commit c6e891d
Show file tree

Hide file tree

Showing 257 changed files with 1,737 additions and 972 deletions.
diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
@@ -1,14 +1,17 @@
 {
     "name": "magento/module-admin-notification",
     "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-store": "100.3.*",
+        "lib-libxml": "*",
+        "magento/framework": "100.3.*",
         "magento/module-backend": "100.3.*",
         "magento/module-media-storage": "100.3.*",
-        "magento/framework": "100.3.*",
-        "magento/module-ui": "100.3.*",
-        "lib-libxml": "*"
+        "magento/module-store": "100.3.*",
+        "magento/module-ui": "100.3.*"
     },
     "type": "magento2-module",
     "version": "100.3.0-dev",

diff --git a/app/code/Magento/AdvancedPricingImportExport/composer.json b/app/code/Magento/AdvancedPricingImportExport/composer.json
@@ -1,16 +1,19 @@
 {
     "name": "magento/module-advanced-pricing-import-export",
     "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "magento/framework": "100.3.*",
         "magento/module-catalog": "101.2.*",
+        "magento/module-catalog-import-export": "100.3.*",
         "magento/module-catalog-inventory": "100.3.*",
+        "magento/module-customer": "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.*"
+        "magento/module-store": "100.3.*"
     },
     "type": "magento2-module",
     "version": "100.3.0-dev",

diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
@@ -1,10 +1,13 @@
 {
     "name": "magento/module-authorization",
     "description": "Authorization module provides access to Magento ACL functionality.",
+    "config": {
+        "sort-packages": true
+    },
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-backend": "100.3.*",
-        "magento/framework": "100.3.*"
+        "magento/framework": "100.3.*",
+        "magento/module-backend": "100.3.*"
     },
     "type": "magento2-module",
     "version": "100.3.0-dev",

diff --git a/app/code/Magento/Authorizenet/composer.json b/app/code/Magento/Authorizenet/composer.json
@@ -1,16 +1,19 @@
 {
     "name": "magento/module-authorizenet",
     "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-sales": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-quote": "100.3.*",
-        "magento/module-checkout": "100.3.*",
+        "magento/framework": "100.3.*",
         "magento/module-backend": "100.3.*",
-        "magento/module-payment": "100.3.*",
         "magento/module-catalog": "101.2.*",
-        "magento/framework": "100.3.*"
+        "magento/module-checkout": "100.3.*",
+        "magento/module-payment": "100.3.*",
+        "magento/module-quote": "100.3.*",
+        "magento/module-sales": "100.3.*",
+        "magento/module-store": "100.3.*"
     },
     "suggest": {
         "magento/module-config": "100.3.*"

diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
@@ -1,25 +1,28 @@
 {
     "name": "magento/module-backend",
     "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "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/module-ui": "100.3.*",
-        "magento/framework": "100.3.*"
+      "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+      "magento/framework": "100.3.*",
+      "magento/module-backup": "100.3.*",
+      "magento/module-catalog": "101.2.*",
+      "magento/module-config": "100.3.*",
+      "magento/module-customer": "100.3.*",
+      "magento/module-developer": "100.3.*",
+      "magento/module-directory": "100.3.*",
+      "magento/module-eav": "100.3.*",
+      "magento/module-quote": "100.3.*",
+      "magento/module-reports": "100.3.*",
+      "magento/module-require-js": "100.3.*",
+      "magento/module-sales": "100.3.*",
+      "magento/module-security": "100.3.*",
+      "magento/module-store": "100.3.*",
+      "magento/module-translation": "100.3.*",
+      "magento/module-ui": "100.3.*",
+      "magento/module-user": "100.3.*"
     },
     "suggest": {
         "magento/module-theme": "100.3.*"

diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
@@ -1,12 +1,15 @@
 {
     "name": "magento/module-backup",
     "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-store": "100.3.*",
+        "magento/framework": "100.3.*",
         "magento/module-backend": "100.3.*",
         "magento/module-cron": "100.3.*",
-        "magento/framework": "100.3.*"
+        "magento/module-store": "100.3.*"
     },
     "type": "magento2-module",
     "version": "100.3.0-dev",

diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json
@@ -1,23 +1,26 @@
 {
     "name": "magento/module-braintree",
     "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "braintree/braintree_php": "3.22.0",
         "magento/framework": "100.3.*",
         "magento/magento-composer-installer": "*",
+        "magento/module-catalog": "101.2.*",
+        "magento/module-backend": "100.3.*",
+        "magento/module-checkout": "100.3.*",
         "magento/module-config": "100.3.*",
+        "magento/module-customer": "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-quote": "100.3.*",
+        "magento/module-sales": "100.3.*",
         "magento/module-ui": "100.3.*",
-        "braintree/braintree_php": "3.22.0"
+        "magento/module-vault": "100.3.*"
     },
     "suggest": {
         "magento/module-checkout-agreements": "100.3.*",

diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
@@ -1,23 +1,26 @@
 {
     "name": "magento/module-bundle",
     "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-store": "100.3.*",
-        "magento/module-catalog": "101.2.*",
-        "magento/module-tax": "100.3.*",
+        "magento/framework": "100.3.*",
         "magento/module-backend": "100.3.*",
-        "magento/module-sales": "100.3.*",
-        "magento/module-checkout": "100.3.*",
+        "magento/module-catalog": "101.2.*",
         "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-customer": "100.3.*",
         "magento/module-catalog-rule": "100.3.*",
-        "magento/module-eav": "100.3.*",
+        "magento/module-checkout": "100.3.*",
         "magento/module-config": "100.3.*",
+        "magento/module-customer": "100.3.*",
+        "magento/module-eav": "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-quote": "100.3.*",
+        "magento/module-sales": "100.3.*",
+        "magento/module-store": "100.3.*",
+        "magento/module-tax": "100.3.*",
         "magento/module-ui": "100.3.*"
     },
     "suggest": {

diff --git a/app/code/Magento/BundleImportExport/composer.json b/app/code/Magento/BundleImportExport/composer.json
@@ -1,14 +1,17 @@
 {
     "name": "magento/module-bundle-import-export",
     "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "magento/framework": "100.3.*",
+        "magento/module-bundle": "100.3.*",
         "magento/module-catalog": "101.2.*",
-        "magento/module-import-export": "100.3.*",
         "magento/module-catalog-import-export": "100.3.*",
-        "magento/module-bundle": "100.3.*",
         "magento/module-eav": "100.3.*",
-        "magento/framework": "100.3.*"
+        "magento/module-import-export": "100.3.*"
     },
     "type": "magento2-module",
     "version": "100.3.0-dev",

diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json
@@ -1,10 +1,13 @@
 {
     "name": "magento/module-cache-invalidate",
     "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-page-cache": "100.3.*",
-        "magento/framework": "100.3.*"
+        "magento/framework": "100.3.*",
+        "magento/module-page-cache": "100.3.*"
     },
     "type": "magento2-module",
     "version": "100.3.0-dev",

diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
@@ -1,15 +1,18 @@
 {
     "name": "magento/module-captcha",
     "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-store": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-checkout": "100.3.*",
-        "magento/module-backend": "100.3.*",
         "magento/framework": "100.3.*",
-        "zendframework/zend-db": "^2.8.2",
+        "magento/module-backend": "100.3.*",
+        "magento/module-checkout": "100.3.*",
+        "magento/module-customer": "100.3.*",
+        "magento/module-store": "100.3.*",
         "zendframework/zend-captcha": "^2.7.1",
+        "zendframework/zend-db": "^2.8.2",
         "zendframework/zend-session": "^2.7.3"
     },
     "type": "magento2-module",

diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
@@ -1,32 +1,35 @@
 {
     "name": "magento/module-catalog",
     "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-store": "100.3.*",
-        "magento/module-eav": "100.3.*",
-        "magento/module-cms": "101.2.*",
-        "magento/module-indexer": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/module-theme": "100.3.*",
-        "magento/module-checkout": "100.3.*",
+        "magento/framework": "100.3.*",
         "magento/module-backend": "100.3.*",
-        "magento/module-widget": "100.3.*",
-        "magento/module-wishlist": "100.3.*",
-        "magento/module-tax": "100.3.*",
-        "magento/module-msrp": "100.3.*",
         "magento/module-catalog-inventory": "100.3.*",
-        "magento/module-directory": "100.3.*",
         "magento/module-catalog-rule": "100.3.*",
-        "magento/module-product-alert": "100.3.*",
-        "magento/module-url-rewrite": "100.3.*",
         "magento/module-catalog-url-rewrite": "100.3.*",
-        "magento/module-page-cache": "100.3.*",
-        "magento/module-quote": "100.3.*",
+        "magento/module-checkout": "100.3.*",
+        "magento/module-cms": "101.2.*",
         "magento/module-config": "100.3.*",
+        "magento/module-customer": "100.3.*",
+        "magento/module-directory": "100.3.*",
+        "magento/module-eav": "100.3.*",
+        "magento/module-indexer": "100.3.*",
         "magento/module-media-storage": "100.3.*",
-        "magento/framework": "100.3.*",
-        "magento/module-ui": "100.3.*"
+        "magento/module-msrp": "100.3.*",
+        "magento/module-page-cache": "100.3.*",
+        "magento/module-product-alert": "100.3.*",
+        "magento/module-quote": "100.3.*",
+        "magento/module-store": "100.3.*",
+        "magento/module-tax": "100.3.*",
+        "magento/module-theme": "100.3.*",
+        "magento/module-ui": "100.3.*",
+        "magento/module-url-rewrite": "100.3.*",
+        "magento/module-widget": "100.3.*",
+        "magento/module-wishlist": "100.3.*"
     },
     "suggest": {
         "magento/module-cookie": "100.3.*",

diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json
@@ -1,19 +1,22 @@
 {
     "name": "magento/module-catalog-import-export",
     "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "ext-ctype": "*",
+        "magento/framework": "100.3.*",
         "magento/module-catalog": "101.2.*",
+        "magento/module-catalog-inventory": "100.3.*",
         "magento/module-catalog-url-rewrite": "100.3.*",
+        "magento/module-customer": "100.3.*",
         "magento/module-eav": "100.3.*",
         "magento/module-import-export": "100.3.*",
-        "magento/module-store": "100.3.*",
-        "magento/module-tax": "100.3.*",
-        "magento/module-catalog-inventory": "100.3.*",
         "magento/module-media-storage": "100.3.*",
-        "magento/module-customer": "100.3.*",
-        "magento/framework": "100.3.*",
-        "ext-ctype": "*"
+        "magento/module-store": "100.3.*",
+        "magento/module-tax": "100.3.*"
     },
     "type": "magento2-module",
     "version": "100.3.0-dev",

diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
@@ -1,15 +1,18 @@
 {
     "name": "magento/module-catalog-inventory",
     "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-config": "100.3.*",
-        "magento/module-store": "100.3.*",
+        "magento/framework": "100.3.*",
         "magento/module-catalog": "101.2.*",
+        "magento/module-config": "100.3.*",
         "magento/module-customer": "100.3.*",
         "magento/module-eav": "100.3.*",
         "magento/module-quote": "100.3.*",
-        "magento/framework": "100.3.*",
+        "magento/module-store": "100.3.*",
         "magento/module-ui": "100.3.*"
     },
     "type": "magento2-module",