symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php
+7-1Lines changed: 7 additions & 1 deletion b/‎src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php
+7-1Lines changed: 7 additions & 1 deletion
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/File/Fixtures/test.docx
Copy file name to clipboard
5.92 KB b/‎src/Symfony/Component/HttpFoundation/Tests/File/Fixtures/test.docx
Copy file name to clipboard
5.92 KB
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php
+8Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php
+8Lines changed: 8 additions & 0 deletions
@@ -63,7 +63,13 @@ public function guess($path)
         if (!$finfo = new \finfo(FILEINFO_MIME_TYPE, $this->magicFile)) {
             return null;
         }
+        $mimeType = $finfo->file($path);
 
-        return $finfo->file($path);
+        if ($mimeType && 0 === (\strlen($mimeType) % 2)) {
+            $mimeStart = substr($mimeType, 0, \strlen($mimeType) >> 1);
+            $mimeType = $mimeStart.$mimeStart === $mimeType ? $mimeStart : $mimeType;
+        }
+
+        return $mimeType;
     }
 }
@@ -60,6 +60,14 @@ public function testGuessFileWithUnknownExtension()
         $this->assertEquals('application/octet-stream', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/.unknownextension'));
     }
 
+    /**
+     * @requires PHP 7.0
+     */
+    public function testGuessWithDuplicatedFileType()
+    {
+        $this->assertEquals('application/vnd.openxmlformats-officedocument.wordprocessingml.document', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/test.docx'));
+    }
+
     public function testGuessWithIncorrectPath()
     {
         $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,13 @@ public function guess($path)`
`63`	`63`	`if (!$finfo = new \finfo(FILEINFO_MIME_TYPE, $this->magicFile)) {`
`64`	`64`	`return null;`
`65`	`65`	`}`
	`66`	`+ $mimeType = $finfo->file($path);`
`66`	`67`
`67`		`- return $finfo->file($path);`
	`68`	`+ if ($mimeType && 0 === (\strlen($mimeType) % 2)) {`
	`69`	`+ $mimeStart = substr($mimeType, 0, \strlen($mimeType) >> 1);`
	`70`	`+ $mimeType = $mimeStart.$mimeStart === $mimeType ? $mimeStart : $mimeType;`
	`71`	`+ }`
	`72`	`+`
	`73`	`+ return $mimeType;`
`68`	`74`	`}`
`69`	`75`	`}`