Support for urls with query parameters

This commit is contained in:
Dane Westvik
2017-08-24 13:36:23 -07:00
parent 3f4e0fc49e
commit cd08b5dee7
2 changed files with 20 additions and 2 deletions
+3 -2
View File
@@ -1193,10 +1193,11 @@ class Curl
{
$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;
+17
View File
@@ -3106,6 +3106,23 @@ class CurlTest extends \PHPUnit\Framework\TestCase
),
'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/',