Revert "Add support for RFC 3986 compliant URL schemes. jeremykendall#46."

This reverts commit bf41fb1.

Author: jeremykendall

src/Pdp/Parser.php

@@ -19,7 +19,7 @@
  */
 class Parser
 {
-    const SCHEME_PATTERN = '#^([a-zA-Z][a-zA-Z0-9+\-.]*)://#';
+    const SCHEME_PATTERN = '#^(http|ftp)s?://#i';
     const IP_ADDRESS_PATTERN = '/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/';
 
     /**

src/pdp-parse-url.php

@@ -24,13 +24,10 @@
          */
         function pdp_parse_url($url, $component = -1)
         {
-            $pattern = '%([a-zA-Z][a-zA-Z0-9+\-.]*)?(:?//)?([^:/@?&=#\[\]]+)%usD';
-
             $enc_url = preg_replace_callback(
-                $pattern,
+                '%[^:/@?&=#\[\]]+%usD',
                 function ($matches) {
-                    $encoded = urlencode($matches[3]);
-                    return sprintf('%s%s%s', $matches[1], $matches[2], $encoded);
+                    return urlencode($matches[0]);
                 },
                     $url
                 );
@@ -43,10 +40,6 @@ function ($matches) {
 
             if (is_array($parts)) {
                 foreach ($parts as $name => $value) {
-                    if ($name === 'scheme') {
-                        continue;
-                    }
-
                     $parts[$name] = urldecode($value);
                 }
             } else {

tests/src/Pdp/ParserTest.php

@@ -185,9 +185,6 @@ public function parseDataProvider()
             // 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'),
-            // Test support for RFC 3986 compliant schemes
-            // https://github.com/jeremykendall/php-domain-parser/issues/46
-            array('fake-scheme+RFC-3986.compliant://example.com', 'com', 'example.com', null, 'example.com'),
             array('http://localhost', null, null, null, 'localhost'),
             array('test.museum', 'museum', 'test.museum', null, 'test.museum'),
             array('bob.smith.name', 'name', 'smith.name', 'bob', 'bob.smith.name'),