Fixing trailing '?'/'&' in request uri

VincentChalnot · VincentChalnot · commit 61455bfaa173 · 2020-06-29T12:42:52.000+02:00
diff --git a/Client/Client.php b/Client/Client.php
@@ -183,8 +183,10 @@ protected function setRequestQueryParameters(Request $request, array $options =
             } else {
                 $parametersString = (string) $options['query_parameters'];
             }
-            $uri .= strpos($uri, '?') ? '&' : '?';
-            $uri .= $parametersString;
+            if ($parametersString) {
+                $uri .= strpos($uri, '?') ? '&' : '?';
+                $uri .= $parametersString;
+            }
         } elseif ($options['query_parameters']) {
             $request->body($options['query_parameters']);
         }

Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,10 @@ protected function setRequestQueryParameters(Request $request, array $options =`
`183`	`183`	`} else {`
`184`	`184`	`$parametersString = (string) $options['query_parameters'];`
`185`	`185`	`}`
`186`		`- $uri .= strpos($uri, '?') ? '&' : '?';`
`187`		`- $uri .= $parametersString;`
	`186`	`+ if ($parametersString) {`
	`187`	`+ $uri .= strpos($uri, '?') ? '&' : '?';`
	`188`	`+ $uri .= $parametersString;`
	`189`	`+ }`
`188`	`190`	`} elseif ($options['query_parameters']) {`
`189`	`191`	`$request->body($options['query_parameters']);`
`190`	`192`	`}`