Skip to content

Commit 2d13ee1

Browse files
committed
Merge pull request #1053 from ktounet/issue-mime-listener
Fix old use of mime_types configuration
2 parents 0cae3cf + 4f8617f commit 2d13ee1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

EventListener/MimeTypeListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function onKernelRequest(GetResponseEvent $event)
4848
$request = $event->getRequest();
4949

5050
if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {
51-
foreach ($this->mimeTypes as $format => $mimeType) {
51+
foreach ($this->mimeTypes['formats'] as $format => $mimeType) {
5252
$request->setFormat($format, $mimeType);
5353
$this->formatNegotiator->registerFormat($format, (array) $mimeType, true);
5454
}

Tests/EventListener/MimeTypeListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function testOnKernelRequest()
3131
->with('jsonp', array('application/javascript+jsonp'), true)
3232
->will($this->returnValue(null));
3333

34-
$listener = new MimeTypeListener(array('jsonp' => array('application/javascript+jsonp')), $formatNegotiator);
34+
$listener = new MimeTypeListener(array('enabled' => true, 'formats' => array('jsonp' => array('application/javascript+jsonp'))), $formatNegotiator);
3535

3636
$request = new Request();
3737
$event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')

0 commit comments

Comments
 (0)