Skip to content

Fix PHP Symfony non-primitive return type being forced to be an array #3515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 2 commits into from
Aug 1, 2019
Merged

Fix PHP Symfony non-primitive return type being forced to be an array #3515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14b3fa6
Fix PHP Symfony non-primitive return type being forced to be an array
Jul 31, 2019
f937e29
Update PHP Symfony samples
Aug 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...i-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
// Create a variable to display the correct return type in comments for interfaces
if (op.returnType != null) {
op.vendorExtensions.put("x-commentType", op.returnType);
if (!op.returnTypeIsPrimitive) {
if (op.returnContainer != null && op.returnContainer.equals("array")) {
op.vendorExtensions.put("x-commentType", op.returnType + "[]");
}
} else {
Expand Down
4 changes: 2 additions & 2 deletions samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public function findPetsByTags(array $tags, &$responseCode, array &$responseHead
* @param integer $responseCode The HTTP response code to return
* @param array $responseHeaders Additional HTTP headers to return with the response ()
*
* @return OpenAPI\Server\Model\Pet[]
* @return OpenAPI\Server\Model\Pet
*
*/
public function getPetById($petId, &$responseCode, array &$responseHeaders);
Expand Down Expand Up @@ -173,7 +173,7 @@ public function updatePetWithForm($petId, $name = null, $status = null, &$respon
* @param integer $responseCode The HTTP response code to return
* @param array $responseHeaders Additional HTTP headers to return with the response ()
*
* @return OpenAPI\Server\Model\ApiResponse[]
* @return OpenAPI\Server\Model\ApiResponse
*
*/
public function uploadFile($petId, $additionalMetadata = null, UploadedFile $file = null, &$responseCode, array &$responseHeaders);
Expand Down
4 changes: 2 additions & 2 deletions samples/server/petstore/php-symfony/SymfonyBundle-php/Api/StoreApiInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public function getInventory(&$responseCode, array &$responseHeaders);
* @param integer $responseCode The HTTP response code to return
* @param array $responseHeaders Additional HTTP headers to return with the response ()
*
* @return OpenAPI\Server\Model\Order[]
* @return OpenAPI\Server\Model\Order
*
*/
public function getOrderById($orderId, &$responseCode, array &$responseHeaders);
Expand All @@ -101,7 +101,7 @@ public function getOrderById($orderId, &$responseCode, array &$responseHeaders);
* @param integer $responseCode The HTTP response code to return
* @param array $responseHeaders Additional HTTP headers to return with the response ()
*
* @return OpenAPI\Server\Model\Order[]
* @return OpenAPI\Server\Model\Order
*
*/
public function placeOrder(Order $body, &$responseCode, array &$responseHeaders);
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/php-symfony/SymfonyBundle-php/Api/UserApiInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public function deleteUser($username, &$responseCode, array &$responseHeaders);
* @param integer $responseCode The HTTP response code to return
* @param array $responseHeaders Additional HTTP headers to return with the response ()
*
* @return OpenAPI\Server\Model\User[]
* @return OpenAPI\Server\Model\User
*
*/
public function getUserByName($username, &$responseCode, array &$responseHeaders);
Expand Down