From 43531349032a74c9e47bcc551575085d9a28914d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 27 Aug 2015 09:19:36 +0200
Subject: [PATCH] Fix merge

---
 .../Form/Tests/Extension/Core/Type/ChoiceTypeTest.php     | 4 ++--
 .../Component/VarDumper/Tests/Caster/SplCasterTest.php    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
index cf15b0a3b7..ab44864057 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -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,
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
index 0bcce0c4bb..ef84173641 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
@@ -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