Skip to content

Commit f9718fc

Browse files
Merge branch '4.1' into 4.2
* 4.1: 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 [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 [Routing] fix dumping same-path routes with placeholders [Security] defer log message in guard authenticator [Validator] Added IBAN format for Vatican City State merge conflicts filter out invalid Intl values filter out invalid language values [Validator] Fixed grouped composite constraints [Form] Filter arrays out of scalar form types Fix HeaderBag::get phpdoc
2 parents 4dff24e + f939a68 commit f9718fc

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

Command/Command.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ public function run(InputInterface $input, OutputInterface $output)
250250
$input->validate();
251251

252252
if ($this->code) {
253-
$statusCode = \call_user_func($this->code, $input, $output);
253+
$statusCode = ($this->code)($input, $output);
254254
} else {
255255
$statusCode = $this->execute($input, $output);
256256
}

Helper/ProcessHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public function wrapCallback(OutputInterface $output, Process $process, callable
136136
$output->write($formatter->progress(spl_object_hash($process), $this->escapeString($buffer), Process::ERR === $type));
137137

138138
if (null !== $callback) {
139-
\call_user_func($callback, $type, $buffer);
139+
$callback($type, $buffer);
140140
}
141141
};
142142
}

Helper/ProgressBar.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ private function buildLine(): string
496496
$regex = "{%([a-z\-_]+)(?:\:([^%]+))?%}i";
497497
$callback = function ($matches) {
498498
if ($formatter = $this::getPlaceholderFormatterDefinition($matches[1])) {
499-
$text = \call_user_func($formatter, $this, $this->output);
499+
$text = $formatter($this, $this->output);
500500
} elseif (isset($this->messages[$matches[1]])) {
501501
$text = $this->messages[$matches[1]];
502502
} else {

Helper/ProgressIndicator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ private function display()
196196

197197
$this->overwrite(preg_replace_callback("{%([a-z\-_]+)(?:\:([^%]+))?%}i", function ($matches) use ($self) {
198198
if ($formatter = $self::getPlaceholderFormatterDefinition($matches[1])) {
199-
return \call_user_func($formatter, $self);
199+
return $formatter($self);
200200
}
201201

202202
return $matches[0];

Helper/QuestionHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ private function validateAttempts(callable $interviewer, OutputInterface $output
381381
}
382382

383383
try {
384-
return \call_user_func($question->getValidator(), $interviewer());
384+
return $question->getValidator()($interviewer());
385385
} catch (RuntimeException $e) {
386386
throw $e;
387387
} catch (\Exception $error) {

0 commit comments

Comments
 (0)