Merge pull request php-curl-class#680 from zachborboa/master

Fix php-curl-class#679: Parsing schemeless urls

Author: zachborboa

src/Curl/Url.php

@@ -114,14 +114,14 @@ public static function buildUrl($url, $mixed_data = '')
      */
     private function absolutizeUrl()
     {
-        $b = $this->parseUrl($this->baseUrl);
+        $b = self::parseUrl($this->baseUrl);
         if (!isset($b['path'])) {
             $b['path'] = '/';
         }
         if ($this->relativeUrl === null) {
             return $this->unparseUrl($b);
         }
-        $r = $this->parseUrl($this->relativeUrl);
+        $r = self::parseUrl($this->relativeUrl);
         $r['authorized'] = isset($r['scheme']) || isset($r['host']) || isset($r['port'])
             || isset($r['user']) || isset($r['pass']);
         $target = [];
@@ -178,58 +178,11 @@ private function absolutizeUrl()
      *
      * Parse url into components of a URI as specified by RFC 3986.
      */
-    private function parseUrl($url)
+    public static function parseUrl($url)
     {
-        // RFC 3986 - Parsing a URI Reference with a Regular Expression.
-        //       ^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?
-        //        12            3  4          5       6  7        8 9
-        //
-        // "http://www.ics.uci.edu/pub/ietf/uri/#Related"
-        // $1 = http: (scheme)
-        // $2 = http (scheme)
-        // $3 = //www.ics.uci.edu (ignore)
-        // $4 = www.ics.uci.edu (authority)
-        // $5 = /pub/ietf/uri/ (path)
-        // $6 = <undefined> (ignore)
-        // $7 = <undefined> (query)
-        // $8 = #Related (ignore)
-        // $9 = Related (fragment)
-        preg_match('/^(([^:\/?#]+):)?(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/', (string) $url, $output_array);
-
-        $parts = [];
-        if (isset($output_array['1']) && $output_array['1'] !== '') {
-            $parts['scheme'] = $output_array['1'];
-        }
-        if (isset($output_array['2']) && $output_array['2'] !== '') {
-            $parts['scheme'] = $output_array['2'];
-        }
-        if (isset($output_array['4']) && $output_array['4'] !== '') {
-            // authority   = [ userinfo "@" ] host [ ":" port ]
-            $parts['host'] = $output_array['4'];
-            if (strpos($parts['host'], ':') !== false) {
-                $host_parts = explode(':', $output_array['4']);
-                $parts['port'] = array_pop($host_parts);
-                $parts['host'] = implode(':', $host_parts);
-                if (strpos($parts['host'], '@') !== false) {
-                    $host_parts = explode('@', $parts['host']);
-                    $parts['host'] = array_pop($host_parts);
-                    $parts['user'] = implode('@', $host_parts);
-                    if (strpos($parts['user'], ':') !== false) {
-                        $user_parts = explode(':', $parts['user'], 2);
-                        $parts['user'] = array_shift($user_parts);
-                        $parts['pass'] = implode(':', $user_parts);
-                    }
-                }
-            }
-        }
-        if (isset($output_array['5']) && $output_array['5'] !== '') {
-            $parts['path'] = $this->percentEncodeChars($output_array['5']);
-        }
-        if (isset($output_array['7']) && $output_array['7'] !== '') {
-            $parts['query'] = $output_array['7'];
-        }
-        if (isset($output_array['9']) && $output_array['9'] !== '') {
-            $parts['fragment'] = $output_array['9'];
+        $parts = parse_url((string) $url);
+        if (isset($parts['path'])) {
+            $parts['path'] = self::percentEncodeChars($parts['path']);
         }
         return $parts;
     }
@@ -240,7 +193,7 @@ private function parseUrl($url)
      * Percent-encode characters to represent a data octet in a component when
      * that octet's corresponding character is outside the allowed set.
      */
-    private function percentEncodeChars($chars)
+    private static function percentEncodeChars($chars)
     {
         // ALPHA         = A-Z / a-z
         $alpha = 'A-Za-z';

tests/PHPCurlClass/UrlTest.php

@@ -68,7 +68,7 @@ public function testRemoveDotSegments()
         }
     }
 
-    public function testCyrillicChars()
+    public function testUrlCyrillicChars()
     {
         $path_part = 'Банан-комнатный-саженцы-банана';
         $original_url = 'https://www.example.com/path/' . $path_part               . '/page.html';
@@ -98,12 +98,7 @@ public function testParseUrlSyntaxComponents()
 
         $this->assertEquals($expected_parts, parse_url($input_url));
 
-        $reflector = new \ReflectionClass('Curl\Url');
-        $reflection_method = $reflector->getMethod('parseUrl');
-        $reflection_method->setAccessible(true);
-
-        $url = new Url(null);
-        $result = $reflection_method->invoke($url, $input_url);
+        $result = Url::parseUrl($input_url);
         $this->assertEquals($expected_parts, $result);
     }
 
@@ -123,26 +118,36 @@ public function testParseUrlExample()
 
         $this->assertEquals($expected_parts, parse_url($input_url));
 
-        $reflector = new \ReflectionClass('Curl\Url');
-        $reflection_method = $reflector->getMethod('parseUrl');
-        $reflection_method->setAccessible(true);
-
-        $url = new Url(null);
-        $result = $reflection_method->invoke($url, $input_url);
+        $result = Url::parseUrl($input_url);
         $this->assertEquals($expected_parts, $result);
     }
 
-    public function testIpv6NoPort()
+    public function testUrlIpv6NoPort()
     {
         $expected_url = 'http://[::1]/test';
         $actual_url = new Url($expected_url);
         $this->assertEquals($expected_url, $actual_url);
     }
 
-    public function testIpv6Port()
+    public function testUrlIpv6Port()
     {
         $expected_url = 'http://[::1]:80/test';
         $actual_url = new Url($expected_url);
         $this->assertEquals($expected_url, $actual_url);
     }
+
+    public function testParseUrlSchemelessUrl()
+    {
+        $input_url = '10.1.2.43:8080/config/getconfig';
+        $expected_parts = [
+            'host' => '10.1.2.43',
+            'port' => '8080',
+            'path' => '/config/getconfig',
+        ];
+
+        $this->assertEquals($expected_parts, parse_url($input_url));
+
+        $result = Url::parseUrl($input_url);
+        $this->assertEquals($expected_parts, $result);
+    }
 }