Use explicit argument separator when building url

zachborboa · zachborboa · commit 849137a95ebd · 2016-08-12T02:01:23.000-07:00
diff --git a/src/Curl/Curl.php b/src/Curl/Curl.php
@@ -1094,7 +1094,7 @@ private function __get_totalTime() {
      */
     private function buildURL($url, $data = array())
     {
-        return $url . (empty($data) ? '' : '?' . http_build_query($data));
+        return $url . (empty($data) ? '' : '?' . http_build_query($data, '', '&'));
     }
 
     /**
diff --git a/tests/PHPCurlClass/PHPCurlClassTest.php b/tests/PHPCurlClass/PHPCurlClassTest.php
@@ -2807,4 +2807,29 @@ public function testOptionSet()
 
         $this->assertFalse(isset($options[CURLOPT_COOKIE]));
     }
+
+    public function testBuildUrlArgSeparator()
+    {
+        $base_url = 'https://www.example.com/path';
+        $data = array(
+            'arg' => 'value',
+            'another' => 'one',
+        );
+        $expected_url = $base_url . '?arg=value&another=one';
+
+        foreach (array(false, '&amp;', '&') as $arg_separator) {
+            if ($arg_separator) {
+                ini_set('arg_separator.output', $arg_separator);
+            }
+
+            $curl = new Curl();
+
+            $reflector = new ReflectionObject($curl);
+            $method = $reflector->getMethod('buildURL');
+            $method->setAccessible(true);
+
+            $actual_url = $method->invoke($curl, $base_url, $data);
+            $this->assertEquals($expected_url, $actual_url);
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1094,7 +1094,7 @@ private function __get_totalTime() {`
`1094`	`1094`	`*/`
`1095`	`1095`	`private function buildURL($url, $data = array())`
`1096`	`1096`	`{`
`1097`		`- return $url . (empty($data) ? '' : '?' . http_build_query($data));`
	`1097`	`+ return $url . (empty($data) ? '' : '?' . http_build_query($data, '', '&'));`
`1098`	`1098`	`}`
`1099`	`1099`
`1100`	`1100`	`/**`