Skip to content

Commit f543049

Browse files
committed
Merge branch '2.8' into 3.1
* 2.8: (26 commits) fixed CS fixed CS fixed CS fixer config 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 [PropertyInfo] Don't try to access a property thru a static method [PropertyInfo] Exclude static methods form properties guessing [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.8.17 updated VERSION for 2.8.16 ...
2 parents f48d104 + 4143762 commit f543049

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

DataCollector/DumpDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ private function htmlEncode($s)
288288
{
289289
$html = '';
290290

291-
$dumper = new HtmlDumper(function ($line) use (&$html) {$html .= $line;}, $this->charset);
291+
$dumper = new HtmlDumper(function ($line) use (&$html) { $html .= $line; }, $this->charset);
292292
$dumper->setDumpHeader('');
293293
$dumper->setDumpBoundaries('', '');
294294

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)