FileCollection should return empty array when no files exist.

codeigniter4 · Jul 6, 2017 · 69b9f68 · 69b9f68
1 parent b46b5f2
commit 69b9f68
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/system/HTTP/Files/FileCollection.php b/system/HTTP/Files/FileCollection.php
@@ -170,13 +170,13 @@ protected function populateFiles()
 			return;
 		}
 
+		$this->files = [];
+
 		if (empty($_FILES))
 		{
 			return;
 		}
 
-		$this->files = [];
-
 		$files = $this->fixFilesArray($_FILES);
 
 		foreach ($files as $name => $file)

diff --git a/tests/system/HTTP/Files/FileCollectionTest.php b/tests/system/HTTP/Files/FileCollectionTest.php
@@ -9,11 +9,11 @@ public function setUp()
 
 	//--------------------------------------------------------------------
 
-	public function testAllReturnsNullWithNoFiles()
+	public function testAllReturnsArrayWithNoFiles()
 	{
 	    $files = new FileCollection();
 
-		$this->assertNull($files->all());
+		$this->assertEquals([], $files->all());
 	}
 
 	//--------------------------------------------------------------------