Merge branch 'magento2_platform-health' into platform-health

xmav · xmav · commit c27ed2830040 · 2021-09-03T19:18:34.000-05:00
diff --git a/Gruntfile.js.sample b/Gruntfile.js.sample
@@ -16,10 +16,12 @@ module.exports = function (grunt) {
         tasks = grunt.file.expand('./dev/tools/grunt/tasks/*'),
         themes;
 
-        filesRouter.set('themes', 'dev/tools/grunt/configs/themes');
-        themes = filesRouter.get('themes');
+    filesRouter.set('themes', 'dev/tools/grunt/configs/themes');
+    themes = filesRouter.get('themes');
 
-    tasks = _.map(tasks, function(task){ return task.replace('.js', '') });
+    tasks = _.map(tasks, function (task) {
+        return task.replace('.js', '');
+    });
     tasks.push('time-grunt');
     tasks.forEach(function (task) {
         require(task)(grunt);
@@ -53,7 +55,7 @@ module.exports = function (grunt) {
                 'autoprefixer',
                 'cssmin',
                 'usebanner'
-            ].map(function(task){
+            ].map(function (task) {
                 return task + ':' + component;
             });
 
@@ -72,7 +74,7 @@ module.exports = function (grunt) {
                 'clean',
                 'exec:all'
             ];
-            _.each(themes, function(theme, name) {
+            _.each(themes, function (theme, name) {
                 tasks.push('less:' + name);
             });
             grunt.task.run(tasks);
diff --git a/app/code/Magento/AwsS3/Driver/AwsS3.php b/app/code/Magento/AwsS3/Driver/AwsS3.php
@@ -851,7 +851,7 @@ public function fileClose($resource): bool
         //phpcs:enable
 
         foreach ($this->streams as $path => $stream) {
-            //phpcs:disable
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             if (stream_get_meta_data($stream)['uri'] === $resourcePath) {
                 $this->adapter->writeStream($path, $resource, new Config(self::CONFIG));
 
diff --git a/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php b/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
@@ -133,10 +133,9 @@ private function filterNewestActions(array $productsData, $typeId)
             $productsData,
             function (array $firstProduct, array $secondProduct) {
                 if (isset($firstProduct['added_at'], $secondProduct['added_at'])) {
-                    return $firstProduct['added_at'] > $secondProduct['added_at'];
+                    return ($firstProduct['added_at'] <=> $secondProduct['added_at']);
                 }
-
-                return false;
+                return 0;
             }
         );
 
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
@@ -154,7 +154,7 @@ private function sortTree(array $tree): array
         foreach ($tree as &$node) {
             if ($node['children']) {
                 uasort($node['children'], function ($element1, $element2) {
-                    return $element1['position'] > $element2['position'];
+                    return ($element1['position'] <=> $element2['position']);
                 });
                 $node['children'] = $this->sortTree($node['children']);
                 if (isset($node['children_count'])) {
diff --git a/app/code/Magento/Config/App/Config/Source/DumpConfigSourceAggregated.php b/app/code/Magento/Config/App/Config/Source/DumpConfigSourceAggregated.php
@@ -209,7 +209,7 @@ private function filterPath($path)
     private function sortSources()
     {
         uasort($this->sources, function ($firstItem, $secondItem) {
-            return $firstItem['sortOrder'] > $secondItem['sortOrder'];
+            return ($firstItem['sortOrder'] <=> $secondItem['sortOrder']);
         });
     }
 
diff --git a/app/code/Magento/GraphQl/composer.json b/app/code/Magento/GraphQl/composer.json
@@ -8,7 +8,7 @@
         "magento/framework": "*",
         "magento/module-webapi": "*",
         "magento/module-authorization": "*",
-        "webonyx/graphql-php": "^14.9.0"
+        "webonyx/graphql-php": "~14.9.0"
     },
     "suggest": {
         "magento/module-graph-ql-cache": "*"
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Jwt/JwtManagerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Jwt/JwtManagerTest.php
@@ -997,7 +997,7 @@ private function createRsaKeys(): array
         if (!openssl_pkey_export($rsaPrivateResource, $rsaPrivate, 'pass')) {
             throw new \RuntimeException('Failed to read RSA private key');
         }
-        openssl_free_key($rsaPrivateResource);
+        $this->freeResource($rsaPrivateResource);
 
         return [$rsaPrivate, $rsaPublic];
     }
@@ -1024,11 +1024,23 @@ private function createEcKeys(): array
             if (!openssl_pkey_export($privateResource, $esPrivate, 'pass')) {
                 throw new \RuntimeException('Failed to read EC private key');
             }
-            openssl_free_key($privateResource);
+            $this->freeResource($privateResource);
             $ecKeys[$bits] = [$esPrivate, $esPublic];
             unset($privateResource, $esPublic, $esPrivate);
         }
 
         return $ecKeys;
     }
+
+    /**
+     * @param mixed $resource
+     *
+     * @return void
+     */
+    private function freeResource($resource): void
+    {
+        if (\is_resource($resource) && (version_compare(PHP_VERSION, '8.0') < 0)) {
+            openssl_free_key($resource);
+        }
+    }
 }
diff --git a/dev/tests/js/jasmine/spec_runner/index.js b/dev/tests/js/jasmine/spec_runner/index.js
@@ -57,7 +57,7 @@ function getTasks() {
         return [
             'connect:' + theme,
             'jasmine:' + theme
-        ]
+        ];
     });
 
     return _.flatten(tasks);
diff --git a/dev/tests/js/jasmine/spec_runner/tasks/connect.js b/dev/tests/js/jasmine/spec_runner/tasks/connect.js
@@ -39,7 +39,7 @@ function init(config) {
         });
 
         return middlewares;
-    }
+    };
 
     _.each(themes, function (themeData, themeName) {
         var options = {
diff --git a/dev/tests/js/jasmine/spec_runner/tasks/jasmine.js b/dev/tests/js/jasmine/spec_runner/tasks/jasmine.js
@@ -15,7 +15,7 @@ function init(config) {
         themes, root, staticDir, baseUrl, mapFile, host, port, files, requireJs;
 
     root         = config.root;
-    staticDir       = config.static;
+    staticDir    = config.static;
     port         = config.port;
     files        = config.files;
     themes       = config.themes;
@@ -69,7 +69,7 @@ function init(config) {
                  */
                 helpers: specs
             }
-        }
+        };
     });
 }
 
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
@@ -210,7 +210,7 @@ protected function _testObsoleteClasses($content)
         foreach (self::$_classes as $row) {
             list($class, , $replacement) = $row;
             $this->_assertNotRegExp(
-                '/[^a-z\d_]' . preg_quote($class, '/') . '[^a-z\d_\\\\]/iS',
+                '/[^a-z\d_\$]' . preg_quote($class, '/') . '[^a-z\d_\\\\]/iS',
                 $content,
                 $this->_suggestReplacement(sprintf("Class '%s' is obsolete.", $class), $replacement)
             );
diff --git a/lib/internal/Magento/Framework/Amqp/composer.json b/lib/internal/Magento/Framework/Amqp/composer.json
@@ -12,7 +12,7 @@
     "require": {
         "magento/framework": "*",
         "php": "~7.3.0||~7.4.0",
-        "php-amqplib/php-amqplib": "~2.7.0||~2.10.0"
+        "php-amqplib/php-amqplib": "~3.0.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/lib/internal/Magento/Framework/Jwt/JwkFactory.php b/lib/internal/Magento/Framework/Jwt/JwkFactory.php
@@ -785,7 +785,7 @@ private function createPrivateRsa(string $key, ?string $pass, string $use, strin
     {
         $resource = openssl_get_privatekey($key, (string)$pass);
         $keyData = openssl_pkey_get_details($resource)['rsa'];
-        openssl_free_key($resource);
+        $this->freeResource($resource);
         $keysMap = [
             'n' => 'n',
             'e' => 'e',
@@ -821,7 +821,7 @@ private function createPublicRsa(string $key, string $use, string $algorithm, ?s
     {
         $resource = openssl_get_publickey($key);
         $keyData = openssl_pkey_get_details($resource)['rsa'];
-        openssl_free_key($resource);
+        $this->freeResource($resource);
         $keysMap = [
             'n' => 'n',
             'e' => 'e'
@@ -857,7 +857,7 @@ private function createPrivateEc(
     ): Jwk {
         $resource = openssl_get_privatekey($key, (string)$pass);
         $keyData = openssl_pkey_get_details($resource)['ec'];
-        openssl_free_key($resource);
+        $this->freeResource($resource);
         if (!array_key_exists($keyData['curve_oid'], self::EC_CURVE_MAP)) {
             throw new \RuntimeException('Unsupported EC curve');
         }
@@ -895,7 +895,7 @@ private function createPublicEc(
     ): Jwk {
         $resource = openssl_get_publickey($key);
         $keyData = openssl_pkey_get_details($resource)['ec'];
-        openssl_free_key($resource);
+        $this->freeResource($resource);
         if (!array_key_exists($keyData['curve_oid'], self::EC_CURVE_MAP)) {
             throw new \RuntimeException('Unsupported EC curve');
         }
@@ -949,4 +949,16 @@ private static function base64Decode(string $encoded): string
 
         return $value;
     }
+
+    /**
+     * @param mixed $resource
+     *
+     * @return void
+     */
+    private function freeResource($resource): void
+    {
+        if (\is_resource($resource) && (version_compare(PHP_VERSION, '8.0') < 0)) {
+            openssl_free_key($resource);
+        }
+    }
 }
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Request/Deserializer/Xml.php b/lib/internal/Magento/Framework/Webapi/Rest/Request/Deserializer/Xml.php
@@ -57,13 +57,18 @@ public function deserialize($xmlRequestBody)
             );
         }
         /** Disable external entity loading to prevent possible vulnerability */
-        $previousLoaderState = libxml_disable_entity_loader(true);
+        if (version_compare(PHP_VERSION, '8.0') < 0) {
+            // this function no longer has an effect in PHP 8.0, but it's required in earlier versions
+            $previousLoaderState = libxml_disable_entity_loader(true);
+        }
         set_error_handler([$this, 'handleErrors']);
 
         $this->_xmlParser->loadXML($xmlRequestBody);
 
         restore_error_handler();
-        libxml_disable_entity_loader($previousLoaderState);
+        if (isset($previousLoaderState)) {
+            libxml_disable_entity_loader($previousLoaderState);
+        }
 
         /** Process errors during XML parsing. */
         if ($this->_errorMessage !== null) {
diff --git a/lib/internal/Magento/Framework/Xml/Security.php b/lib/internal/Magento/Framework/Xml/Security.php
@@ -54,7 +54,10 @@ public function scan($xmlContent)
 
         $document = new DOMDocument();
 
-        $loadEntities = libxml_disable_entity_loader(true);
+        if (version_compare(PHP_VERSION, '8.0') < 0) {
+            // this function no longer has an effect in PHP 8.0, but it's required in earlier versions
+            $loadEntities = libxml_disable_entity_loader(true);
+        }
         $useInternalXmlErrors = libxml_use_internal_errors(true);
 
         /**
@@ -74,7 +77,9 @@ function ($errno, $errstr) {
         $result = (bool)$document->loadXML($xmlContent, LIBXML_NONET);
         restore_error_handler();
         // Entity load to previous setting
-        libxml_disable_entity_loader($loadEntities);
+        if (isset($loadEntities)) {
+            libxml_disable_entity_loader($loadEntities);
+        }
         libxml_use_internal_errors($useInternalXmlErrors);
 
         if (!$result) {
diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
@@ -31,7 +31,6 @@
         "laminas/laminas-http": "^2.6.0",
         "laminas/laminas-mail": "^2.9.0",
         "laminas/laminas-mime": "^2.8.0",
-        "laminas/laminas-mvc": "^3.2.0",
         "laminas/laminas-stdlib": "^3.2.1",
         "laminas/laminas-uri": "^2.5.1",
         "laminas/laminas-validator": "^2.6.0",
@@ -41,7 +40,6 @@
         "symfony/console": "~4.4.0",
         "symfony/process": "~4.4.0",
         "tedivm/jshrink": "~1.4.0",
-        "web-token/jwt-framework": "^v2.2.7",
         "webonyx/graphql-php": "~14.9.0",
         "wikimedia/less.php": "^3.0.0"
     },
diff --git a/package.json.sample b/package.json.sample
@@ -9,35 +9,35 @@
   },
   "homepage": "https://magento.com/",
   "devDependencies": {
-    "glob": "~7.1.1",
-    "grunt": "~1.0.1",
+    "glob": "~7.1.7",
+    "grunt": "~1.4.1",
     "grunt-autoprefixer": "~3.0.4",
     "grunt-banner": "~0.6.0",
     "grunt-continue": "~0.1.0",
-    "grunt-contrib-clean": "~1.1.0",
-    "grunt-contrib-connect": "~1.0.2",
-    "grunt-contrib-cssmin": "~2.2.1",
-    "grunt-contrib-imagemin": "~2.0.1",
+    "grunt-contrib-clean": "~2.0.0",
+    "grunt-contrib-connect": "~3.0.0",
+    "grunt-contrib-cssmin": "~4.0.0",
+    "grunt-contrib-imagemin": "~4.0.0",
     "grunt-contrib-jasmine": "~1.2.0",
-    "grunt-contrib-less": "^2.1.0",
-    "grunt-contrib-watch": "~1.0.0",
-    "grunt-eslint": "~20.1.0",
+    "grunt-contrib-less": "~2.1.0",
+    "grunt-contrib-watch": "~1.1.0",
+    "grunt-eslint": "~20.2.0",
     "grunt-exec": "~3.0.0",
     "grunt-jscs": "~3.0.1",
-    "grunt-replace": "~1.0.1",
+    "grunt-replace": "~2.0.2",
     "grunt-styledocco": "~0.3.0",
     "grunt-template-jasmine-requirejs": "~0.2.3",
     "grunt-text-replace": "~0.4.0",
-    "imagemin-svgo": "~5.2.1",
-    "less": "^3.13.1",
-    "load-grunt-config": "~0.19.2",
-    "morgan": "~1.9.0",
-    "node-minify": "~2.3.1",
+    "imagemin-svgo": "~5.2.4",
+    "less": "3.13.1",
+    "load-grunt-config": "~4.0.1",
+    "morgan": "~1.10.0",
+    "node-minify": "~3.6.0",
     "path": "~0.12.7",
-    "serve-static": "~1.13.1",
+    "serve-static": "~1.14.1",
     "squirejs": "~0.2.1",
     "strip-json-comments": "~2.0.1",
-    "time-grunt": "~1.4.0",
-    "underscore": "^1.13.1"
+    "time-grunt": "~2.0.0",
+    "underscore": "1.13.1"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -133,10 +133,9 @@ private function filterNewestActions(array $productsData, $typeId)`
`133`	`133`	`$productsData,`
`134`	`134`	`function (array $firstProduct, array $secondProduct) {`
`135`	`135`	`if (isset($firstProduct['added_at'], $secondProduct['added_at'])) {`
`136`		`- return $firstProduct['added_at'] > $secondProduct['added_at'];`
	`136`	`+ return ($firstProduct['added_at'] <=> $secondProduct['added_at']);`
`137`	`137`	`}`
`138`		`-`
`139`		`- return false;`
	`138`	`+ return 0;`
`140`	`139`	`}`
`141`	`140`	`);`
`142`	`141`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ private function filterPath($path)`
`209`	`209`	`private function sortSources()`
`210`	`210`	`{`
`211`	`211`	`uasort($this->sources, function ($firstItem, $secondItem) {`
`212`		`- return $firstItem['sortOrder'] > $secondItem['sortOrder'];`
	`212`	`+ return ($firstItem['sortOrder'] <=> $secondItem['sortOrder']);`
`213`	`213`	`});`
`214`	`214`	`}`
`215`	`215`
Original file line number	Diff line number	Diff line change
`@@ -997,7 +997,7 @@ private function createRsaKeys(): array`
`997`	`997`	`if (!openssl_pkey_export($rsaPrivateResource, $rsaPrivate, 'pass')) {`
`998`	`998`	`throw new \RuntimeException('Failed to read RSA private key');`
`999`	`999`	`}`
`1000`		`- openssl_free_key($rsaPrivateResource);`
	`1000`	`+ $this->freeResource($rsaPrivateResource);`
`1001`	`1001`
`1002`	`1002`	`return [$rsaPrivate, $rsaPublic];`
`1003`	`1003`	`}`
`@@ -1024,11 +1024,23 @@ private function createEcKeys(): array`
`1024`	`1024`	`if (!openssl_pkey_export($privateResource, $esPrivate, 'pass')) {`
`1025`	`1025`	`throw new \RuntimeException('Failed to read EC private key');`
`1026`	`1026`	`}`
`1027`		`- openssl_free_key($privateResource);`
	`1027`	`+ $this->freeResource($privateResource);`
`1028`	`1028`	`$ecKeys[$bits] = [$esPrivate, $esPublic];`
`1029`	`1029`	`unset($privateResource, $esPublic, $esPrivate);`
`1030`	`1030`	`}`
`1031`	`1031`
`1032`	`1032`	`return $ecKeys;`
`1033`	`1033`	`}`
	`1034`	`+`
	`1035`	`+ /**`
	`1036`	`+ * @param mixed $resource`
	`1037`	`+ *`
	`1038`	`+ * @return void`
	`1039`	`+ */`
	`1040`	`+ private function freeResource($resource): void`
	`1041`	`+ {`
	`1042`	`+ if (\is_resource($resource) && (version_compare(PHP_VERSION, '8.0') < 0)) {`
	`1043`	`+ openssl_free_key($resource);`
	`1044`	`+ }`
	`1045`	`+ }`
`1034`	`1046`	`}`