Added the new getBlockPrefix() method

wouterj · wouterj · commit ca9622aa26a9 · 2015-10-21T16:07:32.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
@@ -56,14 +56,6 @@ public function getLoader(ObjectManager $manager, $queryBuilder, $class)
         return new ORMQueryBuilderLoader($queryBuilder);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return $this->getBlockPrefix();
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Form/AbstractType.php b/src/Symfony/Component/Form/AbstractType.php
@@ -48,12 +48,7 @@ public function configureOptions(OptionsResolver $resolver)
     }
 
     /**
-     * Returns the prefix of the template block name for this type.
-     *
-     * The block prefixes default to the underscored short class name with
-     * the "Type" suffix removed (e.g. "UserProfileType" => "user_profile").
-     *
-     * @return string The prefix of the template block name
+     * {@inheritdoc}
      */
     public function getBlockPrefix()
     {
diff --git a/src/Symfony/Component/Form/FormTypeInterface.php b/src/Symfony/Component/Form/FormTypeInterface.php
@@ -81,4 +81,14 @@ public function configureOptions(OptionsResolver $resolver);
      * @return string|null The name of the parent type if any, null otherwise
      */
     public function getParent();
+
+    /**
+     * Returns the prefix of the template block name for this type.
+     *
+     * The block prefix defaults to the underscored short class name with
+     * the "Type" suffix removed (e.g. "UserProfileType" => "user_profile").
+     *
+     * @return string The prefix of the template block name
+     */
+    public function 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()
     {

Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,7 @@ public function configureOptions(OptionsResolver $resolver)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/**`
`51`		`- * Returns the prefix of the template block name for this type.`
`52`		`- *`
`53`		`- * The block prefixes default to the underscored short class name with`
`54`		`- * the "Type" suffix removed (e.g. "UserProfileType" => "user_profile").`
`55`		`- *`
`56`		`- * @return string The prefix of the template block name`
	`51`	`+ * {@inheritdoc}`
`57`	`52`	`*/`
`58`	`53`	`public function getBlockPrefix()`
`59`	`54`	`{`
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`	`{`