Merge pull request #252 from schmittjoh/FORM

Fix form types support
schmittjoh · Apr 18, 2016 · 27c3fc7 · 27c3fc7
2 parents 195467e + b9e7a32
commit 27c3fc7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/Metadata/Driver/AnnotationDriver.php b/Metadata/Driver/AnnotationDriver.php
@@ -121,7 +121,7 @@ public function loadMetadataForClass(\ReflectionClass $class)
                 // try to extract it from the class itself
                 if (null === $alias) {
                     $instance = unserialize(sprintf('O:%d:"%s":0:{}', strlen($className), $className));
-                    $alias = $instance->getName();
+                    $alias = method_exists($instance, 'getBlockPrefix') ? $instance->getBlockPrefix() : $instance->getName();
                 }
 
                 $metadata->tags['form.type'][] = array(

diff --git a/Tests/Metadata/Driver/Fixture/LoginType.php b/Tests/Metadata/Driver/Fixture/LoginType.php
@@ -21,6 +21,11 @@ public function __construct(SecurityContext $context)
     }
 
     public function getName()
+    {
+        return $this->getBlockPrefix();
+    }
+
+    public function getBlockPrefix()
     {
         return 'login';
     }

diff --git a/Tests/Metadata/Driver/Fixture/SignUpType.php b/Tests/Metadata/Driver/Fixture/SignUpType.php
@@ -13,6 +13,11 @@
 class SignUpType extends AbstractType
 {
     public function getName()
+    {
+        return $this->getBlockPrefix();
+    }
+
+    public function getBlockPrefix()
     {
         return 'sign_up';
     }