minor #16749 [Form] Added getBlockPrefix() to ResolvedFormTypeInterface (webmozart)

Tobion · Tobion · commit bcfacac1e10a · 2015-11-29T23:04:13.000+01:00
This PR was merged into the 3.0-dev branch. Discussion ---------- [Form] Added getBlockPrefix() to ResolvedFormTypeInterface | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - This is the follow-up PR to #16724. If you call `$form->getConfig()->getType()`, all the methods of FormType should be usable. In that sense, ResolvedFormType is the developer-facing version of FormType. It is true that the same could be achieved with `getInnerType()`, but that method should be used in edge cases only as it clutters the code and makes it confusing to read: ```php $blockPrefix = $form->getConfig()->getType()->getInnerType()->getBlockPrefix(); ``` Commits ------- 7e89345 [Form] Added getBlockPrefix() to ResolvedFormTypeInterface
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.
      *

Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,7 @@ public function __construct(FormTypeInterface $innerType, array $typeExtensions`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/**`
`59`		`- * Returns the prefix of the template block name for this type.`
`60`		`- *`
`61`		`- * @return string The prefix of the template block name`
	`59`	`+ * {@inheritdoc}`
`62`	`60`	`*/`
`63`	`61`	`public function getBlockPrefix()`
`64`	`62`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,13 @@`
`20`	`20`	`*/`
`21`	`21`	`interface ResolvedFormTypeInterface`
`22`	`22`	`{`
	`23`	`+ /**`
	`24`	`+ * Returns the prefix of the template block name for this type.`
	`25`	`+ *`
	`26`	`+ * @return string The prefix of the template block name`
	`27`	`+ */`
	`28`	`+ public function getBlockPrefix();`
	`29`	`+`
`23`	`30`	`/**`
`24`	`31`	`* Returns the parent type.`
`25`	`32`	`*`