Skip to content

Commit e01f8ff

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: fixed typo Revert "fixed typo" fixed typo fixed CS Avoid setting request attributes from signature arguments in AnnotationClassLoader [DependencyInjection] Add some missing typehints in YamlFileLoader [DependencyInjection] minor: Fix a DocBlock [HttpKernel] Give higher priority to adding request formats [FrameworkBundle] Fix third level headers for MarkdownDescriptor [TwigBundle] do not lose already set method calls #20411 fix Yaml parsing for very long quoted strings CS: apply is_null DX: remove invalid inheritdoc bumped Symfony version to 2.7.24 updated VERSION for 2.7.23 update CONTRIBUTORS for 2.7.23 updated CHANGELOG for 2.7.23 [FrameworkBundle] Skip test if xdebug.file_link_format is defined.
2 parents 56397e9 + bc2e187 commit e01f8ff

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

EventListener/AddRequestFormatsListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ public function onKernelRequest(GetResponseEvent $event)
5252
*/
5353
public static function getSubscribedEvents()
5454
{
55-
return array(KernelEvents::REQUEST => 'onKernelRequest');
55+
return array(KernelEvents::REQUEST => array('onKernelRequest', 1));
5656
}
5757
}

Tests/EventListener/AddRequestFormatsListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function testIsAnEventSubscriber()
4545
public function testRegisteredEvent()
4646
{
4747
$this->assertEquals(
48-
array(KernelEvents::REQUEST => 'onKernelRequest'),
48+
array(KernelEvents::REQUEST => array('onKernelRequest', 1)),
4949
AddRequestFormatsListener::getSubscribedEvents()
5050
);
5151
}

0 commit comments

Comments
 (0)