Skip to content

Commit a2e6f67

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: fixed CS fixed CS fixed CS Do not log or call the proxy function when the locale is the same Added missing required dependencies on psr/cache and psr/container in symfony/cache-contracts and symfony/service-contracts respectively. [HttpClient] fix closing debug stream prematurely [Mailer] made code more robust Restore compatibility with php 5.5 fixed sender/recipients in SMTP Envelope collect called listeners information only once [HttpKernel] Remove TestEventDispatcher.
2 parents 10ac15c + b592b26 commit a2e6f67

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

Application.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ protected function doRenderException(\Exception $e, OutputInterface $output)
786786

787787
if (false !== strpos($message, "class@anonymous\0")) {
788788
$message = preg_replace_callback('/class@anonymous\x00.*?\.php0x?[0-9a-fA-F]++/', function ($m) {
789-
return \class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0];
789+
return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0];
790790
}, $message);
791791
}
792792

Helper/ProcessHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function run(OutputInterface $output, $cmd, $error = null, callable $call
5151

5252
if (!\is_array($cmd)) {
5353
@trigger_error(sprintf('Passing a command as a string to "%s()" is deprecated since Symfony 4.2, pass it the command as an array of arguments instead.', __METHOD__), E_USER_DEPRECATED);
54-
$cmd = [\method_exists(Process::class, 'fromShellCommandline') ? Process::fromShellCommandline($cmd) : new Process($cmd)];
54+
$cmd = [method_exists(Process::class, 'fromShellCommandline') ? Process::fromShellCommandline($cmd) : new Process($cmd)];
5555
}
5656

5757
if (\is_string($cmd[0] ?? null)) {

Helper/ProgressBar.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ public function setRedrawFrequency(int $freq)
250250
*/
251251
public function iterate(iterable $iterable, ?int $max = null): iterable
252252
{
253-
$this->start($max ?? (\is_countable($iterable) ? \count($iterable) : 0));
253+
$this->start($max ?? (is_countable($iterable) ? \count($iterable) : 0));
254254

255255
foreach ($iterable as $key => $value) {
256256
yield $key => $value;

Output/ConsoleSectionOutput.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function clear(int $lines = null)
5050
}
5151

5252
if ($lines) {
53-
\array_splice($this->content, -($lines * 2)); // Multiply lines by 2 to cater for each new line added between content
53+
array_splice($this->content, -($lines * 2)); // Multiply lines by 2 to cater for each new line added between content
5454
} else {
5555
$lines = $this->lines;
5656
$this->content = [];

Tests/Helper/ProcessHelperTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ProcessHelperTest extends TestCase
2626
public function testVariousProcessRuns($expected, $cmd, $verbosity, $error)
2727
{
2828
if (\is_string($cmd)) {
29-
$cmd = \method_exists(Process::class, 'fromShellCommandline') ? Process::fromShellCommandline($cmd) : new Process($cmd);
29+
$cmd = method_exists(Process::class, 'fromShellCommandline') ? Process::fromShellCommandline($cmd) : new Process($cmd);
3030
}
3131

3232
$helper = new ProcessHelper();
@@ -99,7 +99,7 @@ public function provideCommandsAndOutput()
9999
$args = new Process(['php', '-r', 'echo 42;']);
100100
$args = $args->getCommandLine();
101101
$successOutputProcessDebug = str_replace("'php' '-r' 'echo 42;'", $args, $successOutputProcessDebug);
102-
$fromShellCommandline = \method_exists(Process::class, 'fromShellCommandline') ? [Process::class, 'fromShellCommandline'] : function ($cmd) { return new Process($cmd); };
102+
$fromShellCommandline = method_exists(Process::class, 'fromShellCommandline') ? [Process::class, 'fromShellCommandline'] : function ($cmd) { return new Process($cmd); };
103103

104104
return [
105105
['', 'php -r "echo 42;"', StreamOutput::VERBOSITY_VERBOSE, null],

Tests/Helper/ProgressBarTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ public function testIterate(): void
884884
{
885885
$bar = new ProgressBar($output = $this->getOutputStream());
886886

887-
$this->assertEquals([1, 2], \iterator_to_array($bar->iterate([1, 2])));
887+
$this->assertEquals([1, 2], iterator_to_array($bar->iterate([1, 2])));
888888

889889
rewind($output->getStream());
890890
$this->assertEquals(
@@ -900,7 +900,7 @@ public function testIterateUncountable(): void
900900
{
901901
$bar = new ProgressBar($output = $this->getOutputStream());
902902

903-
$this->assertEquals([1, 2], \iterator_to_array($bar->iterate((function () {
903+
$this->assertEquals([1, 2], iterator_to_array($bar->iterate((function () {
904904
yield 1;
905905
yield 2;
906906
})())));

0 commit comments

Comments
 (0)