Merge remote-tracking branch 'remotes/dev/4.2' into 4.2

Author: CI bot

composer.json

@@ -24,7 +24,7 @@
     }
   },
   "require": {
-    "php": "~7.4.14",
+    "php": "~7.4.14 || ~8.0.0",
     "oro/crm": "4.2.*",
     "oro/platform-serialised-fields": "4.2.*",
     "oro/oauth2-server": "4.2.*",

dev.json

@@ -19,7 +19,7 @@
     ]
   },
   "require": {
-    "php": "~7.4.14",
+    "php": "~7.4.14 || ~8.0.0",
     "oro/commerce": "4.2.x-dev",
     "oro/commerce-authorizenet": "4.2.x-dev",
     "oro/platform": "4.2.x-dev",

dev.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f09f9d1153f42bc40b7abb05b358031c",
+    "content-hash": "32060dda519b720b8725557171a82b70",
     "packages": [
         {
             "name": "akeneo/batch-bundle",
@@ -7582,7 +7582,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../package/platform",
-                "reference": "67daca92e7425b7b9fbaca84240eb76fdf5eba25"
+                "reference": "f7e948f5a81c572a3fbc4afed195c82d5afb958b"
             },
             "require": {
                 "akeneo/batch-bundle": "0.4.14",
@@ -7635,7 +7635,7 @@
                 "ocramius/proxy-manager": "~2.11.1",
                 "oro/doctrine-extensions": "2.0.0",
                 "oro/redis-config": "4.2.*",
-                "php": "~7.4.14",
+                "php": "~7.4.14 || ~8.0.0",
                 "php-http/httplug-bundle": "~1.20.0",
                 "phpdocumentor/reflection-docblock": "5.2.*",
                 "psr/container": "^1.0",
@@ -8118,16 +8118,16 @@
         },
         {
             "name": "php-http/discovery",
-            "version": "1.13.0",
+            "version": "1.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-http/discovery.git",
-                "reference": "788f72d64c43dc361e7fcc7464c3d947c64984a7"
+                "reference": "778f722e29250c1fac0bbdef2c122fa5d038c9eb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-http/discovery/zipball/788f72d64c43dc361e7fcc7464c3d947c64984a7",
-                "reference": "788f72d64c43dc361e7fcc7464c3d947c64984a7",
+                "url": "https://api.github.com/repos/php-http/discovery/zipball/778f722e29250c1fac0bbdef2c122fa5d038c9eb",
+                "reference": "778f722e29250c1fac0bbdef2c122fa5d038c9eb",
                 "shasum": ""
             },
             "require": {
@@ -8144,8 +8144,7 @@
                 "puli/composer-plugin": "1.0.0-beta10"
             },
             "suggest": {
-                "php-http/message": "Allow to use Guzzle, Diactoros or Slim Framework factories",
-                "puli/composer-plugin": "Sets up Puli which is recommended for Discovery to work. Check http://docs.php-http.org/en/latest/discovery.html for more details."
+                "php-http/message": "Allow to use Guzzle, Diactoros or Slim Framework factories"
             },
             "type": "library",
             "extra": {
@@ -8181,9 +8180,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-http/discovery/issues",
-                "source": "https://github.com/php-http/discovery/tree/1.13.0"
+                "source": "https://github.com/php-http/discovery/tree/1.14.0"
             },
-            "time": "2020-11-27T14:49:42+00:00"
+            "time": "2021-06-01T14:30:21+00:00"
         },
         {
             "name": "php-http/httplug",
@@ -19179,7 +19178,7 @@
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": "~7.4.14"
+        "php": "~7.4.14 || ~8.0.0"
     },
     "platform-dev": [],
     "plugin-api-version": "2.0.0"