Skip to content

Commit 424e9b8

Browse files
Merge branch '4.0' into 4.1
* 4.0: Alpha-ordering for "use" statements
2 parents 6a5aad6 + 1362cc7 commit 424e9b8

File tree

71 files changed

+132
-132
lines changed

Some content is hidden

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

71 files changed

+132
-132
lines changed

ButtonBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespace Symfony\Component\Form;
1313

1414
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
15-
use Symfony\Component\Form\Exception\InvalidArgumentException;
1615
use Symfony\Component\Form\Exception\BadMethodCallException;
16+
use Symfony\Component\Form\Exception\InvalidArgumentException;
1717

1818
/**
1919
* A builder for {@link Button} instances.

CallbackTransformer.php

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

1212
namespace Symfony\Component\Form;
1313

14-
use Symfony\Component\Form\Exception\UnexpectedTypeException;
1514
use Symfony\Component\Form\Exception\TransformationFailedException;
15+
use Symfony\Component\Form\Exception\UnexpectedTypeException;
1616

1717
class CallbackTransformer implements DataTransformerInterface
1818
{

DependencyInjection/FormPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
namespace Symfony\Component\Form\DependencyInjection;
1313

1414
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
15+
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
1516
use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
1617
use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
1718
use Symfony\Component\DependencyInjection\ContainerBuilder;
18-
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
1919
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
2020
use Symfony\Component\DependencyInjection\Reference;
2121

Extension/Core/DataTransformer/ChoiceToValueTransformer.php

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

1212
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
1313

14+
use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
1415
use Symfony\Component\Form\DataTransformerInterface;
1516
use Symfony\Component\Form\Exception\TransformationFailedException;
16-
use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
1717

1818
/**
1919
* @author Bernhard Schussek <[email protected]>

Extension/Core/DataTransformer/ChoicesToValuesTransformer.php

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

1212
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
1313

14-
use Symfony\Component\Form\Exception\TransformationFailedException;
15-
use Symfony\Component\Form\DataTransformerInterface;
1614
use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
15+
use Symfony\Component\Form\DataTransformerInterface;
16+
use Symfony\Component\Form\Exception\TransformationFailedException;
1717

1818
/**
1919
* @author Bernhard Schussek <[email protected]>

Extension/Core/EventListener/FixUrlProtocolListener.php

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

1212
namespace Symfony\Component\Form\Extension\Core\EventListener;
1313

14-
use Symfony\Component\Form\FormEvents;
15-
use Symfony\Component\Form\FormEvent;
1614
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
15+
use Symfony\Component\Form\FormEvent;
16+
use Symfony\Component\Form\FormEvents;
1717

1818
/**
1919
* Adds a protocol to a URL if it doesn't already have one.

Extension/Core/EventListener/MergeCollectionListener.php

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

1414
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
15-
use Symfony\Component\Form\FormEvents;
16-
use Symfony\Component\Form\FormEvent;
1715
use Symfony\Component\Form\Exception\UnexpectedTypeException;
16+
use Symfony\Component\Form\FormEvent;
17+
use Symfony\Component\Form\FormEvents;
1818

1919
/**
2020
* @author Bernhard Schussek <[email protected]>

Extension/Core/EventListener/ResizeFormListener.php

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

1212
namespace Symfony\Component\Form\Extension\Core\EventListener;
1313

14-
use Symfony\Component\Form\FormEvents;
15-
use Symfony\Component\Form\FormEvent;
16-
use Symfony\Component\Form\Exception\UnexpectedTypeException;
1714
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
15+
use Symfony\Component\Form\Exception\UnexpectedTypeException;
16+
use Symfony\Component\Form\FormEvent;
17+
use Symfony\Component\Form\FormEvents;
1818
use Symfony\Component\Form\FormInterface;
1919

2020
/**

Extension/Core/EventListener/TrimListener.php

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

1212
namespace Symfony\Component\Form\Extension\Core\EventListener;
1313

14-
use Symfony\Component\Form\FormEvents;
15-
use Symfony\Component\Form\FormEvent;
1614
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
15+
use Symfony\Component\Form\FormEvent;
16+
use Symfony\Component\Form\FormEvents;
1717
use Symfony\Component\Form\Util\StringUtil;
1818

1919
/**

Extension/Core/Type/CheckboxType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
namespace Symfony\Component\Form\Extension\Core\Type;
1313

1414
use Symfony\Component\Form\AbstractType;
15+
use Symfony\Component\Form\Extension\Core\DataTransformer\BooleanToStringTransformer;
1516
use Symfony\Component\Form\FormBuilderInterface;
1617
use Symfony\Component\Form\FormInterface;
17-
use Symfony\Component\Form\Extension\Core\DataTransformer\BooleanToStringTransformer;
1818
use Symfony\Component\Form\FormView;
1919
use Symfony\Component\OptionsResolver\OptionsResolver;
2020

0 commit comments

Comments
 (0)