Skip to content

Commit 05cdc11

Browse files
Merge branch '4.2'
* 4.2: (27 commits) [VarExporter] dont call userland code with uninitialized objects Fix typos in doc blocks [Debug] ignore underscore vs backslash namespaces in DebugClassLoader [TwigBridge][Form] Prevent multiple rendering of form collection prototypes [FrameworkBundle] fix describing routes with no controllers [DI] move RegisterServiceSubscribersPass before DecoratorServicePass Update ValidationListener.php [Yaml] ensures that the mb_internal_encoding is reset to its initial value [Messenger] Restore message handlers laziness [WebLink] Fixed documentation link [Security] getTargetPath of TargetPathTrait must return string or null [Hackday][Serializer] Deserialization ignores argument type hint from phpdoc for array in constructor argument Optimize perf by replacing call_user_func with dynamic vars [Cache] Fix dsn parsing [Routing] fix dumping same-path routes with placeholders [WebProfilerBundle][TwigBundle] CSS fixes Add a docblock for FormFactoryInterface [Security] defer log message in guard authenticator [Validator] Added IBAN format for Vatican City State merge conflicts ...
2 parents f20052e + 25c672e commit 05cdc11

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Iterator/CustomFilterIterator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function accept()
5151
$fileinfo = $this->current();
5252

5353
foreach ($this->filters as $filter) {
54-
if (false === \call_user_func($filter, $fileinfo)) {
54+
if (false === $filter($fileinfo)) {
5555
return false;
5656
}
5757
}

Iterator/SortableIterator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function __construct(\Traversable $iterator, $sort, bool $reverseOrder =
7373
} elseif (self::SORT_BY_NONE === $sort) {
7474
$this->sort = $order;
7575
} elseif (\is_callable($sort)) {
76-
$this->sort = $reverseOrder ? function ($a, $b) use ($sort) { return -\call_user_func($sort, $a, $b); } : $sort;
76+
$this->sort = $reverseOrder ? function ($a, $b) use ($sort) { return -$sort($a, $b); } : $sort;
7777
} else {
7878
throw new \InvalidArgumentException('The SortableIterator takes a PHP callable or a valid built-in sort algorithm as an argument.');
7979
}

0 commit comments

Comments
 (0)