Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit fb26f70508dd · 2020-06-28T17:07:02.000+02:00
* 3.4:
  [MimeType] Duplicated MimeType due to PHP Bug
  fix guessing form types for DateTime types
  fix handling typed properties as constraint options
diff --git a/File/MimeType/FileinfoMimeTypeGuesser.php b/File/MimeType/FileinfoMimeTypeGuesser.php
@@ -68,7 +68,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;
     }
 }
diff --git a/Tests/File/Fixtures/test.docx b/Tests/File/Fixtures/test.docx
diff --git a/Tests/File/MimeType/MimeTypeTest.php b/Tests/File/MimeType/MimeTypeTest.php
@@ -61,6 +61,11 @@ public function testGuessFileWithUnknownExtension()
         $this->assertEquals('application/octet-stream', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/.unknownextension'));
     }
 
+    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
`@@ -68,7 +68,13 @@ public function guess($path)`
`68`	`68`	`if (!$finfo = new \finfo(FILEINFO_MIME_TYPE, $this->magicFile)) {`
`69`	`69`	`return null;`
`70`	`70`	`}`
	`71`	`+ $mimeType = $finfo->file($path);`
`71`	`72`
`72`		`- return $finfo->file($path);`
	`73`	`+ if ($mimeType && 0 === (\strlen($mimeType) % 2)) {`
	`74`	`+ $mimeStart = substr($mimeType, 0, \strlen($mimeType) >> 1);`
	`75`	`+ $mimeType = $mimeStart.$mimeStart === $mimeType ? $mimeStart : $mimeType;`
	`76`	`+ }`
	`77`	`+`
	`78`	`+ return $mimeType;`
`73`	`79`	`}`
`74`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,11 @@ public function testGuessFileWithUnknownExtension()`
`61`	`61`	`$this->assertEquals('application/octet-stream', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/.unknownextension'));`
`62`	`62`	`}`
`63`	`63`
	`64`	`+ public function testGuessWithDuplicatedFileType()`
	`65`	`+ {`
	`66`	`+ $this->assertEquals('application/vnd.openxmlformats-officedocument.wordprocessingml.document', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/test.docx'));`
	`67`	`+ }`
	`68`	`+`
`64`	`69`	`public function testGuessWithIncorrectPath()`
`65`	`70`	`{`
`66`	`71`	`$this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');`