Merge pull request #18 from thomasthiry/master

Added support for parentheses and accents in url locations
liip · May 13, 2014 · cf7eea1 · cf7eea1
2 parents e08ef6f + fd20366
commit cf7eea1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Extension/UrlAutoConverterTwigExtension.php b/Extension/UrlAutoConverterTwigExtension.php
@@ -57,7 +57,7 @@ public function getFilters()
      */
     public function autoConvertUrls($string)
     {
-        $pattern = '/(href=")?([-a-zA-Z0-9@:%_\+.~#?&\/\/=]{2,256}\.[a-z]{2,4}\b(\/[-\p{L}0-9@:%_\+.~#?&\/\/=\(\)]*)?)/u';
+        $pattern = '/(href=")?([-a-zA-Z0-9@:%_\+.~#?&\/\/=]{2,256}\.[a-z]{2,4}\b(\/?[-\p{L}0-9@:%_\+.~#?&\/\/=\(\)]*)?)/u';
         $stringFiltered = preg_replace_callback($pattern, array($this, 'callbackReplace'), $string);
 
         return $stringFiltered;

diff --git a/Tests/Extension/UrlAutoConverterTwigExtensionTest.php b/Tests/Extension/UrlAutoConverterTwigExtensionTest.php
@@ -126,6 +126,10 @@ public function provider()
                 'Lorem ipsum dolor sit amet, <a href="http://www.test.com/my_page(with_parentheses).htm" class="" target="">http://www.test.com/my_page(with_parentheses).htm</a> consectetuer.',
                 'Lorem ipsum dolor sit amet, http://www.test.com/my_page(with_parentheses).htm consectetuer.'
             ),
+            array(
+                'Lorem ipsum dolor sit amet, <a href="http://test.com?param=1" class="" target="">http://test.com?param=1</a> consectetuer.',
+                'Lorem ipsum dolor sit amet, http://test.com?param=1 consectetuer.'
+            ),
         );
     }