Merge "Remove unused arguments to private functions"

2 files changed, 6 insertions, 11 deletions

diff --git a/includes/libs/mime/IEContentAnalyzer.php b/includes/libs/mime/IEContentAnalyzer.php
index 3382d18bf0ce..4f8f9cd9eba1 100644
--- a/includes/libs/mime/IEContentAnalyzer.php
+++ b/includes/libs/mime/IEContentAnalyzer.php
@@ -415,8 +415,8 @@ class IEContentAnalyzer {
 		$result = $this->sampleData( $version, $chunk );
 		$sampleFound = $result['found'];
 		$counters = $result['counters'];
-		$binaryType = $this->checkBinaryHeaders( $version, $chunk );
-		$textType = $this->checkTextHeaders( $version, $chunk );
+		$binaryType = $this->checkBinaryHeaders( $chunk );
+		$textType = $this->checkTextHeaders( $chunk );
 
 		if ( $proposed == 'text/html' && isset( $sampleFound['html'] ) ) {
 			return 'text/html';
@@ -552,11 +552,10 @@ class IEContentAnalyzer {
 	/**
 	 * Check for text headers at the start of the chunk
 	 * Confirmed same in 5 and 7.
-	 * @param string $version
 	 * @param string $chunk
 	 * @return bool|string
 	 */
-	private function checkTextHeaders( $version, $chunk ) {
+	private function checkTextHeaders( $chunk ) {
 		$chunk2 = substr( $chunk, 0, 2 );
 		$chunk4 = substr( $chunk, 0, 4 );
 		$chunk5 = substr( $chunk, 0, 5 );
@@ -578,11 +577,10 @@ class IEContentAnalyzer {
 	/**
 	 * Check for binary headers at the start of the chunk
 	 * Confirmed same in 5 and 7.
-	 * @param string $version
 	 * @param string $chunk
 	 * @return bool|string
 	 */
-	private function checkBinaryHeaders( $version, $chunk ) {
+	private function checkBinaryHeaders( $chunk ) {
 		$chunk2 = substr( $chunk, 0, 2 );
 		$chunk3 = substr( $chunk, 0, 3 );
 		$chunk4 = substr( $chunk, 0, 4 );
diff --git a/includes/libs/mime/MimeAnalyzer.php b/includes/libs/mime/MimeAnalyzer.php
index 46cec212e9bf..4d52e0f138be 100644
--- a/includes/libs/mime/MimeAnalyzer.php
+++ b/includes/libs/mime/MimeAnalyzer.php
@@ -520,7 +520,7 @@ class MimeAnalyzer implements LoggerAwareInterface {
 				"Use improveTypeFromExtension(\$mime, \$ext) instead." );
 		}
 
-		$mime = $this->doGuessMimeType( $file, $ext );
+		$mime = $this->doGuessMimeType( $file );
 
 		if ( !$mime ) {
 			$this->logger->info( __METHOD__ .
@@ -539,14 +539,11 @@ class MimeAnalyzer implements LoggerAwareInterface {
 	/**
 	 * Guess the MIME type from the file contents.
 	 *
-	 * @todo Remove $ext param
-	 *
 	 * @param string $file
-	 * @param string|bool $ext
 	 * @return bool|string
 	 * @throws UnexpectedValueException
 	 */
-	private function doGuessMimeType( string $file, $ext ) {
+	private function doGuessMimeType( string $file ) {
 		// Read a chunk of the file
 		AtEase::suppressWarnings();
 		$f = fopen( $file, 'rb' );