Fix merge
This commit is contained in:
parent
1eede472cd
commit
4353134903
@ -1339,7 +1339,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
|
|||||||
|
|
||||||
public function testSingleSelectedObjectChoices()
|
public function testSingleSelectedObjectChoices()
|
||||||
{
|
{
|
||||||
$form = $this->factory->create('choice', $this->objectChoices[3], array(
|
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\ChoiceType', $this->objectChoices[3], array(
|
||||||
'multiple' => false,
|
'multiple' => false,
|
||||||
'expanded' => false,
|
'expanded' => false,
|
||||||
'choices' => $this->objectChoices,
|
'choices' => $this->objectChoices,
|
||||||
@ -1357,7 +1357,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
|
|||||||
|
|
||||||
public function testMultipleSelectedObjectChoices()
|
public function testMultipleSelectedObjectChoices()
|
||||||
{
|
{
|
||||||
$form = $this->factory->create('choice', array($this->objectChoices[3]), array(
|
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\ChoiceType', array($this->objectChoices[3]), array(
|
||||||
'multiple' => true,
|
'multiple' => true,
|
||||||
'expanded' => false,
|
'expanded' => false,
|
||||||
'choices' => $this->objectChoices,
|
'choices' => $this->objectChoices,
|
||||||
|
@ -44,7 +44,7 @@ SplFileInfo {
|
|||||||
file: true
|
file: true
|
||||||
dir: false
|
dir: false
|
||||||
link: false
|
link: false
|
||||||
}
|
%A}
|
||||||
EOTXT
|
EOTXT
|
||||||
),
|
),
|
||||||
array('https://google.com/about', <<<'EOTXT'
|
array('https://google.com/about', <<<'EOTXT'
|
||||||
@ -61,7 +61,7 @@ SplFileInfo {
|
|||||||
file: false
|
file: false
|
||||||
dir: false
|
dir: false
|
||||||
link: false
|
link: false
|
||||||
}
|
%A}
|
||||||
EOTXT
|
EOTXT
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
@ -111,8 +111,8 @@ SplFileObject {
|
|||||||
"ino" => %d
|
"ino" => %d
|
||||||
"nlink" => %d
|
"nlink" => %d
|
||||||
"rdev" => 0
|
"rdev" => 0
|
||||||
"blksize" => %d
|
"blksize" => %i
|
||||||
"blocks" => %d
|
"blocks" => %i
|
||||||
…20
|
…20
|
||||||
]
|
]
|
||||||
eof: false
|
eof: false
|
||||||
|
Reference in New Issue
Block a user