Merge branch 'main' into feat/improve-error-responses

src/Support/OperationExtensions/RulesExtractor/RulesMapper.php

@@ -24,29 +24,29 @@ public function __construct(TypeTransformer $openApiTransformer)
         $this->openApiTransformer = $openApiTransformer;
     }
 
-    public function string(Type $_)
+    public function string(Type $prevType)
     {
-        return new StringType;
+        return (new StringType)->addProperties($prevType);
     }
 
-    public function bool(Type $_)
+    public function bool(Type $prevType)
     {
-        return new BooleanType;
+        return (new BooleanType)->addProperties($prevType);
     }
 
     public function boolean(Type $_)
     {
         return $this->bool($_);
     }
 
-    public function numeric(Type $_)
+    public function numeric(Type $prevType)
     {
-        return new NumberType;
+        return (new NumberType)->addProperties($prevType);
     }
 
-    public function int(Type $_)
+    public function int(Type $prevType)
     {
-        return new IntegerType;
+        return (new IntegerType)->addProperties($prevType);
     }
 
     public function integer(Type $_)

tests/ValidationRulesDocumentingTest.php

@@ -212,6 +212,21 @@
         ->toHaveKey('maxItems', 8);
 });
 
+it('documents nullable uri rule', function () {
+    $rules = [
+        'page_url' => ['nullable', 'url'],
+    ];
+
+    $params = app()->make(RulesToParameters::class, ['rules' => $rules])->handle();
+
+    expect($params = collect($params)->all())
+        ->toHaveCount(1)
+        ->and($params[0]->schema->type)
+        ->toBeInstanceOf(\Dedoc\Scramble\Support\Generator\Types\StringType::class)
+        ->toHaveProperty('format', 'uri')
+        ->toHaveProperty('nullable', true);
+});
+
 it('extracts rules from request->validate call', function () {
     RouteFacade::get('api/test', [ValidationRulesDocumenting_Test::class, 'index']);