Adjust interfaces to check on

stefandoorn · Feb 1, 2021 · d16a3f0 · d16a3f0
1 parent c93f2a2
commit d16a3f0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/src/Form/EventSubscriber/RemoveDuplicateAdditionEventSubscriber.php b/src/Form/EventSubscriber/RemoveDuplicateAdditionEventSubscriber.php
@@ -4,7 +4,8 @@
 
 namespace StefanDoorn\SyliusStreetNumberPlugin\Form\EventSubscriber;
 
-use StefanDoorn\SyliusStreetNumberPlugin\Entity\Interfaces\AddressInterface;
+use StefanDoorn\SyliusStreetNumberPlugin\Entity\Interfaces\StreetNumberAwareInterface;
+use Sylius\Component\Core\Model\AddressInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
@@ -20,10 +21,10 @@ public static function getSubscribedEvents(): array
 
     public function onPostSubmit(FormEvent $event): void
     {
-        /** @var AddressInterface $data */
+        /** @var StreetNumberAwareInterface|AddressInterface $data */
         $data = $event->getData();
 
-        if (!$data instanceof AddressInterface) {
+        if (!$data instanceof StreetNumberAwareInterface) {
             return;
         }
 

diff --git a/src/Form/EventSubscriber/SetStreetWithoutNumberAndAdditionEventSubscriber.php b/src/Form/EventSubscriber/SetStreetWithoutNumberAndAdditionEventSubscriber.php
@@ -4,7 +4,8 @@
 
 namespace StefanDoorn\SyliusStreetNumberPlugin\Form\EventSubscriber;
 
-use StefanDoorn\SyliusStreetNumberPlugin\Entity\Interfaces\AddressInterface;
+use StefanDoorn\SyliusStreetNumberPlugin\Entity\Interfaces\StreetNumberAwareInterface;
+use Sylius\Component\Core\Model\AddressInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
@@ -20,7 +21,7 @@ public static function getSubscribedEvents(): array
 
     public function onPreSetData(FormEvent $event): void
     {
-        /** @var AddressInterface $data */
+        /** @var StreetNumberAwareInterface|AddressInterface $data */
         $data = $event->getData();
 
         if (!$data instanceof AddressInterface) {

diff --git a/src/Form/Extension/AddressTypeStreetNumberAdditionExtension.php b/src/Form/Extension/AddressTypeStreetNumberAdditionExtension.php
@@ -42,8 +42,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->addEventSubscriber($this->removeDuplicateAdditionEventSubscriber);
     }
 
-    public function getExtendedType()
+    public static function getExtendedTypes(): array
     {
-        return AddressType::class;
+        return [AddressType::class];
     }
 }
diff --git a/src/Form/Extension/AddressTypeStreetNumberExtension.php b/src/Form/Extension/AddressTypeStreetNumberExtension.php
@@ -51,8 +51,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->addEventSubscriber($this->appendNumberDataToStreetFieldEventSubscriber);
     }
 
-    public function getExtendedType()
+    public static function getExtendedTypes(): array
     {
-        return AddressType::class;
+        return [AddressType::class];
     }
 }