Fix merge

This commit is contained in:
Nicolas Grekas 2015-12-18 17:16:50 +01:00
parent 4c7c5ff489
commit f176156eb4

View File

@ -616,7 +616,7 @@ class EntityTypeTest extends TypeTestCase
$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 @@ class EntityTypeTest extends TypeTestCase
$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 @@ class EntityTypeTest extends TypeTestCase
$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 @@ class EntityTypeTest extends TypeTestCase
$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 @@ class EntityTypeTest extends TypeTestCase
$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',