Support for urls with query parameters

Dane Westvik · Dane Westvik · commit cd08b5dee7d2 · 2017-08-24T13:36:23.000-07:00
diff --git a/src/Curl/Curl.php b/src/Curl/Curl.php
@@ -1193,10 +1193,11 @@ private function buildUrl($url, $mixed_data = '')
     {
         $query_string = '';
         if (!empty($mixed_data)) {
+            $query_mark = (strpos($url,'?')>0)? '&':'?';
             if (is_string($mixed_data)) {
-                $query_string .= '?' . $mixed_data;
+                $query_string .= $query_mark . $mixed_data;
             } elseif (is_array($mixed_data)) {
-                $query_string .= '?' . http_build_query($mixed_data, '', '&');
+                $query_string .= $query_mark . http_build_query($mixed_data, '', '&');
             }
         }
         return $url . $query_string;
diff --git a/tests/PHPCurlClass/PHPCurlClassTest.php b/tests/PHPCurlClass/PHPCurlClassTest.php
@@ -3106,6 +3106,23 @@ public function testBuildUrlArgs()
                 ),
                 'expected' => 'https://www.example.com/?a=1&b=2&c=3',
             ),
+            array(
+                'args' => array(
+                    'url' => 'https://www.example.com/?a=base',
+                    'mixed_data' => array(
+                        'b' => '2',
+                        'c' => '3',
+                    ),
+                ),
+                'expected' => 'https://www.example.com/?a=base&b=2&c=3',
+            ),
+            array(
+                'args' => array(
+                    'url' => 'https://www.example.com/?a=base',
+                    'mixed_data' => 'b=2&c=3'
+                ),
+                'expected' => 'https://www.example.com/?a=base&b=2&c=3',
+            ),
             array(
                 'args' => array(
                     'url' => 'https://www.example.com/',

Original file line number	Diff line number	Diff line change
`@@ -1193,10 +1193,11 @@ private function buildUrl($url, $mixed_data = '')`
`1193`	`1193`	`{`
`1194`	`1194`	`$query_string = '';`
`1195`	`1195`	`if (!empty($mixed_data)) {`
	`1196`	`+ $query_mark = (strpos($url,'?')>0)? '&':'?';`
`1196`	`1197`	`if (is_string($mixed_data)) {`
`1197`		`- $query_string .= '?' . $mixed_data;`
	`1198`	`+ $query_string .= $query_mark . $mixed_data;`
`1198`	`1199`	`} elseif (is_array($mixed_data)) {`
`1199`		`- $query_string .= '?' . http_build_query($mixed_data, '', '&');`
	`1200`	`+ $query_string .= $query_mark . http_build_query($mixed_data, '', '&');`
`1200`	`1201`	`}`
`1201`	`1202`	`}`
`1202`	`1203`	`return $url . $query_string;`