Merge pull request #65 from jeremykendall/fix/54-no-scheme-should-return-null-for-scheme

The rest of PR 64

Author: jeremykendall

src/Pdp/Exception/SeriouslyMalformedUrlException.php

@@ -21,13 +21,13 @@
 class SeriouslyMalformedUrlException extends \InvalidArgumentException implements PdpException
 {
     /**
-     * Public constructor
+     * Public constructor.
      *
-     * @param string $malformedUrl URL that caused pdp_parse_url() to return false
-     * @param int $code The Exception code
-     * @param \Exception $previous The previous exception used for the exception chaining
+     * @param string     $malformedUrl URL that caused pdp_parse_url() to return false
+     * @param int        $code         The Exception code
+     * @param \Exception $previous     The previous exception used for the exception chaining
      */
-    public function __construct($malformedUrl = "", $code = 0, $previous = null)
+    public function __construct($malformedUrl = '', $code = 0, $previous = null)
     {
         $message = sprintf('"%s" is one seriously malformed url.', $malformedUrl);
         parent::__construct($message, $code, $previous);

src/Pdp/Parser.php

@@ -10,6 +10,7 @@
  */
 namespace Pdp;
 
+use Pdp\Exception\SeriouslyMalformedUrlException;
 use Pdp\Uri\Url;
 use Pdp\Uri\Url\Host;
 
@@ -63,6 +64,7 @@ public function __construct(PublicSuffixList $publicSuffixList)
      */
     public function parseUrl($url)
     {
+        $rawUrl = $url;
         $elem = array(
             'scheme' => null,
             'user' => null,
@@ -83,7 +85,7 @@ public function parseUrl($url)
         $parts = pdp_parse_url($url);
 
         if ($parts === false) {
-            throw new \InvalidArgumentException(sprintf('Invalid url %s', $url));
+            throw new SeriouslyMalformedUrlException($rawUrl);
         }
 
         if ($parts['scheme'] === 'php-lt-5.4.7-hack') {

tests/src/Pdp/ParserTest.php

@@ -49,13 +49,36 @@ public function testIsSuffixValidTrue()
      * @covers ::pdp_parse_url
      */
     public function testParseBadUrlThrowsInvalidArgumentException()
+    {
+        $url = 'http:///example.com';
+
+        $this->setExpectedException(
+            'Pdp\Exception\SeriouslyMalformedUrlException',
+            sprintf('"%s" is one seriously malformed url.', $url)
+        );
+
+        $this->parser->parseUrl($url);
+    }
+
+    /**
+     * If an empty string is passed to the parser then the hacky scheme from 
+     * issue 49 should not appear in the Exception message.
+     *
+     * @group issue54
+     *
+     * @see https://github.com/jeremykendall/php-domain-parser/issues/54
+     *
+     * @covers Pdp\Parser::parseUrl()
+     * @covers ::pdp_parse_url
+     */
+    public function testParseEmptyStringThrowsInvalidArgumentExceptionWithoutWackySchemeInMessage()
     {
         $this->setExpectedException(
-            '\InvalidArgumentException',
-            'Invalid url http:///example.com'
+            'Pdp\Exception\SeriouslyMalformedUrlException',
+            '"" is one seriously malformed url.'
         );
 
-        $this->parser->parseUrl('http:///example.com');
+        $this->parser->parseUrl('');
     }
 
     /**