Merge branch 'fix/php-guzzlehttp-7' of https://github.com/oprudkyi/swagger-codegen-generators into oprudkyi-fix/php-guzzlehttp-7

HugoMario · HugoMario · commit 13d94b0d1dcb · 2023-05-31T06:31:19.000-05:00
# Conflicts:
#	src/main/resources/handlebars/php/composer.mustache
diff --git a/src/main/resources/handlebars/php/api.mustache b/src/main/resources/handlebars/php/api.mustache
@@ -448,7 +448,7 @@ use {{invokerPackage}}\ObjectSerializer;
 
             } else {
                 // for HTTP post (form)
-                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
+                $httpBody = \GuzzleHttp\Psr7\Query::build($formParams);
             }
         }
 
@@ -491,7 +491,7 @@ use {{invokerPackage}}\ObjectSerializer;
             $headers
         );
 
-        $query = \GuzzleHttp\Psr7\build_query($queryParams);
+        $query = \GuzzleHttp\Psr7\Query::build($queryParams);
         return new Request(
             '{{httpMethod}}',
             $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),

Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ use {{invokerPackage}}\ObjectSerializer;`
`448`	`448`
`449`	`449`	`} else {`
`450`	`450`	`// for HTTP post (form)`
`451`		`- $httpBody = \GuzzleHttp\Psr7\build_query($formParams);`
	`451`	`+ $httpBody = \GuzzleHttp\Psr7\Query::build($formParams);`
`452`	`452`	`}`
`453`	`453`	`}`
`454`	`454`
`@@ -491,7 +491,7 @@ use {{invokerPackage}}\ObjectSerializer;`
`491`	`491`	`$headers`
`492`	`492`	`);`
`493`	`493`
`494`		`- $query = \GuzzleHttp\Psr7\build_query($queryParams);`
	`494`	`+ $query = \GuzzleHttp\Psr7\Query::build($queryParams);`
`495`	`495`	`return new Request(`
`496`	`496`	`'{{httpMethod}}',`
`497`	`497`	`$this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),`