Merge remote-tracking branch 'magento2/platform-health' into platform-health

Author: xmav

Gruntfile.js.sample

@@ -52,7 +52,6 @@ module.exports = function (grunt) {
         prod: function (component) {
             var tasks = [
                 'less',
-                'autoprefixer',
                 'cssmin',
                 'usebanner'
             ].map(function (task) {

app/code/Magento/Theme/view/base/requirejs-config.js

@@ -34,8 +34,7 @@ var config = {
         'domReady': 'requirejs/domReady',
         'spectrum': 'jquery/spectrum/spectrum',
         'tinycolor': 'jquery/spectrum/tinycolor',
-        'jquery-ui-modules': 'jquery/ui-modules',
-        'matchMedia': 'mediaCheck'
+        'jquery-ui-modules': 'jquery/ui-modules'
     },
     deps: [
         'jquery/jquery-migrate'

app/design/adminhtml/Magento/backend/etc/view.xml

@@ -50,7 +50,7 @@
         <item type="file">Lib::jquery/jquery.min.js</item>
         <item type="file">Lib::jquery/jquery.parsequery.js</item>
         <item type="file">Lib::jquery/jquery-ui.js</item>
-        <item type="file">Lib::mediaCheck.js</item>
+        <item type="file">Lib::matchMedia.js</item>
         <item type="file">Lib::requirejs/require.js</item>
         <item type="file">Lib::requirejs/text.js</item>
         <item type="file">Lib::varien/js.js</item>

composer.json

@@ -35,7 +35,7 @@
         "colinmollenhour/php-redis-session-abstract": "~1.4.0",
         "composer/composer": "^1.9 || ^2.0",
         "elasticsearch/elasticsearch": "~7.14.0",
-        "guzzlehttp/guzzle": "^6.3.3",
+        "guzzlehttp/guzzle": "^7.3.0",
         "laminas/laminas-captcha": "^2.10",
         "laminas/laminas-code": "~4.4.2",
         "laminas/laminas-db": "^2.12.0",
@@ -67,8 +67,8 @@
         "monolog/monolog": "^2.3",
         "pelago/emogrifier": "^5.0.0",
         "php-amqplib/php-amqplib": "~3.0.0",
-        "phpseclib/mcrypt_compat": "1.0.8",
-        "phpseclib/phpseclib": "2.0.*",
+        "phpseclib/mcrypt_compat": "2.0.0",
+        "phpseclib/phpseclib": "~3.0.9",
         "ramsey/uuid": "~4.2.0",
         "symfony/console": "~4.4.0",
         "symfony/event-dispatcher": "~4.4.0",
@@ -85,7 +85,7 @@
         "friendsofphp/php-cs-fixer": "~3.0.0",
         "lusitanian/oauth": "~0.8.10",
         "magento/magento-coding-standard": "*",
-        "magento/magento2-functional-testing-framework": "^3.0",
+        "magento/magento2-functional-testing-framework": "^3.7",
         "pdepend/pdepend": "~2.10.0",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.9.1",