Fix merge

Author: nicolas-grekas

Tests/Form/Type/EntityTypeTest.php

@@ -616,7 +616,7 @@ public function testSubmitSingleNonExpandedStringCastableIdentifier()
 
         $this->persist(array($entity1, $entity2));
 
-        $field = $this->factory->createNamed('name', 'entity', null, array(
+        $field = $this->factory->createNamed('name', EntityType::class, null, array(
             'multiple' => false,
             'expanded' => false,
             'em' => 'default',
@@ -638,7 +638,7 @@ public function testSubmitSingleStringCastableIdentifierExpanded()
 
         $this->persist(array($entity1, $entity2));
 
-        $field = $this->factory->createNamed('name', 'entity', null, array(
+        $field = $this->factory->createNamed('name', EntityType::class, null, array(
             'multiple' => false,
             'expanded' => true,
             'em' => 'default',
@@ -664,7 +664,7 @@ public function testSubmitMultipleNonExpandedStringCastableIdentifierForExisting
 
         $this->persist(array($entity1, $entity2, $entity3));
 
-        $field = $this->factory->createNamed('name', 'entity', null, array(
+        $field = $this->factory->createNamed('name', EntityType::class, null, array(
             'multiple' => true,
             'expanded' => false,
             'em' => 'default',
@@ -695,7 +695,7 @@ public function testSubmitMultipleNonExpandedStringCastableIdentifier()
 
         $this->persist(array($entity1, $entity2, $entity3));
 
-        $field = $this->factory->createNamed('name', 'entity', null, array(
+        $field = $this->factory->createNamed('name', EntityType::class, null, array(
             'multiple' => true,
             'expanded' => false,
             'em' => 'default',
@@ -720,7 +720,7 @@ public function testSubmitMultipleStringCastableIdentifierExpanded()
 
         $this->persist(array($entity1, $entity2, $entity3));
 
-        $field = $this->factory->createNamed('name', 'entity', null, array(
+        $field = $this->factory->createNamed('name', EntityType::class, null, array(
             'multiple' => true,
             'expanded' => true,
             'em' => 'default',