Let Str::isUrl() check more URLs (#2759)

statamic · Oct 28, 2020 · 0432503 · 0432503
1 parent 9c11220
commit 0432503
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/Modifiers/CoreModifiers.php b/src/Modifiers/CoreModifiers.php
@@ -1032,7 +1032,7 @@ public function isUppercase($value)
      */
     public function isUrl($value)
     {
-        return filter_var($value, FILTER_VALIDATE_URL) !== false;
+        return Str::isUrl($value);
     }
 
     /**

diff --git a/src/Support/Str.php b/src/Support/Str.php
@@ -115,7 +115,7 @@ public static function slugToTitle($string)
 
     public static function isUrl($string)
     {
-        return self::startsWith($string, ['http://', 'https://', '/']);
+        return self::startsWith($string, '/') || filter_var($string, FILTER_VALIDATE_URL) !== false;
     }
 
     public static function deslugify($string)

diff --git a/tests/Support/StrTest.php b/tests/Support/StrTest.php
@@ -74,6 +74,8 @@ public function it_checks_for_a_url()
     {
         $this->assertTrue(Str::isUrl('http://example.com'));
         $this->assertTrue(Str::isUrl('https://example.com'));
+        $this->assertTrue(Str::isUrl('ftp://example.com'));
+        $this->assertTrue(Str::isUrl('mailto:[email protected]'));
         $this->assertTrue(Str::isUrl('/relative'));
         $this->assertFalse(Str::isUrl('test'));
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -1032,7 +1032,7 @@ public function isUppercase($value) @@
          */
         public function isUrl($value)
         {
-            return filter_var($value, FILTER_VALIDATE_URL) !== false;
+            return Str::isUrl($value);
         }
         /**
@@ Expand Down @@