Use getMimeType instead of getClientMimeType. (#4085)

* Use getMimeType instead of getClientMimeType.

* Fix testExtensionGuessing.

* Make mime test files OS-agnostic.

* Fix mime test file sizes.

* Add mime tests for non-text files.

* Specifiy test cases in comments.

Author: sfadschm

system/HTTP/Files/UploadedFile.php

@@ -325,7 +325,7 @@ public function getExtension(): string
 	 */
 	public function guessExtension(): string
 	{
-		return Mimes::guessExtensionFromType($this->getClientMimeType(), $this->getClientExtension()) ?? $this->getClientExtension();
+		return Mimes::guessExtensionFromType($this->getMimeType(), $this->getClientExtension()) ?? $this->getClientExtension();
 	}
 
 	//--------------------------------------------------------------------

tests/_support/HTTP/Files/tmp/fileA.txt

@@ -1 +1 @@
-
+text

tests/_support/HTTP/Files/tmp/fileB.txt

@@ -1 +1 @@
-
+more text

tests/_support/HTTP/Files/tmp/fileC.csv

@@ -0,0 +1 @@
+separated;"text"

tests/_support/HTTP/Files/tmp/fileD.zip

@@ -143,28 +143,71 @@ public function testExtensionGuessing()
 			'userfile1' => [
 				'name'     => 'fileA.txt',
 				'type'     => 'text/plain',
-				'size'     => 124,
-				'tmp_name' => '/fileA.txt',
+				'size'     => 4,
+				'tmp_name' => SUPPORTPATH . 'HTTP/Files/tmp/fileA.txt',
 				'error'    => 0,
 			],
 			'userfile2' => [
 				'name'     => 'fileB.txt',
 				'type'     => 'text/csv',
-				'size'     => 248,
-				'tmp_name' => '/fileB.txt',
+				'size'     => 9,
+				'tmp_name' => SUPPORTPATH . 'HTTP/Files/tmp/fileB.txt',
+				'error'    => 0,
+			],
+			'userfile3' => [
+				'name'     => 'fileC.csv',
+				'type'     => 'text/csv',
+				'size'     => 16,
+				'tmp_name' => SUPPORTPATH . 'HTTP/Files/tmp/fileC.csv',
+				'error'    => 0,
+			],
+			'userfile4' => [
+				'name'     => 'fileD.zip',
+				'type'     => 'application/zip',
+				'size'     => 441,
+				'tmp_name' => SUPPORTPATH . 'HTTP/Files/tmp/fileD.zip',
+				'error'    => 0,
+			],
+			'userfile5' => [
+				'name'     => 'fileE.zip.rar',
+				'type'     => 'application/rar',
+				'size'     => 441,
+				'tmp_name' => SUPPORTPATH . 'HTTP/Files/tmp/fileE.zip.rar',
 				'error'    => 0,
 			],
 		];
 
 		$collection = new FileCollection();
 
+		// proposed extension matches finfo_open mime type (text/plain)
 		$file = $collection->getFile('userfile1');
 		$this->assertInstanceOf(UploadedFile::class, $file);
 		$this->assertEquals('txt', $file->getExtension());
 
+		// proposed extension matches finfo_open mime type (text/plain)
+		// but not client mime type
 		$file = $collection->getFile('userfile2');
 		$this->assertInstanceOf(UploadedFile::class, $file);
-		$this->assertEquals('csv', $file->guessExtension());
+		$this->assertEquals('txt', $file->getExtension());
+		$this->assertNotEquals('txt', \Config\Mimes::guessExtensionFromType($file->getClientMimeType(), $file->getClientExtension()) ?? $file->getClientExtension());
+
+		// proposed extension does not match finfo_open mime type (text/plain)
+		// but can be resolved by reverse searching
+		$file = $collection->getFile('userfile3');
+		$this->assertInstanceOf(UploadedFile::class, $file);
+		$this->assertEquals('csv', $file->getExtension());
+		
+		// proposed extension matches finfo_open mime type (application/zip)
+		$file = $collection->getFile('userfile4');
+		$this->assertInstanceOf(UploadedFile::class, $file);
+		$this->assertEquals('zip', $file->getExtension());
+
+		// proposed extension matches client mime type, but not finfo_open mime type (application/zip)
+		// this is a zip file (userFile4) but hat been renamed to 'rar'
+		$file = $collection->getFile('userfile5');
+		$this->assertInstanceOf(UploadedFile::class, $file);
+		$this->assertNotEquals('rar', $file->getExtension());
+		$this->assertEquals('rar', \Config\Mimes::guessExtensionFromType($file->getClientMimeType(), $file->getClientExtension()) ?? $file->getClientExtension());
 	}
 
 	//--------------------------------------------------------------------