Skip to content

Commit f834c92

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.1'
* 4.1: Alpha-ordering for "use" statements
2 parents e812852 + a23a4a4 commit f834c92

File tree

767 files changed

+1424
-1423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

767 files changed

+1424
-1423
lines changed

‎.php_cs.dist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ return PhpCsFixer\Config::create()
1111
'@PHPUnit48Migration:risky' => true,
1212
'php_unit_no_expectation_annotation' => false, // part of `PHPUnitXYMigration:risky` ruleset, to be enabled when PHPUnit 4.x support will be dropped, as we don't want to rewrite exceptions handling twice
1313
'array_syntax' => array('syntax' => 'long'),
14+
'ordered_imports' => true,
1415
'protected_to_private' => false,
1516
// TODO remove the disabling once https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/3876 is merged and released
1617
'native_constant_invocation' => false,

‎src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
use Doctrine\Common\Persistence\ManagerRegistry;
1515
use Doctrine\DBAL\Logging\DebugStack;
1616
use Doctrine\DBAL\Types\Type;
17-
use Symfony\Component\HttpKernel\DataCollector\DataCollector;
1817
use Symfony\Component\HttpFoundation\Request;
1918
use Symfony\Component\HttpFoundation\Response;
19+
use Symfony\Component\HttpKernel\DataCollector\DataCollector;
2020

2121
/**
2222
* DoctrineDataCollector.

‎src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
namespace Symfony\Bridge\Doctrine\DependencyInjection;
1313

14-
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
1514
use Symfony\Component\DependencyInjection\Alias;
1615
use Symfony\Component\DependencyInjection\ContainerBuilder;
1716
use Symfony\Component\DependencyInjection\Definition;
1817
use Symfony\Component\DependencyInjection\Reference;
18+
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
1919

2020
/**
2121
* This abstract classes groups common code that Doctrine Object Manager extensions (ORM, MongoDB, CouchDB) need.

‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass;
1313

14-
use Symfony\Component\DependencyInjection\ContainerBuilder;
1514
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
15+
use Symfony\Component\DependencyInjection\ContainerBuilder;
1616

1717
/**
1818
* Registers additional validators.

‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php

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

1212
namespace Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass;
1313

14+
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
1415
use Symfony\Component\DependencyInjection\ContainerBuilder;
1516
use Symfony\Component\DependencyInjection\Definition;
16-
use Symfony\Component\DependencyInjection\Reference;
17-
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
1817
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
18+
use Symfony\Component\DependencyInjection\Reference;
1919

2020
/**
2121
* Base class for the doctrine bundles to provide a compiler pass class that

‎src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Symfony\Bridge\Doctrine\DependencyInjection\Security\UserProvider;
1313

14-
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
1514
use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\UserProvider\UserProviderFactoryInterface;
15+
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
1616
use Symfony\Component\DependencyInjection\ChildDefinition;
1717
use Symfony\Component\DependencyInjection\ContainerBuilder;
1818

‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Symfony\Bridge\Doctrine\Form\ChoiceList;
1313

14-
use Doctrine\ORM\QueryBuilder;
1514
use Doctrine\DBAL\Connection;
15+
use Doctrine\ORM\QueryBuilder;
1616

1717
/**
1818
* Loads entities using a {@link QueryBuilder} instance.

‎src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
namespace Symfony\Bridge\Doctrine\Form\DataTransformer;
1313

14-
use Symfony\Component\Form\Exception\TransformationFailedException;
15-
use Symfony\Component\Form\DataTransformerInterface;
16-
use Doctrine\Common\Collections\Collection;
1714
use Doctrine\Common\Collections\ArrayCollection;
15+
use Doctrine\Common\Collections\Collection;
16+
use Symfony\Component\Form\DataTransformerInterface;
17+
use Symfony\Component\Form\Exception\TransformationFailedException;
1818

1919
/**
2020
* @author Bernhard Schussek <bschussek@gmail.com>

‎src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
namespace Symfony\Bridge\Doctrine\Form\EventListener;
1313

1414
use Doctrine\Common\Collections\Collection;
15-
use Symfony\Component\Form\FormEvents;
16-
use Symfony\Component\Form\FormEvent;
1715
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
16+
use Symfony\Component\Form\FormEvent;
17+
use Symfony\Component\Form\FormEvents;
1818

1919
/**
2020
* Merge changes from the request to a Doctrine\Common\Collections\Collection instance.

‎src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
namespace Symfony\Bridge\Doctrine\Logger;
1313

14+
use Doctrine\DBAL\Logging\SQLLogger;
1415
use Psr\Log\LoggerInterface;
1516
use Symfony\Component\Stopwatch\Stopwatch;
16-
use Doctrine\DBAL\Logging\SQLLogger;
1717

1818
/**
1919
* @author Fabien Potencier <fabien@symfony.com>

0 commit comments

Comments
 (0)