diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java index 081041fa24b4..7068a1cfe0e3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java @@ -96,7 +96,7 @@ public PhpLaravelServerCodegen() { /* * Model Package. Optional, if needed, this can be used in templates */ - modelPackage = "app.Models"; + modelPackage = "app\\Models"; // template files want to be ignored apiTestTemplateFiles.clear(); diff --git a/samples/server/petstore/php-laravel/.openapi-generator/VERSION b/samples/server/petstore/php-laravel/.openapi-generator/VERSION index 0f58aa041419..4395ff592326 100644 --- a/samples/server/petstore/php-laravel/.openapi-generator/VERSION +++ b/samples/server/petstore/php-laravel/.openapi-generator/VERSION @@ -1 +1 @@ -3.1.2-SNAPSHOT \ No newline at end of file +3.2.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/AnotherFakeController.php b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/AnotherFakeController.php index 8a70815af102..a209fbfce711 100644 --- a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/AnotherFakeController.php +++ b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/AnotherFakeController.php @@ -31,14 +31,14 @@ public function __construct() } /** - * Operation testSpecialTags + * Operation 123testSpecialTags * * To test special tags. * * * @return Http response */ - public function testSpecialTags() + public function 123testSpecialTags() { $input = Request::all(); @@ -47,11 +47,11 @@ public function testSpecialTags() //not path params validation if (!isset($input['client'])) { - throw new \InvalidArgumentException('Missing the required parameter $client when calling testSpecialTags'); + throw new \InvalidArgumentException('Missing the required parameter $client when calling 123testSpecialTags'); } $client = $input['client']; - return response('How about implementing testSpecialTags as a patch method ?'); + return response('How about implementing 123testSpecialTags as a patch method ?'); } } diff --git a/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesClass.php b/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesClass.php index 36069e0804ec..35c19c165bf8 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesClass.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesClass.php @@ -2,7 +2,7 @@ /** * AdditionalPropertiesClass */ -namespace app.Models; +namespace app\Models; /** * AdditionalPropertiesClass diff --git a/samples/server/petstore/php-laravel/lib/app/Models/Animal.php b/samples/server/petstore/php-laravel/lib/app/Models/Animal.php index f91fead6c2e1..6942fa0863d9 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/Animal.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/Animal.php @@ -2,7 +2,7 @@ /** * Animal */ -namespace app.Models; +namespace app\Models; /** * Animal diff --git a/samples/server/petstore/php-laravel/lib/app/Models/AnimalFarm.php b/samples/server/petstore/php-laravel/lib/app/Models/AnimalFarm.php index 65027bb9a902..a54de088353b 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/AnimalFarm.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/AnimalFarm.php @@ -2,7 +2,7 @@ /** * AnimalFarm */ -namespace app.Models; +namespace app\Models; /** * AnimalFarm diff --git a/samples/server/petstore/php-laravel/lib/app/Models/ApiResponse.php b/samples/server/petstore/php-laravel/lib/app/Models/ApiResponse.php index c6638f0dd513..e9f556871bce 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/ApiResponse.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/ApiResponse.php @@ -2,7 +2,7 @@ /** * ApiResponse */ -namespace app.Models; +namespace app\Models; /** * ApiResponse diff --git a/samples/server/petstore/php-laravel/lib/app/Models/ArrayOfArrayOfNumberOnly.php b/samples/server/petstore/php-laravel/lib/app/Models/ArrayOfArrayOfNumberOnly.php index fc87755a8b22..dc2a32663306 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/ArrayOfArrayOfNumberOnly.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/ArrayOfArrayOfNumberOnly.php @@ -2,7 +2,7 @@ /** * ArrayOfArrayOfNumberOnly */ -namespace app.Models; +namespace app\Models; /** * ArrayOfArrayOfNumberOnly diff --git a/samples/server/petstore/php-laravel/lib/app/Models/ArrayOfNumberOnly.php b/samples/server/petstore/php-laravel/lib/app/Models/ArrayOfNumberOnly.php index 0b1857e80748..0ab3158257cf 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/ArrayOfNumberOnly.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/ArrayOfNumberOnly.php @@ -2,7 +2,7 @@ /** * ArrayOfNumberOnly */ -namespace app.Models; +namespace app\Models; /** * ArrayOfNumberOnly diff --git a/samples/server/petstore/php-laravel/lib/app/Models/ArrayTest.php b/samples/server/petstore/php-laravel/lib/app/Models/ArrayTest.php index 309a3d52de24..3b791d484926 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/ArrayTest.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/ArrayTest.php @@ -2,7 +2,7 @@ /** * ArrayTest */ -namespace app.Models; +namespace app\Models; /** * ArrayTest @@ -15,7 +15,7 @@ class ArrayTest { /** @var int[][] $array_array_of_integer */ private $array_array_of_integer; - /** @var \app.Models\ReadOnlyFirst[][] $array_array_of_model */ + /** @var \app\Models\ReadOnlyFirst[][] $array_array_of_model */ private $array_array_of_model; } diff --git a/samples/server/petstore/php-laravel/lib/app/Models/Capitalization.php b/samples/server/petstore/php-laravel/lib/app/Models/Capitalization.php index 1a7530487261..cd5150d51d33 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/Capitalization.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/Capitalization.php @@ -2,7 +2,7 @@ /** * Capitalization */ -namespace app.Models; +namespace app\Models; /** * Capitalization diff --git a/samples/server/petstore/php-laravel/lib/app/Models/Cat.php b/samples/server/petstore/php-laravel/lib/app/Models/Cat.php index d4699ebd10f7..6167ece546d4 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/Cat.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/Cat.php @@ -2,7 +2,7 @@ /** * Cat */ -namespace app.Models; +namespace app\Models; /** * Cat diff --git a/samples/server/petstore/php-laravel/lib/app/Models/Category.php b/samples/server/petstore/php-laravel/lib/app/Models/Category.php index d9db05a3db10..58a9362f2d2d 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/Category.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/Category.php @@ -2,7 +2,7 @@ /** * Category */ -namespace app.Models; +namespace app\Models; /** * Category diff --git a/samples/server/petstore/php-laravel/lib/app/Models/ClassModel.php b/samples/server/petstore/php-laravel/lib/app/Models/ClassModel.php index 7141c47adfc0..5650b21d68c5 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/ClassModel.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/ClassModel.php @@ -2,7 +2,7 @@ /** * ClassModel */ -namespace app.Models; +namespace app\Models; /** * ClassModel diff --git a/samples/server/petstore/php-laravel/lib/app/Models/Client.php b/samples/server/petstore/php-laravel/lib/app/Models/Client.php index 7e479bd48b16..35358e061057 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/Client.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/Client.php @@ -2,7 +2,7 @@ /** * Client */ -namespace app.Models; +namespace app\Models; /** * Client diff --git a/samples/server/petstore/php-laravel/lib/app/Models/Dog.php b/samples/server/petstore/php-laravel/lib/app/Models/Dog.php index c839a4695725..da4cf3627155 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/Dog.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/Dog.php @@ -2,7 +2,7 @@ /** * Dog */ -namespace app.Models; +namespace app\Models; /** * Dog diff --git a/samples/server/petstore/php-laravel/lib/app/Models/EnumArrays.php b/samples/server/petstore/php-laravel/lib/app/Models/EnumArrays.php index 950c80b823c5..d578e12e5c1b 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/EnumArrays.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/EnumArrays.php @@ -2,7 +2,7 @@ /** * EnumArrays */ -namespace app.Models; +namespace app\Models; /** * EnumArrays diff --git a/samples/server/petstore/php-laravel/lib/app/Models/EnumClass.php b/samples/server/petstore/php-laravel/lib/app/Models/EnumClass.php index 5bb41f9946a3..84f07bbf73e4 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/EnumClass.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/EnumClass.php @@ -2,7 +2,7 @@ /** * EnumClass */ -namespace app.Models; +namespace app\Models; /** * EnumClass diff --git a/samples/server/petstore/php-laravel/lib/app/Models/EnumTest.php b/samples/server/petstore/php-laravel/lib/app/Models/EnumTest.php index 500ee9d7a261..afb72d3d9a14 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/EnumTest.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/EnumTest.php @@ -2,7 +2,7 @@ /** * EnumTest */ -namespace app.Models; +namespace app\Models; /** * EnumTest @@ -21,7 +21,7 @@ class EnumTest { /** @var double $enum_number */ private $enum_number; - /** @var \app.Models\OuterEnum $outer_enum */ + /** @var \app\Models\OuterEnum $outer_enum */ private $outer_enum; } diff --git a/samples/server/petstore/php-laravel/lib/app/Models/FileSchemaTestClass.php b/samples/server/petstore/php-laravel/lib/app/Models/FileSchemaTestClass.php index 8beee0391821..64fe925c123c 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/FileSchemaTestClass.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/FileSchemaTestClass.php @@ -2,17 +2,17 @@ /** * FileSchemaTestClass */ -namespace app.Models; +namespace app\Models; /** * FileSchemaTestClass */ class FileSchemaTestClass { - /** @var \app.Models\File $file */ + /** @var \app\Models\File $file */ private $file; - /** @var \app.Models\File[] $files */ + /** @var \app\Models\File[] $files */ private $files; } diff --git a/samples/server/petstore/php-laravel/lib/app/Models/FormatTest.php b/samples/server/petstore/php-laravel/lib/app/Models/FormatTest.php index c76f8a0913d1..ee0a944bbe67 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/FormatTest.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/FormatTest.php @@ -2,7 +2,7 @@ /** * FormatTest */ -namespace app.Models; +namespace app\Models; /** * FormatTest diff --git a/samples/server/petstore/php-laravel/lib/app/Models/HasOnlyReadOnly.php b/samples/server/petstore/php-laravel/lib/app/Models/HasOnlyReadOnly.php index a562410cdb07..ecea2a0d4d91 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/HasOnlyReadOnly.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/HasOnlyReadOnly.php @@ -2,7 +2,7 @@ /** * HasOnlyReadOnly */ -namespace app.Models; +namespace app\Models; /** * HasOnlyReadOnly diff --git a/samples/server/petstore/php-laravel/lib/app/Models/MapTest.php b/samples/server/petstore/php-laravel/lib/app/Models/MapTest.php index 56f1e67c8089..4d2132dd58a2 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/MapTest.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/MapTest.php @@ -2,7 +2,7 @@ /** * MapTest */ -namespace app.Models; +namespace app\Models; /** * MapTest @@ -18,7 +18,7 @@ class MapTest { /** @var map[string,bool] $direct_map */ private $direct_map; - /** @var \app.Models\StringBooleanMap $indirect_map */ + /** @var \app\Models\StringBooleanMap $indirect_map */ private $indirect_map; } diff --git a/samples/server/petstore/php-laravel/lib/app/Models/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/server/petstore/php-laravel/lib/app/Models/MixedPropertiesAndAdditionalPropertiesClass.php index 17403f9a71e9..eb136cce7b52 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/MixedPropertiesAndAdditionalPropertiesClass.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/MixedPropertiesAndAdditionalPropertiesClass.php @@ -2,7 +2,7 @@ /** * MixedPropertiesAndAdditionalPropertiesClass */ -namespace app.Models; +namespace app\Models; /** * MixedPropertiesAndAdditionalPropertiesClass @@ -15,7 +15,7 @@ class MixedPropertiesAndAdditionalPropertiesClass { /** @var \DateTime $date_time */ private $date_time; - /** @var map[string,\app.Models\Animal] $map */ + /** @var map[string,\app\Models\Animal] $map */ private $map; } diff --git a/samples/server/petstore/php-laravel/lib/app/Models/Model200Response.php b/samples/server/petstore/php-laravel/lib/app/Models/Model200Response.php index a196695ebe06..a5c928983b6c 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/Model200Response.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/Model200Response.php @@ -2,7 +2,7 @@ /** * Model200Response */ -namespace app.Models; +namespace app\Models; /** * Model200Response diff --git a/samples/server/petstore/php-laravel/lib/app/Models/ModelReturn.php b/samples/server/petstore/php-laravel/lib/app/Models/ModelReturn.php index d89221b20848..e8d9d76df4fa 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/ModelReturn.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/ModelReturn.php @@ -2,7 +2,7 @@ /** * ModelReturn */ -namespace app.Models; +namespace app\Models; /** * ModelReturn diff --git a/samples/server/petstore/php-laravel/lib/app/Models/Name.php b/samples/server/petstore/php-laravel/lib/app/Models/Name.php index e14c48c322c5..4cf6c997a111 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/Name.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/Name.php @@ -2,7 +2,7 @@ /** * Name */ -namespace app.Models; +namespace app\Models; /** * Name diff --git a/samples/server/petstore/php-laravel/lib/app/Models/NumberOnly.php b/samples/server/petstore/php-laravel/lib/app/Models/NumberOnly.php index ed0e08e79413..6babd92e9f43 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/NumberOnly.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/NumberOnly.php @@ -2,7 +2,7 @@ /** * NumberOnly */ -namespace app.Models; +namespace app\Models; /** * NumberOnly diff --git a/samples/server/petstore/php-laravel/lib/app/Models/Order.php b/samples/server/petstore/php-laravel/lib/app/Models/Order.php index b0aa92221231..5413d8217cb7 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/Order.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/Order.php @@ -2,7 +2,7 @@ /** * Order */ -namespace app.Models; +namespace app\Models; /** * Order diff --git a/samples/server/petstore/php-laravel/lib/app/Models/OuterComposite.php b/samples/server/petstore/php-laravel/lib/app/Models/OuterComposite.php index 214305c6c852..8054073cea02 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/OuterComposite.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/OuterComposite.php @@ -2,7 +2,7 @@ /** * OuterComposite */ -namespace app.Models; +namespace app\Models; /** * OuterComposite diff --git a/samples/server/petstore/php-laravel/lib/app/Models/OuterEnum.php b/samples/server/petstore/php-laravel/lib/app/Models/OuterEnum.php index d83c9c9009af..b432df169d59 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/OuterEnum.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/OuterEnum.php @@ -2,7 +2,7 @@ /** * OuterEnum */ -namespace app.Models; +namespace app\Models; /** * OuterEnum diff --git a/samples/server/petstore/php-laravel/lib/app/Models/Pet.php b/samples/server/petstore/php-laravel/lib/app/Models/Pet.php index 59e5388db96e..3fe15597cc63 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/Pet.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/Pet.php @@ -2,7 +2,7 @@ /** * Pet */ -namespace app.Models; +namespace app\Models; /** * Pet @@ -12,7 +12,7 @@ class Pet { /** @var int $id */ private $id; - /** @var \app.Models\Category $category */ + /** @var \app\Models\Category $category */ private $category; /** @var string $name */ @@ -21,7 +21,7 @@ class Pet { /** @var string[] $photo_urls */ private $photo_urls; - /** @var \app.Models\Tag[] $tags */ + /** @var \app\Models\Tag[] $tags */ private $tags; /** @var string $status pet status in the store*/ diff --git a/samples/server/petstore/php-laravel/lib/app/Models/ReadOnlyFirst.php b/samples/server/petstore/php-laravel/lib/app/Models/ReadOnlyFirst.php index 7a41e8765911..e914f1ff0085 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/ReadOnlyFirst.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/ReadOnlyFirst.php @@ -2,7 +2,7 @@ /** * ReadOnlyFirst */ -namespace app.Models; +namespace app\Models; /** * ReadOnlyFirst diff --git a/samples/server/petstore/php-laravel/lib/app/Models/SpecialModelName.php b/samples/server/petstore/php-laravel/lib/app/Models/SpecialModelName.php index 03f59631e185..8665800993ef 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/SpecialModelName.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/SpecialModelName.php @@ -2,7 +2,7 @@ /** * SpecialModelName */ -namespace app.Models; +namespace app\Models; /** * SpecialModelName diff --git a/samples/server/petstore/php-laravel/lib/app/Models/StringBooleanMap.php b/samples/server/petstore/php-laravel/lib/app/Models/StringBooleanMap.php index 03fc9624e608..b10016247138 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/StringBooleanMap.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/StringBooleanMap.php @@ -2,7 +2,7 @@ /** * StringBooleanMap */ -namespace app.Models; +namespace app\Models; /** * StringBooleanMap diff --git a/samples/server/petstore/php-laravel/lib/app/Models/Tag.php b/samples/server/petstore/php-laravel/lib/app/Models/Tag.php index 716de4ea5176..fb8469f95615 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/Tag.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/Tag.php @@ -2,7 +2,7 @@ /** * Tag */ -namespace app.Models; +namespace app\Models; /** * Tag diff --git a/samples/server/petstore/php-laravel/lib/app/Models/User.php b/samples/server/petstore/php-laravel/lib/app/Models/User.php index dbb78b5ce126..c5755093b956 100644 --- a/samples/server/petstore/php-laravel/lib/app/Models/User.php +++ b/samples/server/petstore/php-laravel/lib/app/Models/User.php @@ -2,7 +2,7 @@ /** * User */ -namespace app.Models; +namespace app\Models; /** * User diff --git a/samples/server/petstore/php-laravel/lib/routes/api.php b/samples/server/petstore/php-laravel/lib/routes/api.php index f1b9f3f14a1a..68ec0ac86aa6 100644 --- a/samples/server/petstore/php-laravel/lib/routes/api.php +++ b/samples/server/petstore/php-laravel/lib/routes/api.php @@ -17,12 +17,12 @@ */ /** - * patch testSpecialTags + * patch 123testSpecialTags * Summary: To test special tags - * Notes: To test special tags + * Notes: To test special tags and operation ID starting with number * Output-Formats: [application/json] */ -Route::patch('/v2/another-fake/dummy', 'AnotherFakeController@testSpecialTags'); +Route::patch('/v2/another-fake/dummy', 'AnotherFakeController@123testSpecialTags'); /** * patch testClientModel * Summary: To test \"client\" model