[ticket/11912] Add extension_guesser for guessing mimetype by extension

The content_guesser now only guesses the mimetype with the function
mime_content_type() while the guessing by extension is done using the
extension_guesser.

PHPBB3-11912

1 files changed, 12 insertions, 3 deletions

diff --git a/tests/mimetype/guesser_test.php b/tests/mimetype/guesser_test.php
index 9d4d965d63..8d076abae5 100644
--- a/tests/mimetype/guesser_test.php
+++ b/tests/mimetype/guesser_test.php
@@ -101,25 +101,34 @@ class guesser_test extends \phpbb_test_case
 					'image/jpeg',
 					'image/jpeg',
 				),
+				array(new \phpbb\mimetype\content_guesser),
 				false,
 			),
 			array(
 				array(
 					'application/octet-stream',
-					'image/jpeg',
+					'application/octet-stream',
 				),
+				array(new \phpbb\mimetype\content_guesser),
 				true,
 			),
+			array(
+				array(
+					'application/octet-stream',
+					'image/jpeg',
+				),
+				array(new \phpbb\mimetype\extension_guesser),
+			),
 		);
 	}
 
 	/**
 	* @dataProvider data_content_guesser
 	*/
-	public function test_content_guesser($expected, $overload = false)
+	public function test_content_guesser($expected, $guessers, $overload = false)
 	{
 		self::$function_exists = ($overload) ? false : true;
-		$guesser = new \phpbb\mimetype\guesser(array(new \phpbb\mimetype\content_guesser));
+		$guesser = new \phpbb\mimetype\guesser($guessers);
 		$this->assertEquals($expected[0], $guesser->guess($this->jpg_file));
 		$this->assertEquals($expected[1], $guesser->guess($this->jpg_file, $this->jpg_file . '.jpg'));
 		@copy($this->jpg_file, $this->jpg_file . '.jpg');