Skip to content

Commit a343cd2

Browse files
Merge branch '2.3' into 2.7
* 2.3: [HttpFoundation] Fix transient test [HttpFoundation] Add a dependency on the mbstring polyfill add readme files where missing Don't use reflections when possible [Form] Update form tests after the ICU data update [Intl] Update tests and the number formatter to match behaviour of the intl extension [Intl] Update the ICU data to version 55 [Intl] Fix the update-data.php script in preparation for ICU 5.5 Use constant instead of function call. fixed test name automatically generate safe fallback filename Conflicts: src/Symfony/Component/Debug/Debug.php src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
2 parents 0e592ae + 5e173d1 commit a343cd2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/Form/Type/EntityTypeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ public function testChoicesForValuesOptimization()
796796

797797
$this->persist(array($entity1, $entity2));
798798

799-
$field = $this->factory->createNamed('name', 'Symfony\Bridge\Doctrine\Form\Type\EntityType', null, array(
799+
$field = $this->factory->createNamed('name', 'entity', null, array(
800800
'em' => 'default',
801801
'class' => self::SINGLE_IDENT_CLASS,
802802
'choice_label' => 'name',

0 commit comments

Comments
 (0)