symfony
diff --git a/‎src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
+5-7Lines changed: 5 additions & 7 deletions b/‎src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
+5-7Lines changed: 5 additions & 7 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php
+2-25Lines changed: 2 additions & 25 deletions b/‎src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php
+2-25Lines changed: 2 additions & 25 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php
+1-1Lines changed: 1 addition & 1 deletion
@@ -36,13 +36,11 @@ public function onSubmit(FormEvent $event)
     {
         $data = $event->getData();
 
-        if ($this->defaultProtocol && $data && \is_string($data) && !preg_match('~^[\w+.-]+://~', $data)) {
-            // Detect email & non-url
-            if (preg_match('~^([^:/?@]++@|[^./]+$)~', $data)) {
-                trigger_deprecation('symfony/form', '5.4', 'Form type "url", does not add a default protocol to urls that looks like emails or does not contain a dot or slash.');
-
-                return;
-            }
+        if ($this->defaultProtocol && $data && \is_string($data)
+            && !preg_match('~^[\w+.-]+://~', $data)
+            // skip email & non-url values
+            && !preg_match('~^([^:/?@]++@|[^./]+$)~', $data)
+        ) {
             $event->setData($this->defaultProtocol.'://'.$data);
         }
     }
 
@@ -44,6 +44,8 @@ public function provideUrlsWithSupportedProtocols()
             ['h323://foo'],
             ['iris.beep://foo'],
             ['foo+bar://foo'],
+            ['fabien@symfony.com'],
+            ['foo'],
         ];
     }
 
@@ -60,29 +62,4 @@ public function testSkipOtherProtocol($url)
 
         $this->assertEquals($url, $event->getData());
     }
-
-    /**
-     * @group legacy
-     * @dataProvider provideNonUrls
-     */
-    public function testDeprecatedFixEmail($url)
-    {
-        $this->expectDeprecation('Since symfony/form 5.4: Form type "url", does not add a default protocol to urls that looks like emails or does not contain a dot or slash.');
-
-        $form = new Form(new FormConfigBuilder('name', null, new EventDispatcher()));
-        $event = new FormEvent($form, $url);
-
-        $filter = new FixUrlProtocolListener('http');
-        $filter->onSubmit($event);
-
-        $this->assertEquals($url, $event->getData());
-    }
-
-    public function provideNonUrls()
-    {
-        return [
-            ['fabien@symfony.com'],
-            ['foo'],
-        ];
-    }
 }
@@ -93,7 +93,7 @@ public function testThrowExceptionIfDefaultProtocolIsInvalid()
         ]);
     }
 
-    public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expectedData = 'http://empty')
+    public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty.com', $expectedData = 'http://empty.com')
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, array_merge($this->getTestOptions(), [
             'empty_data' => $emptyData,
Original file line number	Diff line number	Diff line change
`@@ -36,13 +36,11 @@ public function onSubmit(FormEvent $event)`
`36`	`36`	`{`
`37`	`37`	`$data = $event->getData();`
`38`	`38`
`39`		`- if ($this->defaultProtocol && $data && \is_string($data) && !preg_match('~^[\w+.-]+://~', $data)) {`
`40`		`- // Detect email & non-url`
`41`		`- if (preg_match('~^([^:/?@]++@\|[^./]+$)~', $data)) {`
`42`		`- trigger_deprecation('symfony/form', '5.4', 'Form type "url", does not add a default protocol to urls that looks like emails or does not contain a dot or slash.');`
`43`		`-`
`44`		`- return;`
`45`		`- }`
	`39`	`+ if ($this->defaultProtocol && $data && \is_string($data)`
	`40`	`+ && !preg_match('~^[\w+.-]+://~', $data)`
	`41`	`+ // skip email & non-url values`
	`42`	`+ && !preg_match('~^([^:/?@]++@\|[^./]+$)~', $data)`
	`43`	`+ ) {`
`46`	`44`	`$event->setData($this->defaultProtocol.'://'.$data);`
`47`	`45`	`}`
`48`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function testThrowExceptionIfDefaultProtocolIsInvalid()`
`93`	`93`	`]);`
`94`	`94`	`}`
`95`	`95`
`96`		`- public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expectedData = 'http://empty')`
	`96`	`+ public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty.com', $expectedData = 'http://empty.com')`
`97`	`97`	`{`
`98`	`98`	`$form = $this->factory->create(static::TESTED_TYPE, null, array_merge($this->getTestOptions(), [`
`99`	`99`	`'empty_data' => $emptyData,`