[Form] fix merge

nicolas-grekas · nicolas-grekas · commit ed9193ccda1f · 2018-11-15T13:52:12.000+01:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php b/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php
@@ -35,8 +35,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
     }
 
-    public function getExtendedType()
+    /**
+     * {@inheritdoc}
+     */
+    public static function getExtendedTypes(): iterable
     {
-        return 'Symfony\Component\Form\Extension\Core\Type\FormType';
+        return array(FormType::class);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`- public function getExtendedType()`
	`38`	`+ /**`
	`39`	`+ * {@inheritdoc}`
	`40`	`+ */`
	`41`	`+ public static function getExtendedTypes(): iterable`
`39`	`42`	`{`
`40`		`- return 'Symfony\Component\Form\Extension\Core\Type\FormType';`
	`43`	`+ return array(FormType::class);`
`41`	`44`	`}`
`42`	`45`	`}`