Skip to content

Commit 3f57439

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 1243383 + ef0e30f commit 3f57439

File tree

6 files changed

+0
-7
lines changed

6 files changed

+0
-7
lines changed

DependencyInjection/Security/Factory/AbstractFactory.php

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

1414
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
15-
1615
use Symfony\Component\DependencyInjection\DefinitionDecorator;
1716
use Symfony\Component\DependencyInjection\ContainerBuilder;
1817
use Symfony\Component\DependencyInjection\Reference;

DependencyInjection/Security/Factory/HttpBasicFactory.php

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

1414
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
15-
1615
use Symfony\Component\DependencyInjection\DefinitionDecorator;
1716
use Symfony\Component\DependencyInjection\ContainerBuilder;
1817
use Symfony\Component\DependencyInjection\Reference;

DependencyInjection/Security/Factory/HttpDigestFactory.php

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

1414
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
15-
1615
use Symfony\Component\DependencyInjection\DefinitionDecorator;
1716
use Symfony\Component\DependencyInjection\ContainerBuilder;
1817
use Symfony\Component\DependencyInjection\Reference;

DependencyInjection/Security/Factory/X509Factory.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
1313

1414
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
15-
1615
use Symfony\Component\DependencyInjection\DefinitionDecorator;
17-
1816
use Symfony\Component\DependencyInjection\ContainerBuilder;
1917
use Symfony\Component\DependencyInjection\Reference;
2018

DependencyInjection/Security/UserProvider/InMemoryFactory.php

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

1414
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
15-
1615
use Symfony\Component\DependencyInjection\DefinitionDecorator;
1716
use Symfony\Component\DependencyInjection\ContainerBuilder;
1817
use Symfony\Component\DependencyInjection\Reference;

Tests/Functional/Bundle/FormLoginBundle/DependencyInjection/FormLoginExtension.php

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

1414
use Symfony\Component\DependencyInjection\Reference;
15-
1615
use Symfony\Component\DependencyInjection\ContainerBuilder;
1716
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
1817

0 commit comments

Comments
 (0)