[Form] added a form type name validator

fabpot · fabpot · commit 7eec2ca7b3c7 · 2011-07-07T09:16:13.000+02:00
diff --git a/src/Symfony/Component/Form/FormFactory.php b/src/Symfony/Component/Form/FormFactory.php
@@ -91,6 +91,8 @@ public function addType(FormTypeInterface $type)
     {
         $this->loadTypeExtensions($type);
 
+        $this->validateFormTypeName($type);
+
         $this->types[$type->getName()] = $type;
     }
 
@@ -377,6 +379,8 @@ private function loadType($name)
 
         $this->loadTypeExtensions($type);
 
+        $this->validateFormTypeName($type);
+
         $this->types[$name] = $type;
     }
 
@@ -398,4 +402,11 @@ private function loadTypeExtensions(FormTypeInterface $type)
 
         $type->setExtensions($typeExtensions);
     }
+
+    private function validateFormTypeName(FormTypeInterface $type)
+    {
+        if (!preg_match('/^[a-z0-9_]+$/i', $type->getName())) {
+            throw new FormException(sprintf('The "%s" form type name ("%s") is not valid. Names must only contain letters, numbers, and "_".', get_class($type), $type->getName()));
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,8 @@ public function addType(FormTypeInterface $type)`
`91`	`91`	`{`
`92`	`92`	`$this->loadTypeExtensions($type);`
`93`	`93`
	`94`	`+ $this->validateFormTypeName($type);`
	`95`	`+`
`94`	`96`	`$this->types[$type->getName()] = $type;`
`95`	`97`	`}`
`96`	`98`
`@@ -377,6 +379,8 @@ private function loadType($name)`
`377`	`379`
`378`	`380`	`$this->loadTypeExtensions($type);`
`379`	`381`
	`382`	`+ $this->validateFormTypeName($type);`
	`383`	`+`
`380`	`384`	`$this->types[$name] = $type;`
`381`	`385`	`}`
`382`	`386`
`@@ -398,4 +402,11 @@ private function loadTypeExtensions(FormTypeInterface $type)`
`398`	`402`
`399`	`403`	`$type->setExtensions($typeExtensions);`
`400`	`404`	`}`
	`405`	`+`
	`406`	`+ private function validateFormTypeName(FormTypeInterface $type)`
	`407`	`+ {`
	`408`	`+ if (!preg_match('/^[a-z0-9_]+$/i', $type->getName())) {`
	`409`	`+ throw new FormException(sprintf('The "%s" form type name ("%s") is not valid. Names must only contain letters, numbers, and "_".', get_class($type), $type->getName()));`
	`410`	`+ }`
	`411`	`+ }`
`401`	`412`	`}`