浏览代码

Merge remote branch 'weaverryan/form_container_aware_type_loader_check' into form

* weaverryan/form_container_aware_type_loader_check:
  [FrameworkBundle] Adding check for invalid form type for better exception message
Fabien Potencier 14 年之前
父节点
当前提交
4f4979c84a
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      src/Symfony/Bundle/FrameworkBundle/Form/ContainerAwareTypeLoader.php

+ 3 - 1
src/Symfony/Bundle/FrameworkBundle/Form/ContainerAwareTypeLoader.php

@@ -28,7 +28,9 @@ class ContainerAwareTypeLoader implements TypeLoaderInterface
 
     public function getType($identifier)
     {
-        // TODO check whether identifier exists
+        if (!isset($this->serviceIds[$identifier])) {
+            throw new \InvalidArgumentException(sprintf('The field type "%s" is not registered with the service container.', $identifier));
+        }
 
         return $this->container->get($this->serviceIds[$identifier]);
     }