Skip to content

Commit 4c1ed2f

Browse files
committed
Merge branch '2.3' into 2.4
* 2.3: removed unneeded use statements Prepend Child Bundle paths before the parent [Routing] add unit tests for Symfony\Component\Routing\RequestContext class Conflicts: src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php src/Symfony/Component/Validator/ConstraintValidatorFactory.php
2 parents 4534a00 + 1a52318 commit 4c1ed2f

File tree

3 files changed

+0
-4
lines changed

3 files changed

+0
-4
lines changed

Output/ConsoleOutput.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\Console\Output;
1313

1414
use Symfony\Component\Console\Formatter\OutputFormatterInterface;
15-
use Symfony\Component\Console\Output\ConsoleOutputInterface;
1615

1716
/**
1817
* ConsoleOutput is the default class for all CLI output. It uses STDOUT.

Output/ConsoleOutputInterface.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
namespace Symfony\Component\Console\Output;
1313

14-
use Symfony\Component\Console\Output\OutputInterface;
15-
1614
/**
1715
* ConsoleOutputInterface is the interface implemented by ConsoleOutput class.
1816
* This adds information about stderr output stream.

Shell.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Console;
1313

14-
use Symfony\Component\Console\Application;
1514
use Symfony\Component\Console\Input\StringInput;
1615
use Symfony\Component\Console\Output\ConsoleOutput;
1716
use Symfony\Component\Process\ProcessBuilder;

0 commit comments

Comments
 (0)