Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 27290714b75b · 2020-06-28T17:22:55.000+02:00
* 3.4:
  Fix test that fails on old distros
diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php b/src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php
@@ -63,7 +63,7 @@ public function testGuessFileWithUnknownExtension()
 
     public function testGuessWithDuplicatedFileType()
     {
-        $this->assertEquals('application/vnd.openxmlformats-officedocument.wordprocessingml.document', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/test.docx'));
+        $this->assertSame('application/vnd.openxmlformats-officedocument.wordprocessingml.document', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/test.docx'));
     }
 
     public function testGuessWithIncorrectPath()

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function testGuessFileWithUnknownExtension()`
`63`	`63`
`64`	`64`	`public function testGuessWithDuplicatedFileType()`
`65`	`65`	`{`
`66`		`- $this->assertEquals('application/vnd.openxmlformats-officedocument.wordprocessingml.document', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/test.docx'));`
	`66`	`+ $this->assertSame('application/vnd.openxmlformats-officedocument.wordprocessingml.document', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/test.docx'));`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public function testGuessWithIncorrectPath()`