Merge pull request #6291 from kenjis/fix-FileCollection-constructor

fix: unable to add more than one file to FileCollection constructor

Author: samsonasik

system/Files/FileCollection.php

@@ -178,7 +178,9 @@ public function add($paths, bool $recursive = true)
                 // Test for a directory
                 self::resolveDirectory($path);
             } catch (FileException $e) {
-                return $this->addFile($path);
+                $this->addFile($path);
+
+                continue;
             }
 
             $this->addDirectory($path, $recursive);

tests/system/Files/FileCollectionTest.php

@@ -178,7 +178,24 @@ public function testAddStringDirectoryRecursive()
         $this->assertSame($expected, $files->get());
     }
 
-    public function testAddArray()
+    public function testAddArrayFiles()
+    {
+        $files = new FileCollection();
+
+        $expected = [
+            $this->directory . 'apple.php',
+            SUPPORTPATH . 'Files/baker/banana.php',
+        ];
+
+        $files->add([
+            $this->directory . 'apple.php',
+            SUPPORTPATH . 'Files/baker/banana.php',
+        ]);
+
+        $this->assertSame($expected, $files->get());
+    }
+
+    public function testAddArrayDirectoryAndFile()
     {
         $files = new FileCollection();
 
@@ -190,7 +207,7 @@ public function testAddArray()
         ];
 
         $files->add([
-            SUPPORTPATH . 'Files/able',
+            SUPPORTPATH . 'Files/able', // directory
             SUPPORTPATH . 'Files/baker/banana.php',
         ]);