MC-18487: Merge release branch into 2.2-develop

- Resolve conflicts using 2.2.10 versions

Author: Rrego6

app/code/Magento/AdminNotification/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-admin-notification",
     "description": "N/A",
     "require": {
-        "php": "~7.1.0||~7.2.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-backend": "100.2.*",
         "magento/module-media-storage": "100.2.*",
@@ -11,7 +11,7 @@
         "lib-libxml": "*"
     },
     "type": "magento2-module",
-    "version": "100.2.6",
+    "version": "100.2.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-advanced-pricing-import-export",
     "description": "N/A",
     "require": {
-        "php": "~7.1.0||~7.2.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-catalog": "102.0.*",
         "magento/module-catalog-inventory": "100.2.*",
         "magento/module-eav": "101.0.*",
@@ -13,7 +13,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.5",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Analytics/composer.json

@@ -2,15 +2,15 @@
     "name": "magento/module-analytics",
     "description": "N/A",
     "require": {
-        "php": "~7.1.0||~7.2.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-backend": "100.2.*",
         "magento/module-config": "101.0.*",
         "magento/module-integration": "100.2.*",
         "magento/module-store": "100.2.*",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.5",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Authorization/composer.json

@@ -2,12 +2,12 @@
     "name": "magento/module-authorization",
     "description": "Authorization module provides access to Magento ACL functionality.",
     "require": {
-        "php": "~7.1.0||~7.2.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-backend": "100.2.*",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Authorizenet/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-authorizenet",
     "description": "N/A",
     "require": {
-        "php": "~7.1.0||~7.2.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-sales": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-quote": "101.0.*",
@@ -16,7 +16,7 @@
         "magento/module-config": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.5",
+    "version": "100.2.6",
     "license": [
         "proprietary"
     ],

app/code/Magento/AuthorizenetAcceptjs/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.0||~7.2.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*",
         "magento/module-payment": "100.2.*",
         "magento/module-sales": "101.0.*",
@@ -16,7 +16,7 @@
         "magento/module-quote": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0",
+    "version": "100.2.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/AuthorizenetCardinal/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.0||~7.2.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-authorizenet-acceptjs": "100.2.*",
         "magento/framework": "101.0.*",
         "magento/module-cardinal-commerce": "100.2.*",

app/code/Magento/Backend/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-backend",
     "description": "N/A",
     "require": {
-        "php": "~7.1.0||~7.2.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-directory": "100.2.*",
         "magento/module-developer": "100.2.*",
@@ -24,7 +24,7 @@
         "magento/module-theme": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.9",
+    "version": "100.2.10",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backup/composer.json

@@ -2,14 +2,14 @@
     "name": "magento/module-backup",
     "description": "N/A",
     "require": {
-        "php": "~7.1.0||~7.2.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-backend": "100.2.*",
         "magento/module-cron": "100.2.*",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.8",
+    "version": "100.2.9",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Braintree/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-braintree",
     "description": "N/A",
     "require": {
-        "php": "~7.1.0||~7.2.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*",
         "magento/magento-composer-installer": "*",
         "magento/module-config": "101.0.*",
@@ -26,7 +26,7 @@
         "magento/module-theme": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.9",
+    "version": "100.2.10",
     "license": [
         "proprietary"
     ],