mirror of
https://github.com/php-curl-class/php-curl-class.git
synced 2026-08-30 12:14:36 +00:00
Support for urls with query parameters
This commit is contained in:
+3
-2
@@ -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;
|
||||
|
||||
@@ -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/',
|
||||
|
||||
Reference in New Issue
Block a user