Fix merge
This commit is contained in:
parent
7fa2eab99f
commit
625513da7b
@ -234,7 +234,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
|
|||||||
|
|
||||||
public function testSingleChoiceAttributesWithMainAttributes()
|
public function testSingleChoiceAttributesWithMainAttributes()
|
||||||
{
|
{
|
||||||
$form = $this->factory->createNamed('name', 'choice', '&a', array(
|
$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
|
||||||
'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
|
'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
|
||||||
'choices_as_values' => true,
|
'choices_as_values' => true,
|
||||||
'multiple' => false,
|
'multiple' => false,
|
||||||
@ -258,7 +258,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
|
|||||||
|
|
||||||
public function testSingleExpandedChoiceAttributesWithMainAttributes()
|
public function testSingleExpandedChoiceAttributesWithMainAttributes()
|
||||||
{
|
{
|
||||||
$form = $this->factory->createNamed('name', 'choice', '&a', array(
|
$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
|
||||||
'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
|
'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
|
||||||
'choices_as_values' => true,
|
'choices_as_values' => true,
|
||||||
'multiple' => false,
|
'multiple' => false,
|
||||||
|
@ -643,7 +643,7 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg
|
|||||||
|
|
||||||
public function testSingleChoiceAttributesWithMainAttributes()
|
public function testSingleChoiceAttributesWithMainAttributes()
|
||||||
{
|
{
|
||||||
$form = $this->factory->createNamed('name', 'choice', '&a', array(
|
$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
|
||||||
'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
|
'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
|
||||||
'choices_as_values' => true,
|
'choices_as_values' => true,
|
||||||
'multiple' => false,
|
'multiple' => false,
|
||||||
@ -667,7 +667,7 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg
|
|||||||
|
|
||||||
public function testSingleExpandedChoiceAttributesWithMainAttributes()
|
public function testSingleExpandedChoiceAttributesWithMainAttributes()
|
||||||
{
|
{
|
||||||
$form = $this->factory->createNamed('name', 'choice', '&a', array(
|
$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
|
||||||
'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
|
'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
|
||||||
'choices_as_values' => true,
|
'choices_as_values' => true,
|
||||||
'multiple' => false,
|
'multiple' => false,
|
||||||
|
Reference in New Issue
Block a user