diff --git a/File/MimeType/FileinfoMimeTypeGuesser.php b/File/MimeType/FileinfoMimeTypeGuesser.php
index 70a01d7ae..648307708 100644
--- 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/File/MimeType/MimeTypeExtensionGuesser.php b/File/MimeType/MimeTypeExtensionGuesser.php
index 651be070e..9b8ac70ad 100644
--- a/File/MimeType/MimeTypeExtensionGuesser.php
+++ b/File/MimeType/MimeTypeExtensionGuesser.php
@@ -625,7 +625,7 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
'audio/basic' => 'au',
'audio/midi' => 'mid',
'audio/mp4' => 'm4a',
- 'audio/mpeg' => 'mpga',
+ 'audio/mpeg' => 'mp3',
'audio/ogg' => 'oga',
'audio/s3m' => 's3m',
'audio/silk' => 'sil',
diff --git a/Tests/File/Fixtures/test.docx b/Tests/File/Fixtures/test.docx
new file mode 100644
index 000000000..2e86b6fce
Binary files /dev/null and b/Tests/File/Fixtures/test.docx differ
diff --git a/Tests/File/MimeType/MimeTypeTest.php b/Tests/File/MimeType/MimeTypeTest.php
index c566db769..4b568e551 100644
--- 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->assertSame('application/vnd.openxmlformats-officedocument.wordprocessingml.document', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/test.docx'));
+ }
+
public function testGuessWithIncorrectPath()
{
$this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
diff --git a/Tests/ResponseTest.php b/Tests/ResponseTest.php
index c766f88a2..0d3c37aaa 100644
--- a/Tests/ResponseTest.php
+++ b/Tests/ResponseTest.php
@@ -617,20 +617,20 @@ public function testSetCache()
$options = ['etag' => '"whatever"'];
$response->setCache($options);
- $this->assertEquals($response->getEtag(), '"whatever"');
+ $this->assertEquals('"whatever"', $response->getEtag());
$now = $this->createDateTimeNow();
$options = ['last_modified' => $now];
$response->setCache($options);
- $this->assertEquals($response->getLastModified()->getTimestamp(), $now->getTimestamp());
+ $this->assertEquals($now->getTimestamp(), $response->getLastModified()->getTimestamp());
$options = ['max_age' => 100];
$response->setCache($options);
- $this->assertEquals($response->getMaxAge(), 100);
+ $this->assertEquals(100, $response->getMaxAge());
$options = ['s_maxage' => 200];
$response->setCache($options);
- $this->assertEquals($response->getMaxAge(), 200);
+ $this->assertEquals(200, $response->getMaxAge());
$this->assertTrue($response->headers->hasCacheControlDirective('public'));
$this->assertFalse($response->headers->hasCacheControlDirective('private'));
diff --git a/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
index 0adabc02c..f0e2d4f50 100644
--- a/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
+++ b/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@@ -86,7 +86,7 @@ public function testRead()
->method('findOne')
->willReturnCallback(function ($criteria) use ($testTimeout) {
$this->assertArrayHasKey($this->options['id_field'], $criteria);
- $this->assertEquals($criteria[$this->options['id_field']], 'foo');
+ $this->assertEquals('foo', $criteria[$this->options['id_field']]);
$this->assertArrayHasKey($this->options['expiry_field'], $criteria);
$this->assertArrayHasKey('$gte', $criteria[$this->options['expiry_field']]);
diff --git a/Tests/Session/Storage/PhpBridgeSessionStorageTest.php b/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
index b4fad7688..b546b958e 100644
--- a/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
+++ b/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
@@ -83,10 +83,10 @@ public function testClear()
$_SESSION['drak'] = 'loves symfony';
$storage->getBag('attributes')->set('symfony', 'greatness');
$key = $storage->getBag('attributes')->getStorageKey();
- $this->assertEquals($_SESSION[$key], ['symfony' => 'greatness']);
- $this->assertEquals($_SESSION['drak'], 'loves symfony');
+ $this->assertEquals(['symfony' => 'greatness'], $_SESSION[$key]);
+ $this->assertEquals('loves symfony', $_SESSION['drak']);
$storage->clear();
- $this->assertEquals($_SESSION[$key], []);
- $this->assertEquals($_SESSION['drak'], 'loves symfony');
+ $this->assertEquals([], $_SESSION[$key]);
+ $this->assertEquals('loves symfony', $_SESSION['drak']);
}
}
diff --git a/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php b/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
index 1cf4aed06..81c90433d 100644
--- a/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
+++ b/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
@@ -127,7 +127,7 @@ public function testGc()
*/
public function testValidateId()
{
- $mock = $this->getMockBuilder(['SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'])->getMock();
+ $mock = $this->getMockBuilder(TestSessionHandler::class)->getMock();
$mock->expects($this->once())
->method('validateId');
@@ -142,7 +142,7 @@ public function testValidateId()
*/
public function testUpdateTimestamp()
{
- $mock = $this->getMockBuilder(['SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'])->getMock();
+ $mock = $this->getMockBuilder(TestSessionHandler::class)->getMock();
$mock->expects($this->once())
->method('updateTimestamp')
->willReturn(false);
@@ -156,3 +156,7 @@ public function testUpdateTimestamp()
$this->proxy->updateTimestamp('id', 'data');
}
}
+
+abstract class TestSessionHandler implements \SessionHandlerInterface, \SessionUpdateTimestampHandlerInterface
+{
+}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy