From 22c8f8087cd7eb6179de1c4a473a76a339c16005 Mon Sep 17 00:00:00 2001
From: Bernhard Schussek <bschussek@gmail.com>
Date: Thu, 9 Feb 2012 17:13:33 +0100
Subject: [PATCH] [Form] Fixed issues mentioned in the PR comments

---
 UPGRADE-2.1.md                                                | 4 ++--
 .../Core/DataTransformer/ChoicesToBooleanArrayTransformer.php | 2 +-
 .../Component/Form/Extension/Core/Type/DateTimeTypeTest.php   | 2 +-
 .../Tests/Component/Form/Extension/Core/Type/DateTypeTest.php | 2 +-
 .../Tests/Component/Form/Extension/Core/Type/TimeTypeTest.php | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/UPGRADE-2.1.md b/UPGRADE-2.1.md
index c47d5f977c..b94b511d79 100644
--- a/UPGRADE-2.1.md
+++ b/UPGRADE-2.1.md
@@ -237,14 +237,14 @@ UPGRADE FROM 2.0 to 2.1
 
     Before:
 
-        public function getParent()
+        public function getParent(array $options)
         {
             return 'single_text' === $options['widget'] ? 'text' : 'choice';
         }
 
     After:
 
-        public function getParent()
+        public function getParent(array $options)
         {
             return isset($options['widget']) && 'single_text' === $options['widget'] ? 'text' : 'choice';
         }
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToBooleanArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToBooleanArrayTransformer.php
index 5ec30926ad..f38102f298 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToBooleanArrayTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToBooleanArrayTransformer.php
@@ -107,7 +107,7 @@ class ChoicesToBooleanArrayTransformer implements DataTransformerInterface
         }
 
         if (count($unknown) > 0) {
-            throw new TransformationFailedException('The choices "' . implode('", "', $unknown) . '" where not found');
+            throw new TransformationFailedException('The choices "' . implode('", "', $unknown) . '" were not found');
         }
 
         return $result;
diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/DateTimeTypeTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/DateTimeTypeTest.php
index 2cd18ad4ef..ca10dc8485 100644
--- a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/DateTimeTypeTest.php
+++ b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/DateTimeTypeTest.php
@@ -264,6 +264,6 @@ class DateTimeTypeTest extends LocalizedTestCase
     {
         // Throws an exception if "data_class" option is not explicitely set
         // to null in the type
-        $form = $this->factory->create('datetime', new \DateTime());
+        $this->factory->create('datetime', new \DateTime());
     }
 }
diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/DateTypeTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/DateTypeTest.php
index 8bd78fcf94..425e3c71a0 100644
--- a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/DateTypeTest.php
+++ b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/DateTypeTest.php
@@ -536,6 +536,6 @@ class DateTypeTest extends LocalizedTestCase
     {
         // Throws an exception if "data_class" option is not explicitely set
         // to null in the type
-        $form = $this->factory->create('date', new \DateTime());
+        $this->factory->create('date', new \DateTime());
     }
 }
diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/TimeTypeTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/TimeTypeTest.php
index 89e250790a..7d92f0b0e5 100644
--- a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/TimeTypeTest.php
+++ b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/TimeTypeTest.php
@@ -407,6 +407,6 @@ class TimeTypeTest extends LocalizedTestCase
     {
         // Throws an exception if "data_class" option is not explicitely set
         // to null in the type
-        $form = $this->factory->create('time', new \DateTime());
+        $this->factory->create('time', new \DateTime());
     }
 }