Skip to content

Commit bc83111

Browse files
committed
Merge branch '2.3' into 2.5
* 2.3: Revert "[DependencyInjection] backport perf optim" [WebProfilerBundle] replaced pattern to path attribute in routes definitions. [FrameworkBundle][Template name] avoid error message for the shortcut notation. [DependencyInjection] perf optim: call dirname() at most 5x [DependencyInjection] backport perf optim [2.3] Remove possible call_user_func() Conflicts: src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
2 parents 1e92f58 + 5f98986 commit bc83111

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/HttpCache/TestHttpKernel.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ public function callController(Request $request)
7272

7373
$response = new Response($this->body, $this->status, $this->headers);
7474

75-
if (null !== $this->customizer) {
76-
call_user_func($this->customizer, $request, $response);
75+
if (null !== $customizer = $this->customizer) {
76+
$customizer($request, $response);
7777
}
7878

7979
return $response;

0 commit comments

Comments
 (0)