[Form] Fixed issues mentioned in the PR comments

webmozart · webmozart · commit 22c8f8087cd7 · 2012-02-09T17:13:33.000+01:00
diff --git 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
@@ -107,7 +107,7 @@ public function reverseTransform($values)
         }
 
         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
@@ -264,6 +264,6 @@ public function testInitializeWithDateTime()
     {
         // 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
@@ -536,6 +536,6 @@ public function testInitializeWithDateTime()
     {
         // 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
@@ -407,6 +407,6 @@ public function testInitializeWithDateTime()
     {
         // 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());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -237,14 +237,14 @@ UPGRADE FROM 2.0 to 2.1`
`237`	`237`
`238`	`238`	`Before:`
`239`	`239`
`240`		`- public function getParent()`
	`240`	`+ public function getParent(array $options)`
`241`	`241`	`{`
`242`	`242`	return 'single_text' === $options['widget'] ? 'text' : 'choice';
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`After:`
`246`	`246`
`247`		`- public function getParent()`
	`247`	`+ public function getParent(array $options)`
`248`	`248`	`{`
`249`	`249`	`return isset($options['widget']) && 'single_text' === $options['widget'] ? 'text' : 'choice';`
`250`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public function reverseTransform($values)`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`if (count($unknown) > 0) {`
`110`		`- throw new TransformationFailedException('The choices "' . implode('", "', $unknown) . '" where not found');`
	`110`	`+ throw new TransformationFailedException('The choices "' . implode('", "', $unknown) . '" were not found');`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`return $result;`
Original file line number	Diff line number	Diff line change
`@@ -264,6 +264,6 @@ public function testInitializeWithDateTime()`
`264`	`264`	`{`
`265`	`265`	`// Throws an exception if "data_class" option is not explicitely set`
`266`	`266`	`// to null in the type`
`267`		`- $form = $this->factory->create('datetime', new \DateTime());`
	`267`	`+ $this->factory->create('datetime', new \DateTime());`
`268`	`268`	`}`
`269`	`269`	`}`
Original file line number	Diff line number	Diff line change
`@@ -536,6 +536,6 @@ public function testInitializeWithDateTime()`
`536`	`536`	`{`
`537`	`537`	`// Throws an exception if "data_class" option is not explicitely set`
`538`	`538`	`// to null in the type`
`539`		`- $form = $this->factory->create('date', new \DateTime());`
	`539`	`+ $this->factory->create('date', new \DateTime());`
`540`	`540`	`}`
`541`	`541`	`}`
Original file line number	Diff line number	Diff line change
`@@ -407,6 +407,6 @@ public function testInitializeWithDateTime()`
`407`	`407`	`{`
`408`	`408`	`// Throws an exception if "data_class" option is not explicitely set`
`409`	`409`	`// to null in the type`
`410`		`- $form = $this->factory->create('time', new \DateTime());`
	`410`	`+ $this->factory->create('time', new \DateTime());`
`411`	`411`	`}`
`412`	`412`	`}`