Fix supports formtype parser #81

Merged
merged 5 commits into from Oct 11, 2012
@@ -11,6 +11,8 @@
namespace Nelmio\ApiDocBundle\Parser;
+use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
+use Symfony\Component\Form\FormRegistry;
use Symfony\Component\Form\FormFactoryInterface;
use Symfony\Component\Form\Exception\FormException;
@@ -36,9 +38,10 @@ class FormTypeParser implements ParserInterface
'country' => 'string',
);
- public function __construct(FormFactoryInterface $formFactory)
+ public function __construct(FormFactoryInterface $formFactory, FormRegistry $formRegistry)
{
- $this->formFactory = $formFactory;
+ $this->formFactory = $formFactory;
+ $this->formRegistry = $formRegistry;
}
/**
@@ -47,25 +50,25 @@ public function __construct(FormFactoryInterface $formFactory)
public function supports($item)
{
try {
- if (is_string($item) && class_exists($item)) {
- $item = new $item();
+ if ($this->createForm($item)) {
+ return true;
}
-
- $form = $this->formFactory->create($item);
} catch (FormException $e) {
return false;
+ } catch (MissingOptionsException $e) {
+ return false;
}
- return true;
+ return false;
}
/**
* {@inheritdoc}
*/
public function parse($type)
{
- if (is_string($type) && class_exists($type)) {
- $type = new $type();
+ if ($this->implementsType($type)) {
+ $type = $this->getTypeInstance($type);
}
$form = $this->formFactory->create($type);
@@ -111,4 +114,31 @@ private function parseForm($form, $prefix = null)
return $parameters;
}
+
+ private function implementsType($item)
+ {
+ if (!class_exists($item)) {
+ return false;
+ }
+ $refl = new \ReflectionClass($item);
+
+ return $refl->implementsInterface('Symfony\Component\Form\FormTypeInterface');
+ }
+
+ private function getTypeInstance($type)
+ {
+ return unserialize(sprintf('O:%d:"%s":0:{}', strlen($type), $type));
+ }
+
+ private function createForm($item)
+ {
+ if ($this->implementsType($item)) {
+ $type = $this->getTypeInstance($item);
+
+ return $this->formFactory->create($type);
+ }
+ if ($this->formRegistry->hasType($item)) {
+ return $this->formFactory->create($item);
+ }
+ }
}
@@ -15,6 +15,7 @@
<services>
<service id="nelmio_api_doc.parser.form_type_parser" class="%nelmio_api_doc.parser.form_type_parser.class%">
<argument type="service" id="form.factory" />
+ <argument type="service" id="form.registry" />
<tag name="nelmio_api_doc.extractor.parser" />
</service>
<service id="nelmio_api_doc.formatter.abstract_formatter" class="%nelmio_api_doc.formatter.abstract_formatter.class%" />