Skip to content

Commit 48c62c5

Browse files
committed
Merge branch '2.3' into 2.5
* 2.3: [2.3] More cs fixes Removed unused imports CS fixes bumped Symfony version to 2.3.24 updated VERSION for 2.3.23 update CONTRIBUTORS for 2.3.23 updated CHANGELOG for 2.3.23 Conflicts: src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
2 parents b4afda3 + 7e76a32 commit 48c62c5

7 files changed

+0
-10
lines changed

Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php

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

1414
use Symfony\Component\DependencyInjection\Definition;
15-
1615
use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
1716
use Symfony\Component\DependencyInjection\ContainerInterface;
1817
use Symfony\Component\DependencyInjection\Reference;

Tests/Compiler/AnalyzeServiceReferencesPassTest.php

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

1414
use Symfony\Component\DependencyInjection\Definition;
15-
use Symfony\Component\DependencyInjection\Compiler\Compiler;
1615
use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
1716
use Symfony\Component\DependencyInjection\Compiler\RepeatedPass;
1817
use Symfony\Component\DependencyInjection\Reference;

Tests/Compiler/CheckCircularReferencesPassTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,9 @@
1212
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
1313

1414
use Symfony\Component\DependencyInjection\Reference;
15-
1615
use Symfony\Component\DependencyInjection\Compiler\CheckCircularReferencesPass;
17-
1816
use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
19-
2017
use Symfony\Component\DependencyInjection\Compiler\Compiler;
21-
2218
use Symfony\Component\DependencyInjection\ContainerBuilder;
2319

2420
class CheckCircularReferencesPassTest extends \PHPUnit_Framework_TestCase

Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php

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

1414
use Symfony\Component\DependencyInjection\Definition;
15-
1615
use Symfony\Component\DependencyInjection\Compiler\CheckExceptionOnInvalidReferenceBehaviorPass;
1716
use Symfony\Component\DependencyInjection\Reference;
1817
use Symfony\Component\DependencyInjection\ContainerBuilder;

Tests/Compiler/CheckReferenceValidityPassTest.php

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

1414
use Symfony\Component\DependencyInjection\Scope;
15-
1615
use Symfony\Component\DependencyInjection\Compiler\CheckReferenceValidityPass;
1716
use Symfony\Component\DependencyInjection\ContainerInterface;
1817
use Symfony\Component\DependencyInjection\Reference;

Tests/Compiler/RemoveUnusedDefinitionsPassTest.php

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

1414
use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
15-
use Symfony\Component\DependencyInjection\Compiler\Compiler;
1615
use Symfony\Component\DependencyInjection\Compiler\RepeatedPass;
1716
use Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass;
1817
use Symfony\Component\DependencyInjection\Definition;

Tests/Loader/XmlFileLoaderTest.php

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

1414
use Symfony\Component\DependencyInjection\ContainerInterface;
15-
1615
use Symfony\Component\DependencyInjection\ContainerBuilder;
1716
use Symfony\Component\DependencyInjection\Reference;
1817
use Symfony\Component\DependencyInjection\Definition;

0 commit comments

Comments
 (0)