Merge branch '5.1' into 5.2

* 5.1:
  Use ::class keyword when possible

Author: fabpot

Tests/Form/Type/EntityTypeTest.php

@@ -118,13 +118,13 @@ protected function persist(array $entities)
 
     public function testClassOptionIsRequired()
     {
-        $this->expectException('Symfony\Component\OptionsResolver\Exception\MissingOptionsException');
+        $this->expectException(\Symfony\Component\OptionsResolver\Exception\MissingOptionsException::class);
         $this->factory->createNamed('name', static::TESTED_TYPE);
     }
 
     public function testInvalidClassOption()
     {
-        $this->expectException('Symfony\Component\Form\Exception\RuntimeException');
+        $this->expectException(\Symfony\Component\Form\Exception\RuntimeException::class);
         $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'class' => 'foo',
         ]);
@@ -219,7 +219,7 @@ public function testSetDataToUninitializedEntityWithNonRequiredQueryBuilder()
 
     public function testConfigureQueryBuilderWithNonQueryBuilderAndNonClosure()
     {
-        $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
+        $this->expectException(\Symfony\Component\OptionsResolver\Exception\InvalidOptionsException::class);
         $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
@@ -229,7 +229,7 @@ public function testConfigureQueryBuilderWithNonQueryBuilderAndNonClosure()
 
     public function testConfigureQueryBuilderWithClosureReturningNonQueryBuilder()
     {
-        $this->expectException('Symfony\Component\Form\Exception\UnexpectedTypeException');
+        $this->expectException(\Symfony\Component\Form\Exception\UnexpectedTypeException::class);
         $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
@@ -1242,7 +1242,7 @@ public function testLoaderCaching()
         $choiceList2 = $form->get('property2')->getConfig()->getAttribute('choice_list');
         $choiceList3 = $form->get('property3')->getConfig()->getAttribute('choice_list');
 
-        $this->assertInstanceOf('Symfony\Component\Form\ChoiceList\LazyChoiceList', $choiceList1);
+        $this->assertInstanceOf(\Symfony\Component\Form\ChoiceList\LazyChoiceList::class, $choiceList1);
         $this->assertSame($choiceList1, $choiceList2);
         $this->assertSame($choiceList1, $choiceList3);
     }
@@ -1302,7 +1302,7 @@ public function testLoaderCachingWithParameters()
         $choiceList2 = $form->get('property2')->getConfig()->getAttribute('choice_list');
         $choiceList3 = $form->get('property3')->getConfig()->getAttribute('choice_list');
 
-        $this->assertInstanceOf('Symfony\Component\Form\ChoiceList\LazyChoiceList', $choiceList1);
+        $this->assertInstanceOf(\Symfony\Component\Form\ChoiceList\LazyChoiceList::class, $choiceList1);
         $this->assertSame($choiceList1, $choiceList2);
         $this->assertSame($choiceList1, $choiceList3);
     }

Tests/PropertyInfo/DoctrineExtractorTest.php

@@ -81,7 +81,7 @@ public function testGetProperties()
 
     public function testTestGetPropertiesWithEmbedded()
     {
-        if (!class_exists('Doctrine\ORM\Mapping\Embedded')) {
+        if (!class_exists(\Doctrine\ORM\Mapping\Embedded::class)) {
             $this->markTestSkipped('@Embedded is not available in Doctrine ORM lower than 2.5.');
         }
 
@@ -104,7 +104,7 @@ public function testExtract($property, array $type = null)
 
     public function testExtractWithEmbedded()
     {
-        if (!class_exists('Doctrine\ORM\Mapping\Embedded')) {
+        if (!class_exists(\Doctrine\ORM\Mapping\Embedded::class)) {
             $this->markTestSkipped('@Embedded is not available in Doctrine ORM lower than 2.5.');
         }