[Form] Added getBlockPrefix() to ResolvedFormTypeInterface

symfony · Tobion · Nov 29, 2015 · Nov 29, 2015 · Nov 29, 2015 · 7e89345a0d6d5e13467797c0180d8963512d8b09
commit 7e89345a0d6d5e13467797c0180d8963512d8b09
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php
@@ -43,20 +43,12 @@ public function __construct(ResolvedFormTypeInterface $proxiedType, FormDataColl
         $this->dataCollector = $dataCollector;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return $this->proxiedType->getName();
-    }
-
     /**
      * {@inheritdoc}
      */
     public function getBlockPrefix()
     {
-        return method_exists($this->proxiedType, 'getBlockPrefix') ? $this->proxiedType->getBlockPrefix() : $this->getName();
+        return $this->proxiedType->getBlockPrefix();
     }
 
     /**

diff --git a/src/Symfony/Component/Form/ResolvedFormType.php b/src/Symfony/Component/Form/ResolvedFormType.php
@@ -56,9 +56,7 @@ public function __construct(FormTypeInterface $innerType, array $typeExtensions
     }
 
     /**
-     * Returns the prefix of the template block name for this type.
-     *
-     * @return string The prefix of the template block name
+     * {@inheritdoc}
      */
     public function getBlockPrefix()
     {

diff --git a/src/Symfony/Component/Form/ResolvedFormTypeInterface.php b/src/Symfony/Component/Form/ResolvedFormTypeInterface.php
@@ -20,6 +20,13 @@
  */
 interface ResolvedFormTypeInterface
 {
+    /**
+     * Returns the prefix of the template block name for this type.
+     *
+     * @return string The prefix of the template block name
+     */
+    public function getBlockPrefix();
+
     /**
      * Returns the parent type.
      *