🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #16102: [Backport] fixed word typo (by @hitesh-wagento)
 - #16130: [Backport] Disabling sorting in glob and scandir functions for better performance (by @lfluvisotto)
 - #16037: [Backport] Fix issue #15832 (by @chirag-wagento)
 - #16111: [Backport]  Correct typo correction js files (by @hitesh-wagento)


Fixed GitHub Issues:
 - #15832: No button-primary__font-weight (reported by @DanielRuf) has been fixed in #16037 by @chirag-wagento in 2.1-develop branch
   Related commits:
     1. 324ee50
     2. 41b4775

Author: Stanislav Idolov

app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js

@@ -127,7 +127,7 @@ define([
 
         /**
          * Retrieves from the list file which matches
-         * search criteria implemented in itertor function.
+         * search criteria implemented in iterator function.
          *
          * @param {Function} fn - Function that will be invoked
          *      for each file in the list.
@@ -185,7 +185,7 @@ define([
         },
 
         /**
-         * Returns path to the files' preview image.
+         * Returns path to the file's preview image.
          *
          * @param {Object} file
          * @returns {String}
@@ -284,7 +284,7 @@ define([
 
         /**
          * Abstract handler which is invoked when files are choosed for upload.
-         * May be used for implementation of aditional validation rules,
+         * May be used for implementation of additional validation rules,
          * e.g. total files and a total size rules.
          *
          * @abstract

dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php

@@ -31,7 +31,7 @@ public static function getPhpFiles($changedFilesList, $fileTypes = 0)
         $fileUtilities = Files::init();
         if (isset($_ENV['INCREMENTAL_BUILD'])) {
             $phpFiles = [];
-            foreach (glob($changedFilesList) as $listFile) {
+            foreach (glob($changedFilesList, GLOB_NOSORT) as $listFile) {
                 $phpFiles = array_merge($phpFiles, file($listFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES));
             }
             array_walk(

lib/internal/Magento/Framework/App/Utility/Files.php

@@ -382,7 +382,7 @@ public function getMainConfigFiles($asDataSet = true)
             $configXmlPaths = array_merge($globPaths, $configXmlPaths);
             $files = [];
             foreach ($configXmlPaths as $xmlPath) {
-                $files = array_merge($files, glob($xmlPath));
+                $files = array_merge($files, glob($xmlPath, GLOB_NOSORT));
             }
             self::$_cache[$cacheKey] = $files;
         }

lib/internal/Magento/Framework/Archive/Tar.php

@@ -252,7 +252,7 @@ protected function _createTar($skipRoot = false, $finalize = false)
         $file = $this->_getCurrentFile();
 
         if (is_dir($file)) {
-            $dirFiles = scandir($file);
+            $dirFiles = scandir($file, SCANDIR_SORT_NONE);
 
             if (false === $dirFiles) {
                 throw new \Magento\Framework\Exception\LocalizedException(

lib/internal/Magento/Framework/Backup/Test/Unit/_files/app_dirs_rollback.php

@@ -15,7 +15,7 @@
     }
 }
 
-$files = glob(TESTS_TEMP_DIR . '/Magento/Backup/data/*');
+$files = glob(TESTS_TEMP_DIR . '/Magento/Backup/data/*', GLOB_NOSORT);
 foreach ($files as $file) {
     unlink($file);
 }

lib/internal/Magento/Framework/Data/Collection/Filesystem.php

@@ -241,7 +241,7 @@ protected function _collectRecursive($dir)
             $dir = [$dir];
         }
         foreach ($dir as $folder) {
-            if ($nodes = glob($folder . '/*')) {
+            if ($nodes = glob($folder . '/*', GLOB_NOSORT)) {
                 foreach ($nodes as $node) {
                     $collectedResult[] = $node;
                 }

lib/internal/Magento/Framework/Filesystem/Io/File.php

@@ -364,7 +364,7 @@ protected static function _recursiveCallback($dir, array $fileCallback, array $d
             $dirCallback = $fileCallback;
         }
         if (is_dir($dir)) {
-            foreach (scandir($dir) as $item) {
+            foreach (scandir($dir, SCANDIR_SORT_NONE) as $item) {
                 if (!strcmp($item, '.') || !strcmp($item, '..')) {
                     continue;
                 }

lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php

@@ -48,7 +48,7 @@ public function testConstructException()
     protected function _initConfig(array $files = null)
     {
         if (null === $files) {
-            $files = glob(__DIR__ . '/_files/validation/positive/*/validation.xml');
+            $files = glob(__DIR__ . '/_files/validation/positive/*/validation.xml', GLOB_NOSORT);
         }
         $configFiles = [];
         foreach ($files as $path) {

lib/web/css/source/lib/_buttons.less

@@ -277,6 +277,9 @@
 //  ---------------------------------------------
 
 .lib-button-primary(
+    @_button-font-family: @button-primary__font-family,
+    @_button-font-size: @button-primary__font-size,
+    @_button-font-weight: @button-primary__font-weight,
     @_button-line-height: @button-primary__line-height,
     @_button-width: @button-primary__width,
     @_button-margin: @button-primary__margin,
@@ -300,6 +303,9 @@
     @_button-gradient-direction: @button-primary__gradient-direction
 ) {
     .lib-button(
+        @_button-font-family: @_button-font-family,
+        @_button-font-size: @_button-font-size,
+        @_button-font-weight: @_button-font-weight,
         @_button-line-height: @_button-line-height,
         @_button-width: @_button-width,
         @_button-margin: @_button-margin,

lib/web/css/source/lib/variables/_buttons.less

@@ -47,6 +47,9 @@
 @button__active__gradient-color-end: false;
 
 //  Primary button
+@button-primary__font-family: @button__font-family;
+@button-primary__font-size: @button__font-size;
+@button-primary__font-weight: @button__font-weight;
 @button-primary__line-height: false;
 @button-primary__width: false;
 @button-primary__margin: false;