Skip to content

Commit 5609f02

Browse files
Merge branch '2.6' into 2.7
* 2.6: (24 commits) [Form] fixed a maxlength overring on a guessing [Debug] Show only unique class candidates [SecurityBundle] Firewall providers building - code cleaning [Filesystem] symlink use RealPath instead LinkTarget [DependencyInjection] Remove duplicate declaration in PhpDumper terminals are not interactive on Travis Revert "[DependencyInjection] backport perf optim" [WebProfiler] Tweaked ajax requests toolbar css reset [WebProfilerBundle] replaced pattern to path attribute in routes definitions. fix phpdoc's alignment Fix missing addExpressionLanguageProvider (used by service container to add expression providers) Fixed the AuthenticationProviderInterface alignment Fixed the proxy-manager version constraint Fix missing space in label_attr fix DumpDataCollectorTest after CS changes avoid risky tests Fixed typo in SecurityContext PHPDoc [FrameworkBundle][Template name] avoid error message for the shortcut notation. [DependencyInjection] perf optim: call dirname() at most 5x [DependencyInjection] backport perf optim ...
2 parents 3f5af09 + 33e538f commit 5609f02

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

OptionsResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,7 @@ public function offsetGet($option)
833833
// BEGIN
834834
$this->calling[$option] = true;
835835
foreach ($this->lazy[$option] as $closure) {
836-
$value = call_user_func($closure, $this, $value);
836+
$value = $closure($this, $value);
837837
}
838838
unset($this->calling[$option]);
839839
// END
@@ -929,7 +929,7 @@ public function offsetGet($option)
929929
// dependency
930930
// BEGIN
931931
$this->calling[$option] = true;
932-
$value = call_user_func($normalizer, $this, $value);
932+
$value = $normalizer($this, $value);
933933
unset($this->calling[$option]);
934934
// END
935935
}

0 commit comments

Comments
 (0)