Merge pull request #22 from jeremykendall/fix/issue-20

Updates parser to allow for more accurate URL parsing
jwage · Dec 24, 2013 · 732eaec · 732eaec
2 parents 26d6a6f + 7dae0e0
commit 732eaec
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -13,6 +13,6 @@
     },
     "require": {
     	"php": ">=5.3.0",
-        "jeremykendall/php-domain-parser": "0.0.8"
+        "jeremykendall/php-domain-parser": "1.*"
     }
 }
diff --git a/src/Purl/Parser.php b/src/Purl/Parser.php
@@ -60,7 +60,15 @@ public function parseUrl($url)
             $url = (string) $url;
         }
 
-        $result = parse_url($url);
+        $result = false;
+
+        // If there's a single leading forward slash, use parse_url()
+        if (preg_match('#^\/{1}[^\/]#', $url) === 1) { 
+            $result = parse_url($url);
+        } else {
+            // Otherwise use the PSL parser
+            $result = $this->pslParser->parseUrl($url)->toArray();
+        }
 
         if ($result === false) {
             throw new \InvalidArgumentException(sprintf('Invalid url %s', $url));

diff --git a/src/Purl/ParserInterface.php b/src/Purl/ParserInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-/*
+/**
  * This file is part of the Purl package, a project by Jonathan H. Wage.
  *
  * (c) 2013 Jonathan H. Wage