Merge pull request #48 from SamuelNitsche/fix-47

Fix creating urls from invalid strings
spatie · Nov 17, 2021 · 0a841a9 · 0a841a9
2 parents 2645083 + 03c35bd
commit 0a841a9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/Exceptions/InvalidArgument.php b/src/Exceptions/InvalidArgument.php
@@ -11,6 +11,11 @@ public static function invalidScheme(string $url): static
         return new static("The scheme `{$url}` isn't valid. It should be either `http` or `https`.");
     }
 
+    public static function invalidUrl(string $url): static
+    {
+        return new static("The string `{$url}` is no valid url.");
+    }
+
     public static function segmentZeroDoesNotExist(): static
     {
         return new static("Segment 0 doesn't exist. Segments can be retrieved by using 1-based index or a negative index.");

diff --git a/src/Url.php b/src/Url.php
@@ -40,7 +40,9 @@ public static function create(): static
 
     public static function fromString(string $url): static
     {
-        $parts = array_merge(parse_url($url));
+        if (! $parts = parse_url($url)) {
+            throw InvalidArgument::invalidUrl($url);
+        }
 
         $url = new static();
         $url->scheme = isset($parts['scheme']) ? $url->sanitizeScheme($parts['scheme']) : '';

diff --git a/tests/UrlParseTest.php b/tests/UrlParseTest.php
@@ -49,6 +49,14 @@ public function it_throws_an_exception_if_an_invalid_scheme_is_provided()
         Url::fromString('htps://spatie.be');
     }
 
+    /** @test */
+    public function it_throws_an_exception_if_a_totally_invalid_url_is_provided()
+    {
+        $this->expectException(InvalidArgument::class);
+
+        Url::fromString('///remote/fgt_lang?lang=/../../../..//////////dev/');
+    }
+
     /** @test */
     public function it_can_parse_a_host()
     {