merged branch Tobion/formincon (PR symfony#5355)

fabpot · fabpot · commit e49fd8fd0aea · 2012-08-29T13:46:44.000+02:00
Commits ------- 7e8ab54 [Form] raise OutOfBoundsException instead of InvalidArgumentException for inexistent form childs to be in line with PropertyPath Discussion ---------- [Form] raise OutOfBoundsException instead of InvalidArgumentException in Form::get BC break: yes Raise OutOfBoundsException instead of InvalidArgumentException in Form::get for inexistent form childs to be in line with PropertyPath, which also uses OutOfBoundsException for invalid indexes. OutOfBoundsException fits much better as it extends RuntimeException instead of LogicException and this error can typically not be detected at compile time. --------------------------------------------------------------------------- by bschussek at 2012-08-29T11:01:01Z :+1: --------------------------------------------------------------------------- by stloyd at 2012-08-29T11:07:51Z Shouldn't this change be noted in upgrade file ? --------------------------------------------------------------------------- by stof at 2012-08-29T11:23:04Z it should (and in the changelog of the component)
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
@@ -903,7 +903,7 @@ public function get($name)
             return $this->children[$name];
         }
 
-        throw new \InvalidArgumentException(sprintf('Child "%s" does not exist.', $name));
+        throw new \OutOfBoundsException(sprintf('Child "%s" does not exist.', $name));
     }
 
     /**
@@ -925,7 +925,7 @@ public function offsetExists($name)
      *
      * @return FormInterface The child form
      *
-     * @throws \InvalidArgumentException If the named child does not exist.
+     * @throws \OutOfBoundsException If the named child does not exist.
      */
     public function offsetGet($name)
     {
diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php
@@ -57,7 +57,7 @@ public function add(FormInterface $child);
      *
      * @return FormInterface The child form
      *
-     * @throws \InvalidArgumentException If the named child does not exist.
+     * @throws \OutOfBoundsException If the named child does not exist.
      */
     public function get($name);
 

Original file line number	Diff line number	Diff line change
`@@ -903,7 +903,7 @@ public function get($name)`
`903`	`903`	`return $this->children[$name];`
`904`	`904`	`}`
`905`	`905`
`906`		`- throw new \InvalidArgumentException(sprintf('Child "%s" does not exist.', $name));`
	`906`	`+ throw new \OutOfBoundsException(sprintf('Child "%s" does not exist.', $name));`
`907`	`907`	`}`
`908`	`908`
`909`	`909`	`/**`
`@@ -925,7 +925,7 @@ public function offsetExists($name)`
`925`	`925`	`*`
`926`	`926`	`* @return FormInterface The child form`
`927`	`927`	`*`
`928`		`- * @throws \InvalidArgumentException If the named child does not exist.`
	`928`	`+ * @throws \OutOfBoundsException If the named child does not exist.`
`929`	`929`	`*/`
`930`	`930`	`public function offsetGet($name)`
`931`	`931`	`{`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function add(FormInterface $child);`
`57`	`57`	`*`
`58`	`58`	`* @return FormInterface The child form`
`59`	`59`	`*`
`60`		`- * @throws \InvalidArgumentException If the named child does not exist.`
	`60`	`+ * @throws \OutOfBoundsException If the named child does not exist.`
`61`	`61`	`*/`
`62`	`62`	`public function get($name);`
`63`	`63`