[Form] Tightened PropertyPath validation to reject any empty value (such as false)

webmozart · webmozart · commit 2301b1559e3a · 2012-05-22T09:29:53.000+02:00
diff --git a/src/Symfony/Component/Form/Tests/Util/PropertyPathTest.php b/src/Symfony/Component/Form/Tests/Util/PropertyPathTest.php
@@ -449,13 +449,21 @@ public function testInvalidPropertyPath_empty()
     }
 
     /**
-     * @expectedException Symfony\Component\Form\Exception\InvalidPropertyPathException
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
      */
     public function testInvalidPropertyPath_null()
     {
         new PropertyPath(null);
     }
 
+    /**
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
+     */
+    public function testInvalidPropertyPath_false()
+    {
+        new PropertyPath(false);
+    }
+
     public function testGetParent_dot()
     {
         $propertyPath = new PropertyPath('grandpa.parent.child');
diff --git a/src/Symfony/Component/Form/Util/PropertyPath.php b/src/Symfony/Component/Form/Util/PropertyPath.php
@@ -77,8 +77,12 @@ class PropertyPath implements \IteratorAggregate
      */
     public function __construct($propertyPath)
     {
-        if ('' === $propertyPath || null === $propertyPath) {
-            throw new InvalidPropertyPathException('The property path must not be empty');
+        if (!is_string($propertyPath)) {
+            throw new UnexpectedTypeException($propertyPath, 'string');
+        }
+
+        if (empty($propertyPath)) {
+            throw new InvalidPropertyPathException('The property path should not be empty.');
         }
 
         $this->string = (string) $propertyPath;

Original file line number	Diff line number	Diff line change
`@@ -449,13 +449,21 @@ public function testInvalidPropertyPath_empty()`
`449`	`449`	`}`
`450`	`450`
`451`	`451`	`/**`
`452`		`- * @expectedException Symfony\Component\Form\Exception\InvalidPropertyPathException`
	`452`	`+ * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException`
`453`	`453`	`*/`
`454`	`454`	`public function testInvalidPropertyPath_null()`
`455`	`455`	`{`
`456`	`456`	`new PropertyPath(null);`
`457`	`457`	`}`
`458`	`458`
	`459`	`+ /**`
	`460`	`+ * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException`
	`461`	`+ */`
	`462`	`+ public function testInvalidPropertyPath_false()`
	`463`	`+ {`
	`464`	`+ new PropertyPath(false);`
	`465`	`+ }`
	`466`	`+`
`459`	`467`	`public function testGetParent_dot()`
`460`	`468`	`{`
`461`	`469`	`$propertyPath = new PropertyPath('grandpa.parent.child');`
Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,12 @@ class PropertyPath implements \IteratorAggregate`
`77`	`77`	`*/`
`78`	`78`	`public function __construct($propertyPath)`
`79`	`79`	`{`
`80`		`- if ('' === $propertyPath \|\| null === $propertyPath) {`
`81`		`- throw new InvalidPropertyPathException('The property path must not be empty');`
	`80`	`+ if (!is_string($propertyPath)) {`
	`81`	`+ throw new UnexpectedTypeException($propertyPath, 'string');`
	`82`	`+ }`
	`83`	`+`
	`84`	`+ if (empty($propertyPath)) {`
	`85`	`+ throw new InvalidPropertyPathException('The property path should not be empty.');`
`82`	`86`	`}`
`83`	`87`
`84`	`88`	`$this->string = (string) $propertyPath;`