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 a0273c79d291..081041fa24b4 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,10 +96,9 @@ public PhpLaravelServerCodegen() {
         /*
          * Model Package.  Optional, if needed, this can be used in templates
          */
-        modelPackage = "models";
+        modelPackage = "app.Models";
 
         // template files want to be ignored
-        modelTemplateFiles.clear();
         apiTestTemplateFiles.clear();
         apiDocTemplateFiles.clear();
         modelDocTemplateFiles.clear();
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/RouteServiceProvider.php b/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/RouteServiceProvider.php
index 5ea48d39d4f9..b36415e85f3f 100644
--- a/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/RouteServiceProvider.php
+++ b/modules/openapi-generator/src/main/resources/php-laravel/app/Providers/RouteServiceProvider.php
@@ -65,8 +65,7 @@ protected function mapWebRoutes()
      */
     protected function mapApiRoutes()
     {
-        Route::prefix('api')
-             ->middleware('api')
+        Route::middleware('api')
              ->namespace($this->namespace)
              ->group(base_path('routes/api.php'));
     }
diff --git a/samples/server/petstore/php-laravel/.openapi-generator/VERSION b/samples/server/petstore/php-laravel/.openapi-generator/VERSION
index afa636560641..0f58aa041419 100644
--- a/samples/server/petstore/php-laravel/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-laravel/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.0-SNAPSHOT
\ No newline at end of file
+3.1.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-laravel/lib/.env b/samples/server/petstore/php-laravel/lib/.env
index c514d8de95ff..7aaed2ba7b9c 100644
--- a/samples/server/petstore/php-laravel/lib/.env
+++ b/samples/server/petstore/php-laravel/lib/.env
@@ -1,6 +1,6 @@
 APP_NAME=Laravel
 APP_ENV=local
-APP_KEY=base64:Rftzh5fw/3aLT8zlkCMr2cT7WoRh9taPgDtkEfk+wFo=
+APP_KEY=base64:DLKuAaa5bAytB73eQNHV4KBfRzQxh9ix8J3gc0sbfGc=
 APP_DEBUG=true
 APP_URL=http://localhost
 
diff --git a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/FakeController.php b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/FakeController.php
index 64cd99789de1..165d4b60591e 100644
--- a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/FakeController.php
+++ b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/FakeController.php
@@ -57,7 +57,7 @@ public function testClientModel()
     /**
      * Operation testEndpointParameters
      *
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 .
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트.
      *
      *
      * @return Http response
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesClass.php b/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesClass.php
new file mode 100644
index 000000000000..36069e0804ec
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/AdditionalPropertiesClass.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * AdditionalPropertiesClass
+ */
+namespace app.Models;
+
+/**
+ * AdditionalPropertiesClass
+ */
+class AdditionalPropertiesClass {
+
+    /** @var map[string,string] $map_property */
+    private $map_property;
+
+    /** @var map[string,map[string,string]] $map_of_map_property */
+    private $map_of_map_property;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/Animal.php b/samples/server/petstore/php-laravel/lib/app/Models/Animal.php
new file mode 100644
index 000000000000..f91fead6c2e1
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/Animal.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Animal
+ */
+namespace app.Models;
+
+/**
+ * Animal
+ */
+class Animal {
+
+    /** @var string $class_name */
+    private $class_name;
+
+    /** @var string $color */
+    private $color;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/AnimalFarm.php b/samples/server/petstore/php-laravel/lib/app/Models/AnimalFarm.php
new file mode 100644
index 000000000000..65027bb9a902
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/AnimalFarm.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * AnimalFarm
+ */
+namespace app.Models;
+
+/**
+ * AnimalFarm
+ */
+class 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
new file mode 100644
index 000000000000..c6638f0dd513
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/ApiResponse.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * ApiResponse
+ */
+namespace app.Models;
+
+/**
+ * ApiResponse
+ */
+class ApiResponse {
+
+    /** @var int $code */
+    private $code;
+
+    /** @var string $type */
+    private $type;
+
+    /** @var string $message */
+    private $message;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/ArrayOfArrayOfNumberOnly.php b/samples/server/petstore/php-laravel/lib/app/Models/ArrayOfArrayOfNumberOnly.php
new file mode 100644
index 000000000000..fc87755a8b22
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/ArrayOfArrayOfNumberOnly.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * ArrayOfArrayOfNumberOnly
+ */
+namespace app.Models;
+
+/**
+ * ArrayOfArrayOfNumberOnly
+ */
+class ArrayOfArrayOfNumberOnly {
+
+    /** @var float[][] $array_array_number */
+    private $array_array_number;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/ArrayOfNumberOnly.php b/samples/server/petstore/php-laravel/lib/app/Models/ArrayOfNumberOnly.php
new file mode 100644
index 000000000000..0b1857e80748
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/ArrayOfNumberOnly.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * ArrayOfNumberOnly
+ */
+namespace app.Models;
+
+/**
+ * ArrayOfNumberOnly
+ */
+class ArrayOfNumberOnly {
+
+    /** @var float[] $array_number */
+    private $array_number;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/ArrayTest.php b/samples/server/petstore/php-laravel/lib/app/Models/ArrayTest.php
new file mode 100644
index 000000000000..309a3d52de24
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/ArrayTest.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * ArrayTest
+ */
+namespace app.Models;
+
+/**
+ * ArrayTest
+ */
+class ArrayTest {
+
+    /** @var string[] $array_of_string */
+    private $array_of_string;
+
+    /** @var int[][] $array_array_of_integer */
+    private $array_array_of_integer;
+
+    /** @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
new file mode 100644
index 000000000000..1a7530487261
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/Capitalization.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Capitalization
+ */
+namespace app.Models;
+
+/**
+ * Capitalization
+ */
+class Capitalization {
+
+    /** @var string $small_camel */
+    private $small_camel;
+
+    /** @var string $capital_camel */
+    private $capital_camel;
+
+    /** @var string $small_snake */
+    private $small_snake;
+
+    /** @var string $capital_snake */
+    private $capital_snake;
+
+    /** @var string $sca_eth_flow_points */
+    private $sca_eth_flow_points;
+
+    /** @var string $att_name Name of the pet*/
+    private $att_name;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/Cat.php b/samples/server/petstore/php-laravel/lib/app/Models/Cat.php
new file mode 100644
index 000000000000..d4699ebd10f7
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/Cat.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Cat
+ */
+namespace app.Models;
+
+/**
+ * Cat
+ */
+class Cat {
+
+    /** @var string $class_name */
+    private $class_name;
+
+    /** @var string $color */
+    private $color;
+
+    /** @var bool $declawed */
+    private $declawed;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/Category.php b/samples/server/petstore/php-laravel/lib/app/Models/Category.php
new file mode 100644
index 000000000000..d9db05a3db10
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/Category.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Category
+ */
+namespace app.Models;
+
+/**
+ * Category
+ */
+class Category {
+
+    /** @var int $id */
+    private $id;
+
+    /** @var string $name */
+    private $name;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/ClassModel.php b/samples/server/petstore/php-laravel/lib/app/Models/ClassModel.php
new file mode 100644
index 000000000000..7141c47adfc0
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/ClassModel.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * ClassModel
+ */
+namespace app.Models;
+
+/**
+ * ClassModel
+ */
+class ClassModel {
+
+    /** @var string $_class */
+    private $_class;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/Client.php b/samples/server/petstore/php-laravel/lib/app/Models/Client.php
new file mode 100644
index 000000000000..7e479bd48b16
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/Client.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Client
+ */
+namespace app.Models;
+
+/**
+ * Client
+ */
+class Client {
+
+    /** @var string $client */
+    private $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
new file mode 100644
index 000000000000..c839a4695725
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/Dog.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Dog
+ */
+namespace app.Models;
+
+/**
+ * Dog
+ */
+class Dog {
+
+    /** @var string $class_name */
+    private $class_name;
+
+    /** @var string $color */
+    private $color;
+
+    /** @var string $breed */
+    private $breed;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/EnumArrays.php b/samples/server/petstore/php-laravel/lib/app/Models/EnumArrays.php
new file mode 100644
index 000000000000..950c80b823c5
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/EnumArrays.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * EnumArrays
+ */
+namespace app.Models;
+
+/**
+ * EnumArrays
+ */
+class EnumArrays {
+
+    /** @var string $just_symbol */
+    private $just_symbol;
+
+    /** @var string[] $array_enum */
+    private $array_enum;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/EnumClass.php b/samples/server/petstore/php-laravel/lib/app/Models/EnumClass.php
new file mode 100644
index 000000000000..5bb41f9946a3
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/EnumClass.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * EnumClass
+ */
+namespace app.Models;
+
+/**
+ * EnumClass
+ */
+class 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
new file mode 100644
index 000000000000..500ee9d7a261
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/EnumTest.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * EnumTest
+ */
+namespace app.Models;
+
+/**
+ * EnumTest
+ */
+class EnumTest {
+
+    /** @var string $enum_string */
+    private $enum_string;
+
+    /** @var string $enum_string_required */
+    private $enum_string_required;
+
+    /** @var int $enum_integer */
+    private $enum_integer;
+
+    /** @var double $enum_number */
+    private $enum_number;
+
+    /** @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
new file mode 100644
index 000000000000..8beee0391821
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/FileSchemaTestClass.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * FileSchemaTestClass
+ */
+namespace app.Models;
+
+/**
+ * FileSchemaTestClass
+ */
+class FileSchemaTestClass {
+
+    /** @var \app.Models\File $file */
+    private $file;
+
+    /** @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
new file mode 100644
index 000000000000..c76f8a0913d1
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/FormatTest.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * FormatTest
+ */
+namespace app.Models;
+
+/**
+ * FormatTest
+ */
+class FormatTest {
+
+    /** @var int $integer */
+    private $integer;
+
+    /** @var int $int32 */
+    private $int32;
+
+    /** @var int $int64 */
+    private $int64;
+
+    /** @var float $number */
+    private $number;
+
+    /** @var float $float */
+    private $float;
+
+    /** @var double $double */
+    private $double;
+
+    /** @var string $string */
+    private $string;
+
+    /** @var string $byte */
+    private $byte;
+
+    /** @var \SplFileObject $binary */
+    private $binary;
+
+    /** @var \DateTime $date */
+    private $date;
+
+    /** @var \DateTime $date_time */
+    private $date_time;
+
+    /** @var string $uuid */
+    private $uuid;
+
+    /** @var string $password */
+    private $password;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/HasOnlyReadOnly.php b/samples/server/petstore/php-laravel/lib/app/Models/HasOnlyReadOnly.php
new file mode 100644
index 000000000000..a562410cdb07
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/HasOnlyReadOnly.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * HasOnlyReadOnly
+ */
+namespace app.Models;
+
+/**
+ * HasOnlyReadOnly
+ */
+class HasOnlyReadOnly {
+
+    /** @var string $bar */
+    private $bar;
+
+    /** @var string $foo */
+    private $foo;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/MapTest.php b/samples/server/petstore/php-laravel/lib/app/Models/MapTest.php
new file mode 100644
index 000000000000..56f1e67c8089
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/MapTest.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * MapTest
+ */
+namespace app.Models;
+
+/**
+ * MapTest
+ */
+class MapTest {
+
+    /** @var map[string,map[string,string]] $map_map_of_string */
+    private $map_map_of_string;
+
+    /** @var map[string,string] $map_of_enum_string */
+    private $map_of_enum_string;
+
+    /** @var map[string,bool] $direct_map */
+    private $direct_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
new file mode 100644
index 000000000000..17403f9a71e9
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/MixedPropertiesAndAdditionalPropertiesClass.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * MixedPropertiesAndAdditionalPropertiesClass
+ */
+namespace app.Models;
+
+/**
+ * MixedPropertiesAndAdditionalPropertiesClass
+ */
+class MixedPropertiesAndAdditionalPropertiesClass {
+
+    /** @var string $uuid */
+    private $uuid;
+
+    /** @var \DateTime $date_time */
+    private $date_time;
+
+    /** @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
new file mode 100644
index 000000000000..a196695ebe06
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/Model200Response.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Model200Response
+ */
+namespace app.Models;
+
+/**
+ * Model200Response
+ */
+class Model200Response {
+
+    /** @var int $name */
+    private $name;
+
+    /** @var string $class */
+    private $class;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/ModelReturn.php b/samples/server/petstore/php-laravel/lib/app/Models/ModelReturn.php
new file mode 100644
index 000000000000..d89221b20848
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/ModelReturn.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * ModelReturn
+ */
+namespace app.Models;
+
+/**
+ * ModelReturn
+ */
+class ModelReturn {
+
+    /** @var int $return */
+    private $return;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/Name.php b/samples/server/petstore/php-laravel/lib/app/Models/Name.php
new file mode 100644
index 000000000000..e14c48c322c5
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/Name.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Name
+ */
+namespace app.Models;
+
+/**
+ * Name
+ */
+class Name {
+
+    /** @var int $name */
+    private $name;
+
+    /** @var int $snake_case */
+    private $snake_case;
+
+    /** @var string $property */
+    private $property;
+
+    /** @var int $_123_number */
+    private $_123_number;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/NumberOnly.php b/samples/server/petstore/php-laravel/lib/app/Models/NumberOnly.php
new file mode 100644
index 000000000000..ed0e08e79413
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/NumberOnly.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * NumberOnly
+ */
+namespace app.Models;
+
+/**
+ * NumberOnly
+ */
+class NumberOnly {
+
+    /** @var float $just_number */
+    private $just_number;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/Order.php b/samples/server/petstore/php-laravel/lib/app/Models/Order.php
new file mode 100644
index 000000000000..b0aa92221231
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/Order.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Order
+ */
+namespace app.Models;
+
+/**
+ * Order
+ */
+class Order {
+
+    /** @var int $id */
+    private $id;
+
+    /** @var int $pet_id */
+    private $pet_id;
+
+    /** @var int $quantity */
+    private $quantity;
+
+    /** @var \DateTime $ship_date */
+    private $ship_date;
+
+    /** @var string $status Order Status*/
+    private $status;
+
+    /** @var bool $complete */
+    private $complete;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/OuterComposite.php b/samples/server/petstore/php-laravel/lib/app/Models/OuterComposite.php
new file mode 100644
index 000000000000..214305c6c852
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/OuterComposite.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * OuterComposite
+ */
+namespace app.Models;
+
+/**
+ * OuterComposite
+ */
+class OuterComposite {
+
+    /** @var float $my_number */
+    private $my_number;
+
+    /** @var string $my_string */
+    private $my_string;
+
+    /** @var bool $my_boolean */
+    private $my_boolean;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/OuterEnum.php b/samples/server/petstore/php-laravel/lib/app/Models/OuterEnum.php
new file mode 100644
index 000000000000..d83c9c9009af
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/OuterEnum.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * OuterEnum
+ */
+namespace app.Models;
+
+/**
+ * OuterEnum
+ */
+class 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
new file mode 100644
index 000000000000..59e5388db96e
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/Pet.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Pet
+ */
+namespace app.Models;
+
+/**
+ * Pet
+ */
+class Pet {
+
+    /** @var int $id */
+    private $id;
+
+    /** @var \app.Models\Category $category */
+    private $category;
+
+    /** @var string $name */
+    private $name;
+
+    /** @var string[] $photo_urls */
+    private $photo_urls;
+
+    /** @var \app.Models\Tag[] $tags */
+    private $tags;
+
+    /** @var string $status pet status in the store*/
+    private $status;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/ReadOnlyFirst.php b/samples/server/petstore/php-laravel/lib/app/Models/ReadOnlyFirst.php
new file mode 100644
index 000000000000..7a41e8765911
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/ReadOnlyFirst.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * ReadOnlyFirst
+ */
+namespace app.Models;
+
+/**
+ * ReadOnlyFirst
+ */
+class ReadOnlyFirst {
+
+    /** @var string $bar */
+    private $bar;
+
+    /** @var string $baz */
+    private $baz;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/SpecialModelName.php b/samples/server/petstore/php-laravel/lib/app/Models/SpecialModelName.php
new file mode 100644
index 000000000000..03f59631e185
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/SpecialModelName.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * SpecialModelName
+ */
+namespace app.Models;
+
+/**
+ * SpecialModelName
+ */
+class SpecialModelName {
+
+    /** @var int $special_property_name */
+    private $special_property_name;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/StringBooleanMap.php b/samples/server/petstore/php-laravel/lib/app/Models/StringBooleanMap.php
new file mode 100644
index 000000000000..03fc9624e608
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/StringBooleanMap.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * StringBooleanMap
+ */
+namespace app.Models;
+
+/**
+ * StringBooleanMap
+ */
+class 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
new file mode 100644
index 000000000000..716de4ea5176
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/Tag.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Tag
+ */
+namespace app.Models;
+
+/**
+ * Tag
+ */
+class Tag {
+
+    /** @var int $id */
+    private $id;
+
+    /** @var string $name */
+    private $name;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/User.php b/samples/server/petstore/php-laravel/lib/app/Models/User.php
new file mode 100644
index 000000000000..dbb78b5ce126
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/User.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * User
+ */
+namespace app.Models;
+
+/**
+ * User
+ */
+class User {
+
+    /** @var int $id */
+    private $id;
+
+    /** @var string $username */
+    private $username;
+
+    /** @var string $first_name */
+    private $first_name;
+
+    /** @var string $last_name */
+    private $last_name;
+
+    /** @var string $email */
+    private $email;
+
+    /** @var string $password */
+    private $password;
+
+    /** @var string $phone */
+    private $phone;
+
+    /** @var int $user_status User Status*/
+    private $user_status;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/app/Providers/RouteServiceProvider.php b/samples/server/petstore/php-laravel/lib/app/Providers/RouteServiceProvider.php
index 5ea48d39d4f9..b36415e85f3f 100644
--- a/samples/server/petstore/php-laravel/lib/app/Providers/RouteServiceProvider.php
+++ b/samples/server/petstore/php-laravel/lib/app/Providers/RouteServiceProvider.php
@@ -65,8 +65,7 @@ protected function mapWebRoutes()
      */
     protected function mapApiRoutes()
     {
-        Route::prefix('api')
-             ->middleware('api')
+        Route::middleware('api')
              ->namespace($this->namespace)
              ->group(base_path('routes/api.php'));
     }
diff --git a/samples/server/petstore/php-laravel/lib/routes/api.php b/samples/server/petstore/php-laravel/lib/routes/api.php
index ea86c0e0a4e8..f1b9f3f14a1a 100644
--- a/samples/server/petstore/php-laravel/lib/routes/api.php
+++ b/samples/server/petstore/php-laravel/lib/routes/api.php
@@ -32,8 +32,8 @@
 Route::patch('/v2/fake', 'FakeController@testClientModel');
 /**
  * post testEndpointParameters
- * Summary: Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
- * Notes: Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+ * Summary: Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
+ * Notes: Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
 
  */
 Route::post('/v2/fake', 'FakeController@testEndpointParameters');