feat (PHP LARAVEL) 8417: adjust route service provdider and model generation

Author: renepardon

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();

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'));
     }

samples/server/petstore/php-laravel/.openapi-generator/VERSION

@@ -1 +1 @@
-4.0.0-SNAPSHOT
+3.1.2-SNAPSHOT

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
 

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

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;
+
+}

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;
+
+}

samples/server/petstore/php-laravel/lib/app/Models/AnimalFarm.php

@@ -0,0 +1,12 @@
+<?php
+/**
+ * AnimalFarm
+ */
+namespace app.Models;
+
+/**
+ * AnimalFarm
+ */
+class AnimalFarm {
+
+}

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;
+
+}

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;
+
+}

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;
+
+}

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;
+
+}

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;
+
+}

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;
+
+}

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;
+
+}

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;
+
+}

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;
+
+}

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;
+
+}

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;
+
+}

samples/server/petstore/php-laravel/lib/app/Models/EnumClass.php

@@ -0,0 +1,12 @@
+<?php
+/**
+ * EnumClass
+ */
+namespace app.Models;
+
+/**
+ * EnumClass
+ */
+class EnumClass {
+
+}

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;
+
+}

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;
+
+}