diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge

This commit is contained in:
Nicolas Grekas 2015-08-27 09:19:36 +02:00
parent 1eede472cd
commit 4353134903
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
View File

@ -1339,7 +1339,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
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,
'expanded' => false,
'choices' => $this->objectChoices,
@ -1357,7 +1357,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
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,
'expanded' => false,
'choices' => $this->objectChoices,

8
src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
View File

@ -44,7 +44,7 @@ SplFileInfo {
file: true
dir: false
link: false
}
%A}
EOTXT
),
array('https://google.com/about', <<<'EOTXT'
@ -61,7 +61,7 @@ SplFileInfo {
file: false
dir: false
link: false
}
%A}
EOTXT
),
);
@ -111,8 +111,8 @@ SplFileObject {
"ino" => %d
"nlink" => %d
"rdev" => 0
"blksize" => %d
"blocks" => %d
"blksize" => %i
"blocks" => %i
…20
]
eof: false