Merge branch '2.x'

acrobat · acrobat · commit d50819703b37 · 2020-08-11T21:01:20.000+02:00
* 2.x: bug KnpLabs#908 [2.x] Use RFC3986 for building URI query strings (GrahamCampbell)
diff --git a/lib/Github/Api/AbstractApi.php b/lib/Github/Api/AbstractApi.php
@@ -103,7 +103,7 @@ protected function get($path, array $parameters = [], array $requestHeaders = []
         }
 
         if (count($parameters) > 0) {
-            $path .= '?'.http_build_query($parameters);
+            $path .= '?'.http_build_query($parameters, '', '&', PHP_QUERY_RFC3986);
         }
 
         $response = $this->client->getHttpClient()->get($path, $requestHeaders);
@@ -126,7 +126,7 @@ protected function head($path, array $parameters = [], array $requestHeaders = [
             unset($parameters['ref']);
         }
 
-        return $this->client->getHttpClient()->head($path.'?'.http_build_query($parameters), $requestHeaders);
+        return $this->client->getHttpClient()->head($path.'?'.http_build_query($parameters, '', '&', PHP_QUERY_RFC3986), $requestHeaders);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ protected function get($path, array $parameters = [], array $requestHeaders = []`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`if (count($parameters) > 0) {`
`106`		`- $path .= '?'.http_build_query($parameters);`
	`106`	`+ $path .= '?'.http_build_query($parameters, '', '&', PHP_QUERY_RFC3986);`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`$response = $this->client->getHttpClient()->get($path, $requestHeaders);`
`@@ -126,7 +126,7 @@ protected function head($path, array $parameters = [], array $requestHeaders = [`
`126`	`126`	`unset($parameters['ref']);`
`127`	`127`	`}`
`128`	`128`
`129`		`- return $this->client->getHttpClient()->head($path.'?'.http_build_query($parameters), $requestHeaders);`
	`129`	`+ return $this->client->getHttpClient()->head($path.'?'.http_build_query($parameters, '', '&', PHP_QUERY_RFC3986), $requestHeaders);`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`/**`