#81781

Author: Anton Filippov

src/Data/OpenApi3/OpenApi3Object.php

@@ -24,13 +24,13 @@ public function fillFromStdObject(stdClass $object): void
                 /** @var OpenApi3ObjectProperty $objectProperty */
                 $objectProperty = $this->properties->get($propertyName);
                 if (!$objectProperty) {
-                    $objectProperty = new OpenApi3ObjectProperty(type: $property->type, name: $propertyName, );
+                    $objectProperty = new OpenApi3ObjectProperty(type: $property->type, name: $propertyName);
                     $this->properties->put($propertyName, $objectProperty);
                 }
                 $objectProperty->fillFromStdProperty($propertyName, $property);
             }
         }
-        if (std_object_has($object, 'required')) {
+        if (std_object_has($object, 'required') && is_array($object->required)) {
             foreach ($object->required as $requiredProperty) {
                 $objectProperty = $this->properties->get($requiredProperty);
                 if (!$objectProperty) {

templates/Request.template

@@ -5,18 +5,8 @@ namespace {{ namespace }};
 use App\Http\ApiV1\Support\Requests\BaseFormRequest;
 {{ uses }}
 
-class {{ className }} extends FormRequest
+class {{ className }} extends BaseFormRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        return false;
-    }
-
     /**
      * Get the validation rules that apply to the request.
      *

tests/GenerateServerTest.php

@@ -41,6 +41,7 @@
         $this->makeFilePath('/app/Http/Requests/TestFullGenerateRequest.php'),
         $this->makeFilePath('/app/Http/Tests/ResourcesComponentTest.php'),
         $this->makeFilePath('/app/Http/Requests/TestFooRenameRequest.php'),
+        $this->makeFilePath('/app/Http/Requests/LaravelValidationsRequest.php'),
 
         $this->makeFilePath('/app/Http/Controllers/WithoutResponsesController.php'),
 

tests/LaravelValidationRulesRequestTest.php

@@ -0,0 +1,37 @@
+<?php
+
+use Ensi\LaravelOpenApiServerGenerator\Commands\GenerateServer;
+use Ensi\LaravelOpenApiServerGenerator\Tests\TestCase;
+use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Facades\Config;
+use function Pest\Laravel\artisan;
+use function PHPUnit\Framework\assertStringEqualsFile;
+
+test('Create Request from ResourceForTestValidationRules', function () {
+    /** @var TestCase $this */
+    $mapping = Config::get('openapi-server-generator.api_docs_mappings');
+    $mappingValue = current($mapping);
+    $mapping = [$this->makeFilePath(__DIR__ . '/resources/index.yaml') => $mappingValue];
+    Config::set('openapi-server-generator.api_docs_mappings', $mapping);
+
+    $filesystem = $this->mock(Filesystem::class);
+    $filesystem->shouldReceive('exists')->andReturn(false);
+    $filesystem->shouldReceive('get')->withArgs(function ($path) {
+        return (bool)strstr($path, '.template');
+    })->andReturnUsing(function ($path) {
+        return file_get_contents($path);
+    });
+    $filesystem->shouldReceive('cleanDirectory', 'ensureDirectoryExists');
+    $request = null;
+    $filesystem->shouldReceive('put')->withArgs(function ($path, $content) use (&$request) {
+        if (str_contains($path, 'LaravelValidationsRequest.php')) {
+            $request = $content;
+        }
+
+        return true;
+    });
+
+    artisan(GenerateServer::class);
+
+    assertStringEqualsFile(__DIR__ . '/expects/LaravelValidationsRequest.php', $request);
+});

tests/RequestLaravelValidationRulesTest.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Http\ApiV1\Support\Requests\BaseFormRequest;
+use App\Http\ApiV1\OpenApiGenerated\Enums\TestIntegerEnum;
+use Illuminate\Validation\Rules\Enum;
+
+class LaravelValidationsRequest extends BaseFormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'field_object_nullable' => ['nullable'],
+            'field_object_nullable.field' => ['integer'],
+            'field_array_nullable' => ['nullable', 'array'],
+            'field_array_nullable.*.field' => ['integer'],
+            'field_enum_nullable' => ['nullable', new Enum(TestIntegerEnum::class)],
+            'field_number_nullable' => ['nullable', 'numeric'],
+            'field_boolean_nullable' => ['nullable', 'boolean'],
+            'field_string_nullable' => ['nullable', 'string'],
+            'field_integer_nullable' => ['nullable', 'integer'],
+            'field_object_required' => ['required'],
+            'field_object_required.field' => ['integer'],
+            'field_array_required' => ['required', 'array'],
+            'field_array_required.*.field' => ['integer'],
+            'field_enum_required' => [new Enum(TestIntegerEnum::class)],
+            'field_number_required' => ['required', 'numeric'],
+            'field_boolean_required' => ['required', 'boolean'],
+            'field_string_required' => ['required', 'string'],
+            'field_integer_required' => ['required', 'integer'],
+            'field_object' => ['required'],
+            'field_object.field' => ['integer'],
+            'field_array' => ['required', 'array'],
+            'field_array.*.field' => ['integer'],
+            'field_enum' => ['required', new Enum(TestIntegerEnum::class)],
+            'field_number' => ['required', 'numeric'],
+            'field_boolean' => ['required', 'boolean'],
+            'field_string' => ['required', 'string'],
+            'field_integer' => ['required', 'integer'],
+        ];
+    }
+}

tests/expects/LaravelValidationsRequest.php

@@ -75,14 +75,14 @@ paths:
       x-lg-skip-request-generation: true
   /resources:test-laravel-validations-request:
     post:
-      operationId: laravelValidationsRequest
+      operationId: laravelValidations
       x-lg-handler: '\App\Http\Controllers\ResourcesController@testLaravelValidationsRequest'
       requestBody:
         required: true
         content:
           application/json:
             schema:
-              $ref: './schemas/resources.yaml#/ResourceForTestValidationRulesRequest'
+              $ref: './schemas/resources.yaml#/ResourceForTestValidationRules'
       responses:
         "200":
           description: Успешный ответ

tests/resources/index.yaml

@@ -110,6 +110,7 @@ ResourceFillableForTestValidationRules:
         field:
           type: integer
       nullable: true
+
 ResourceRequiredForTestValidationRules:
   type: object
   required:
@@ -122,7 +123,7 @@ ResourceRequiredForTestValidationRules:
     - field_object
 
 #Requests
-ResourceForTestValidationRulesRequest:
+ResourceForTestValidationRules:
       allOf:
         - $ref: '#/ResourceFillableForTestValidationRules'
         - $ref: '#/ResourceRequiredForTestValidationRules'