Merge branch '5.1' into 5.2

* 5.1:
  Use import instead of FQCN

Author: nicolas-grekas

Tests/Extension/Core/Type/FormTypeTest.php

@@ -350,7 +350,7 @@ public function testAttributesException()
 
     public function testActionCannotBeNull()
     {
-        $this->expectException(\Symfony\Component\OptionsResolver\Exception\InvalidOptionsException::class);
+        $this->expectException(InvalidOptionsException::class);
         $this->factory->create(static::TESTED_TYPE, null, ['action' => null]);
     }
 

Tests/Extension/Core/Type/NumberTypeTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\Form\Exception\LogicException;
+use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
 class NumberTypeTest extends BaseTypeTest
@@ -80,7 +81,7 @@ public function testDefaultFormattingWithScaleAndStringInput()
 
     public function testStringInputWithFloatData()
     {
-        $this->expectException(\Symfony\Component\Form\Exception\TransformationFailedException::class);
+        $this->expectException(TransformationFailedException::class);
         $this->expectExceptionMessage('Expected a numeric string.');
 
         $this->factory->create(static::TESTED_TYPE, 12345.6789, [
@@ -91,7 +92,7 @@ public function testStringInputWithFloatData()
 
     public function testStringInputWithIntData()
     {
-        $this->expectException(\Symfony\Component\Form\Exception\TransformationFailedException::class);
+        $this->expectException(TransformationFailedException::class);
         $this->expectExceptionMessage('Expected a numeric string.');
 
         $this->factory->create(static::TESTED_TYPE, 12345, [

Tests/Extension/Core/Type/TimeTypeTest.php

@@ -13,6 +13,7 @@
 
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
 use Symfony\Component\Form\Exception\InvalidConfigurationException;
+use Symfony\Component\Form\Exception\LogicException;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
@@ -478,7 +479,7 @@ public function testSetDataDifferentTimezonesDuringDaylightSavingTime()
 
     public function testSetDataDifferentTimezonesWithoutReferenceDate()
     {
-        $this->expectException(\Symfony\Component\Form\Exception\LogicException::class);
+        $this->expectException(LogicException::class);
         $this->expectExceptionMessage('Using different values for the "model_timezone" and "view_timezone" options without configuring a reference date is not supported.');
 
         $form = $this->factory->create(static::TESTED_TYPE, null, [

Tests/FormRendererTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Form\Exception\BadMethodCallException;
 use Symfony\Component\Form\FormRenderer;
 use Symfony\Component\Form\FormRendererEngineInterface;
 use Symfony\Component\Form\FormView;
@@ -32,7 +33,7 @@ public function testHumanize()
 
     public function testRenderARenderedField()
     {
-        $this->expectException(\Symfony\Component\Form\Exception\BadMethodCallException::class);
+        $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('Field "foo" has already been rendered, save the result of previous render call to a variable and output that instead.');
 
         $formView = new FormView();