Adds ftp support. Closes #18

jeremykendall · Dec 24, 2013 · 6a8765f · 6a8765f
1 parent e38c0cb
commit 6a8765f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/library/Pdp/Parser.php b/library/Pdp/Parser.php
@@ -20,7 +20,7 @@
  */
 class Parser
 {
-    const SCHEME_PATTERN = '#^https?://#i';
+    const SCHEME_PATTERN = '#^(http|ftp)s?://#i';
 
     /**
      * @var PublicSuffixList Public Suffix List
@@ -57,9 +57,7 @@ public function parseUrl($url)
             'fragment' => null,
         );
 
-        preg_match(self::SCHEME_PATTERN, $url, $schemeMatches);
-
-        if (empty($schemeMatches)) {
+        if (preg_match(self::SCHEME_PATTERN, $url, $schemeMatches) === 0) {
             $url = 'http://' . preg_replace('#^//#', '', $url, 1);
         }
 

diff --git a/tests/library/Pdp/ParserTest.php b/tests/library/Pdp/ParserTest.php
@@ -132,6 +132,9 @@ public function parseDataProvider()
             // END https://github.com/jeremykendall/php-domain-parser/issues/16
             // Test schemeless url
             array('//www.broken.webhop.biz', 'webhop.biz', 'broken.webhop.biz', 'www', 'www.broken.webhop.biz'),
+            // Test ftp support - https://github.com/jeremykendall/php-domain-parser/issues/18
+            array('ftp://www.waxaudio.com.au/audio/albums/the_mashening', 'com.au', 'waxaudio.com.au', 'www', 'www.waxaudio.com.au'),
+            array('ftps://test.k12.ak.us', 'k12.ak.us', 'test.k12.ak.us', null, 'test.k12.ak.us'),
         );
     }
 }
diff --git a/tests/library/Pdp/Uri/UrlTest.php b/tests/library/Pdp/Uri/UrlTest.php
@@ -13,6 +13,11 @@ class UrlTest extends \PHPUnit_Framework_TestCase
      * @var Url
      */
     protected $url;
+
+    /**
+     * @var Parser
+     */
+    protected $parser;
 
     /**
      * @var string Url spec
@@ -29,8 +34,8 @@ protected function setUp()
         parent::setUp();
         $file = realpath(dirname(__DIR__) . '/../../../data/' . PublicSuffixListManager::PDP_PSL_PHP_FILE); 
         $psl = new PublicSuffixList($file);
-        $parser = new Parser($psl);
-        $this->url = $parser->parseUrl($this->spec);
+        $this->parser = new Parser($psl);
+        $this->url = $this->parser->parseUrl($this->spec);
     }
 
     protected function tearDown()
@@ -110,4 +115,15 @@ public function testToArray()
 
         $this->assertEquals($expected, $this->url->toArray());
     }
+
+    /**
+     * @group issue18
+     * @see https://github.com/jeremykendall/php-domain-parser/issues/18
+     */
+    public function testFtpUrlToString()
+    {
+        $ftpUrl = 'ftp://ftp.somewhere.com';
+        $url = $this->parser->parseUrl($ftpUrl);
+        $this->assertEquals($ftpUrl, $url->__toString());
+    }
 }