Attached EventListener to link field

Author: reithor

src/lib/Form/EventSubscriber/FixUrlProtocolListener.php

@@ -34,22 +34,18 @@ public function __construct(?string $defaultProtocol = 'http')
     public function onSubmit(FormEvent $event): void
     {
         $data = $event->getData();
-        $dataLink = $data['link'] ?? null;
-        if (null === $this->defaultProtocol || empty($data) || empty($dataLink) || !\is_string($dataLink)) {
+        if (null === $this->defaultProtocol || empty($data) || !\is_string($data)) {
             return;
         }
 
-        $protocol = explode(':', $dataLink)[0];
+        $protocol = explode(':', $data)[0];
         if ($this->hasAuthority($protocol) && $this->hasAuthority($this->defaultProtocol)) {
-            $event->setData($dataLink);
             $this->fixUrlProtocolListener->onSubmit($event);
-            $data['link'] = $event->getData();
-            $event->setData($data);
 
             return;
         }
 
-        if (!$this->hasAuthority($protocol) && preg_match('~^(?:[/.]|[\w+.-]+:|[^:/?@#]++@)~', $dataLink)) {
+        if (!$this->hasAuthority($protocol) && preg_match('~^(?:[/.]|[\w+.-]+:|[^:/?@#]++@)~', $data)) {
             return;
         }
 
@@ -61,9 +57,8 @@ public function onSubmit(FormEvent $event): void
             $regExp = '~^[\w+.-]+:~'; // allowing emails for non-http/https/file
         }
 
-        if (!preg_match($regExp, $dataLink)) {
-            $data['link'] = $this->defaultProtocol . $schemaSeparator . $dataLink;
-            $event->setData($data);
+        if (!preg_match($regExp, $data)) {
+            $event->setData($this->defaultProtocol . $schemaSeparator . $data);
         }
     }
 

src/lib/Form/Type/FieldType/UrlFieldType.php

@@ -53,7 +53,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'default_protocol' => null,
                 ]
             )
-            ->addEventSubscriber(new FixUrlProtocolListener())
             ->add(
                 'text',
                 TextType::class,
@@ -63,6 +62,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 ]
             )
             ->addModelTransformer(new FieldValueTransformer($this->fieldTypeService->getFieldType('ezurl')));
+
+        $builder->get('link')->addEventSubscriber(new FixUrlProtocolListener());
     }
 
     public function configureOptions(OptionsResolver $resolver)

tests/lib/Form/EventSubscriber/FixUrlProtocolListenerTest.php

@@ -28,11 +28,11 @@ final class FixUrlProtocolListenerTest extends TestCase
     /**
      * @dataProvider provideUrlCases
      *
-     * @param array<string, string>|null $inputData
-     * @param array<string, string>|null $expectedData
+     * @param string|null $inputData
+     * @param string|null $expectedData
      * @param string $defaultProtocol
      */
-    public function testUrlProtocolHandling(?array $inputData, ?array $expectedData, ?string $defaultProtocol = 'http'): void
+    public function testUrlProtocolHandling(?string $inputData, ?string $expectedData, ?string $defaultProtocol = 'http'): void
     {
         $form = $this->createMock(FormInterface::class);
         $listener = new FixUrlProtocolListener($defaultProtocol);
@@ -46,58 +46,54 @@ public function testUrlProtocolHandling(?array $inputData, ?array $expectedData,
 
     /**
      * @return iterable<string, array{
-     *     0: array<string, string>|null,
-     *     1: array<string, string>|null
+     *     0: string|null,
+     *     1: string|null
      * }>
      */
     public static function provideUrlCases(): iterable
     {
         return [
             'adds http when protocol missing' => [
-                ['link' => self::DOMAIN],
-                ['link' => self::URL_HTTP],
+                self::DOMAIN,
+                self::URL_HTTP,
             ],
             'does not modify https url' => [
-                ['link' => self::URL_HTTPS],
-                ['link' => self::URL_HTTPS],
+                self::URL_HTTPS,
+                self::URL_HTTPS,
             ],
             'does not modify http url' => [
-                ['link' => self::URL_HTTP],
-                ['link' => self::URL_HTTP],
+                self::URL_HTTP,
+                self::URL_HTTP,
             ],
             'keep relative url with leading / intact' => [
-                ['link' => self::URL_RELATIVE],
-                ['link' => self::URL_RELATIVE],
+                self::URL_RELATIVE,
+                self::URL_RELATIVE,
             ],
             'keeps ftp intact' => [
-                ['link' => self::URL_SFTP],
-                ['link' => self::URL_SFTP],
+                self::URL_SFTP,
+                self::URL_SFTP,
             ],
             'keeps tel intact' => [
-                ['link' => self::URL_TEL],
-                ['link' => self::URL_TEL],
+                self::URL_TEL,
+                self::URL_TEL,
             ],
             'adds default tel' => [
-                ['link' => self::TEL],
-                ['link' => self::URL_TEL],
+                self::TEL,
+                self::URL_TEL,
                 'tel',
             ],
             'keeps mailto intact' => [
-                ['link' => self::URL_MAILTO],
-                ['link' => self::URL_MAILTO],
+                self::URL_MAILTO,
+                self::URL_MAILTO,
             ],
             'adds default mailto' => [
-                ['link' => self::MAIL],
-                ['link' => self::URL_MAILTO],
+                self::MAIL,
+                self::URL_MAILTO,
                 'mailto',
             ],
             'does nothing when link is empty string' => [
-                ['link' => ''],
-                ['link' => ''],
-            ],
-            'does nothing when link key is missing' => [
-                [],
-                [],
+                '',
+                '',
             ],
             'does nothing when data is null' => [
                 null,