[Form] Fix UrlType transforms valid protocols

ogizanagi · ogizanagi · commit 28f816aecb5c · 2016-10-28T15:52:16.000+02:00
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
@@ -38,7 +38,7 @@ public function onSubmit(FormEvent $event)
     {
         $data = $event->getData();
 
-        if ($this->defaultProtocol && $data && !preg_match('~^\w+://~', $data)) {
+        if ($this->defaultProtocol && $data && strpos($data, '://') < 1) {
             $event->setData($this->defaultProtocol.'://'.$data);
         }
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php
@@ -40,15 +40,28 @@ public function testSkipKnownUrl()
         $this->assertEquals('http://www.symfony.com', $event->getData());
     }
 
-    public function testSkipOtherProtocol()
+    public function provideUrlsWithSupportedProtocols()
+    {
+        return array(
+            array('ftp://www.symfony.com'),
+            array('chrome-extension://foo'),
+            array('h323://foo'),
+            array('iris.beep://foo'),
+            array('foo+bar://foo'),
+        );
+    }
+
+    /**
+     * @dataProvider provideUrlsWithSupportedProtocols
+     */
+    public function testSkipOtherProtocol($url)
     {
-        $data = 'ftp://www.symfony.com';
         $form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
-        $event = new FormEvent($form, $data);
+        $event = new FormEvent($form, $url);
 
         $filter = new FixUrlProtocolListener('http');
         $filter->onSubmit($event);
 
-        $this->assertEquals('ftp://www.symfony.com', $event->getData());
+        $this->assertEquals($url, $event->getData());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function onSubmit(FormEvent $event)`
`38`	`38`	`{`
`39`	`39`	`$data = $event->getData();`
`40`	`40`
`41`		`- if ($this->defaultProtocol && $data && !preg_match('~^\w+://~', $data)) {`
	`41`	`+ if ($this->defaultProtocol && $data && strpos($data, '://') < 1) {`
`42`	`42`	`$event->setData($this->defaultProtocol.'://'.$data);`
`43`	`43`	`}`
`44`	`44`	`}`