Bug-fix.

Changelog excerpt:
- Wrong number of files reported when recursively scanning through
  directories; Fixed.

Author: Maikuolan

Changelog.md

@@ -11,3 +11,9 @@ __*Why "v3.0.0" instead of "v1.0.0?"*__ Prior to phpMussel v3, the "phpMussel Co
 [2020.08.05; Maikuolan]: Addressed a potential compatibility problem with some specific kinds of symlinked installations.
 
 [2020.10.01; Bug-fix; Maikuolan]: Discovered that the image chameleon attack detection could generate false positives against Mac OS X thumbnails; Fixed. *Refer [#223](https://github.com/phpMussel/phpMussel/issues/223).*
+
+### v3.0.2
+
+[2020.10.01; Bug-fix; v10mthibault]: Typo in Loader.php; Trying to call function sprint instead of sprintf which leads to an error; Fixed.
+
+[2020.10.15; Bug-fix; Maikuolan]: Wrong number of files reported when recursively scanning through directories; Fixed. *Refer [#225](https://github.com/phpMussel/phpMussel/issues/225).*

src/Loader.php

@@ -8,7 +8,7 @@
  * License: GNU/GPLv2
  * @see LICENSE.txt
  *
- * This file: The loader (last modified: 2020.10.01).
+ * This file: The loader (last modified: 2020.10.15).
  */
 
 namespace phpMussel\Core;
@@ -83,7 +83,7 @@ class Loader
     /**
      * @var string phpMussel version number (SemVer).
      */
-    public $ScriptVersion = '3.0.1';
+    public $ScriptVersion = '3.0.2';
 
     /**
      * @var string phpMussel version identifier (complete notation).

src/Scanner.php

@@ -8,7 +8,7 @@
  * License: GNU/GPLv2
  * @see LICENSE.txt
  *
- * This file: The scanner (last modified: 2020.10.01).
+ * This file: The scanner (last modified: 2020.10.15).
  */
 
 namespace phpMussel\Core;
@@ -345,8 +345,6 @@ private function recursor($Files = '', int $Depth = -1)
             } elseif ($SizeOfDir > 1) {
                 if ($this->Loader->InstanceCache['ThisScanTotal'] === 0) {
                     $this->Loader->InstanceCache['ThisScanTotal'] = $SizeOfDir;
-                } else {
-                    $this->Loader->InstanceCache['ThisScanTotal'] += $SizeOfDir - 1;
                 }
                 $this->Loader->Events->fireEvent('countersChanged');
                 foreach ($Files as $Key => $Value) {
@@ -378,8 +376,6 @@ private function recursor($Files = '', int $Depth = -1)
             $SizeOfDir = count($Dir);
             if ($this->Loader->InstanceCache['ThisScanTotal'] === 0) {
                 $this->Loader->InstanceCache['ThisScanTotal'] = $SizeOfDir;
-            } else {
-                $this->Loader->InstanceCache['ThisScanTotal'] += $SizeOfDir - 1;
             }
             $this->Loader->Events->fireEvent('countersChanged');
             foreach ($Dir as &$Sub) {
@@ -450,8 +446,6 @@ private function recursor($Files = '', int $Depth = -1)
                 $this->Loader->InstanceCache['ThisScanDone']++;
                 $this->Loader->Events->fireEvent('countersChanged');
                 if (!$this->Loader->Configuration['files']['filesize_response']) {
-                    $this->Loader->InstanceCache['ThisScanDone']++;
-                    $this->Loader->Events->fireEvent('countersChanged');
                     $this->Loader->atHit('', $fS, $OriginalFilenameClean, '', 1, $Depth + 1);
                     return;
                 }
@@ -2793,9 +2787,10 @@ private function prescanDecode(string $str): string
      * Used both by the scanner as well as by CLI.
      *
      * @param string $Base Directory root.
+     * @param bool $Directories Includes directories in the array when true.
      * @return array Directory tree.
      */
-    public function directoryRecursiveList(string $Base): array
+    public function directoryRecursiveList(string $Base, bool $Directories = false): array
     {
         $Arr = [];
         $Offset = strlen($Base);
@@ -2804,6 +2799,9 @@ public function directoryRecursiveList(string $Base): array
             if (preg_match('~^(?:/\.\.|./\.|\.{3})$~', str_replace("\\", '/', substr($Item, -3))) || !is_readable($Item)) {
                 continue;
             }
+            if (is_dir($Item) && !$Directories) {
+                continue;
+            }
             $Arr[] = substr($Item, $Offset);
         }
         return $Arr;