Fix compatibility with Symfony 5

junowilderness · Aug 11, 2020 · 8266e5a · 8266e5a
1 parent c988bac
commit 8266e5a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 38 deletions.
diff --git a/Form/Extension/Spam/EventListener/HoneypotValidationListener.php b/Form/Extension/Spam/EventListener/HoneypotValidationListener.php
@@ -6,7 +6,7 @@
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class HoneypotValidationListener implements EventSubscriberInterface
 {

diff --git a/Form/Extension/Spam/EventListener/TimedSpamValidationListener.php b/Form/Extension/Spam/EventListener/TimedSpamValidationListener.php
@@ -7,7 +7,7 @@
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class TimedSpamValidationListener implements EventSubscriberInterface
 {

diff --git a/Form/Extension/Spam/Type/FormTypeHoneypotExtension.php b/Form/Extension/Spam/Type/FormTypeHoneypotExtension.php
@@ -10,8 +10,7 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class FormTypeHoneypotExtension extends AbstractTypeExtension
 {
@@ -74,11 +73,6 @@ public function finishView(FormView $view, FormInterface $form, array $options)
         }
     }
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
-    {
-        $this->configureOptions($resolver);
-    }
-
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
@@ -95,16 +89,6 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public static function getExtendedTypes(): iterable
     {
-        return [
-            FormType::class,
-        ];
-    }
-
-    public function getExtendedType()
-    {
-        return method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
-            ? FormType::class
-            : 'form' // SF <2.8 BC
-        ;
+        return [FormType::class];
     }
 }
diff --git a/Form/Extension/Spam/Type/FormTypeTimedSpamExtension.php b/Form/Extension/Spam/Type/FormTypeTimedSpamExtension.php
@@ -10,8 +10,7 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class FormTypeTimedSpamExtension extends AbstractTypeExtension
 {
@@ -59,11 +58,6 @@ public function finishView(FormView $view, FormInterface $form, array $options)
         }
     }
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
-    {
-        $this->configureOptions($resolver);
-    }
-
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
@@ -79,16 +73,6 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public static function getExtendedTypes(): iterable
     {
-        return [
-            FormType::class,
-        ];
-    }
-
-    public function getExtendedType()
-    {
-        return method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
-            ? FormType::class
-            : 'form' // SF <2.8 BC
-        ;
+        return [FormType::class];
     }
 }