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
+1-1Lines changed: 1 addition & 1 deletion 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
+1-1Lines changed: 1 addition & 1 deletion
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
+12-12Lines changed: 12 additions & 12 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
+12-12Lines changed: 12 additions & 12 deletions
@@ -36,7 +36,7 @@ public function onSubmit(FormEvent $event)
     {
         $data = $event->getData();
 
-        if ($this->defaultProtocol && $data && \is_string($data) && !preg_match('~^[\w+.-]+://~', $data)) {
+        if ($this->defaultProtocol && $data && \is_string($data) && !preg_match('~^([\w+.-]+://|[^:/?@]++@)~', $data)) {
             $event->setData($this->defaultProtocol.'://'.$data);
         }
     }
 
@@ -20,38 +20,38 @@
 
 class FixUrlProtocolListenerTest extends TestCase
 {
-    public function testFixHttpUrl()
+    public function provideUrlToFix()
     {
-        $data = 'www.symfony.com';
-        $form = new Form(new FormConfigBuilder('name', null, new EventDispatcher()));
-        $event = new FormEvent($form, $data);
-
-        $filter = new FixUrlProtocolListener('http');
-        $filter->onSubmit($event);
-
-        $this->assertEquals('http://www.symfony.com', $event->getData());
+        return [
+            ['www.symfony.com'],
+            ['twitter.com/@symfony'],
+        ];
     }
 
-    public function testSkipKnownUrl()
+    /**
+     * @dataProvider provideUrlToFix
+     */
+    public function testFixHttpUrl($data)
     {
-        $data = 'http://www.symfony.com';
         $form = new Form(new FormConfigBuilder('name', null, new EventDispatcher()));
         $event = new FormEvent($form, $data);
 
         $filter = new FixUrlProtocolListener('http');
         $filter->onSubmit($event);
 
-        $this->assertEquals('http://www.symfony.com', $event->getData());
+        $this->assertEquals('http://'.$data, $event->getData());
     }
 
     public function provideUrlsWithSupportedProtocols()
     {
         return [
+            ['http://www.symfony.com'],
             ['ftp://www.symfony.com'],
             ['chrome-extension://foo'],
             ['h323://foo'],
             ['iris.beep://foo'],
             ['foo+bar://foo'],
+            ['fabien@symfony.com'],
         ];
     }
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ 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)) {`
	`39`	`+ if ($this->defaultProtocol && $data && \is_string($data) && !preg_match('~^([\w+.-]+://\|[^:/?@]++@)~', $data)) {`
`40`	`40`	`$event->setData($this->defaultProtocol.'://'.$data);`
`41`	`41`	`}`
`42`	`42`	`}`