v3.1

Author: fenric

composer.json

@@ -32,7 +32,7 @@
     "psr/log": "^1.0 || ^2.0 || ^3.0",
     "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
     "sunrise/coder": "^1.1",
-    "sunrise/hydrator": "^3.16",
+    "sunrise/hydrator": "^3.18",
     "sunrise/translator": "^1.0"
   },
   "require-dev": {

src/OpenApi/PhpTypeSchemaResolver/StringPhpTypeSchemaResolver.php

@@ -14,6 +14,7 @@
 namespace Sunrise\Http\Router\OpenApi\PhpTypeSchemaResolver;
 
 use ReflectionParameter;
+use ReflectionProperty;
 use Reflector;
 use SensitiveParameter;
 use Sunrise\Http\Router\OpenApi\Exception\UnsupportedPhpTypeException;
@@ -47,6 +48,18 @@ public function resolvePhpTypeSchema(Type $phpType, Reflector $phpTypeHolder): a
             }
         }
 
+        if ($phpTypeHolder instanceof ReflectionProperty) {
+            foreach ($phpTypeHolder->getDeclaringClass()->getConstructor()?->getParameters() ?? [] as $parameter) {
+                if ($parameter->name === $phpTypeHolder->name) {
+                    if ($parameter->isPromoted() && $parameter->getAttributes(SensitiveParameter::class) !== []) {
+                        $phpTypeSchema['format'] = 'password';
+                    }
+
+                    break;
+                }
+            }
+        }
+
         return $phpTypeSchema;
     }
 

src/OpenApi/PhpTypeSchemaResolver/SymfonyUidPhpTypeSchemaResolver.php

@@ -20,6 +20,7 @@
 use Symfony\Component\Uid\AbstractUid;
 use Symfony\Component\Uid\Uuid;
 
+use function is_a;
 use function is_subclass_of;
 
 /**
@@ -43,7 +44,7 @@ public function resolvePhpTypeSchema(Type $phpType, Reflector $phpTypeHolder): a
             'type' => Type::OAS_TYPE_NAME_STRING,
         ];
 
-        if (is_subclass_of($phpType->name, Uuid::class)) {
+        if (is_a($phpType->name, Uuid::class, true)) {
             $phpTypeSchema['format'] = 'uuid';
         }
 

src/Validation/ConstraintViolation/HydratorConstraintViolationAdapter.php

@@ -14,7 +14,6 @@
 namespace Sunrise\Http\Router\Validation\ConstraintViolation;
 
 use Sunrise\Http\Router\Validation\ConstraintViolationInterface;
-use Sunrise\Hydrator\Dictionary\TranslationDomain;
 use Sunrise\Hydrator\Exception\InvalidValueException;
 
 /**
@@ -67,6 +66,6 @@ public function getInvalidValue(): mixed
 
     public function getTranslationDomain(): string
     {
-        return TranslationDomain::HYDRATOR;
+        return $this->hydratorConstraintViolation->getTranslationDomain();
     }
 }

tests/Fixture/App/Controller/Api/AuthController.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sunrise\Http\Router\Tests\Fixture\App\Controller\Api;
+
+use Sunrise\Http\Router\Annotation\Consumes;
+use Sunrise\Http\Router\Annotation\PostApiRoute;
+use Sunrise\Http\Router\Annotation\RequestBody;
+use Sunrise\Http\Router\Dictionary\MediaType;
+use Sunrise\Http\Router\Tests\Fixture\App\Dto\Auth\SignInRequest;
+
+final class AuthController extends AbstractController
+{
+    #[PostApiRoute('signIn', '/sign-in')]
+    #[Consumes(MediaType::JSON)]
+    public function signIn(#[RequestBody] SignInRequest $signInRequest): void
+    {
+    }
+}

tests/Fixture/App/Dto/Auth/SignInRequest.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sunrise\Http\Router\Tests\Fixture\App\Dto\Auth;
+
+use SensitiveParameter;
+
+final class SignInRequest
+{
+    public function __construct(
+        #[SensitiveParameter]
+        public readonly string $email,
+        #[SensitiveParameter]
+        public readonly string $password,
+    ) {
+    }
+}

tests/Fixture/App/Dto/Product/ProductTagDto.php

@@ -4,12 +4,12 @@
 
 namespace Sunrise\Http\Router\Tests\Fixture\App\Dto\Product;
 
-use Symfony\Component\Uid\UuidV4;
+use Symfony\Component\Uid\Uuid;
 
 final class ProductTagDto
 {
     public function __construct(
-        public readonly UuidV4 $id,
+        public readonly Uuid $id,
     ) {
     }
 }

tests/Fixture/App/openapi.json

@@ -26,6 +26,42 @@
         "description": ""
       }
     },
+    "/api/sign-in": {
+      "post": {
+        "externalDocs": {
+          "description": "Find more info here",
+          "url": "https://example.com"
+        },
+        "parameters": [
+          {
+            "in": "header",
+            "name": "X-Request-ID",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "The operation was successful."
+          }
+        },
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Sunrise.Http.Router.Tests.Fixture.App.Dto.Auth.SignInRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "operationId": "api.signIn",
+        "tags": [],
+        "summary": "",
+        "description": ""
+      }
+    },
     "/api/products": {
       "post": {
         "externalDocs": {
@@ -308,6 +344,24 @@
   },
   "components": {
     "schemas": {
+      "Sunrise.Http.Router.Tests.Fixture.App.Dto.Auth.SignInRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "email": {
+            "type": "string",
+            "format": "password"
+          },
+          "password": {
+            "type": "string",
+            "format": "password"
+          }
+        },
+        "required": [
+          "email",
+          "password"
+        ]
+      },
       "Sunrise.Http.Router.Tests.Fixture.App.Dto.Product.ProductTagDto": {
         "type": "object",
         "additionalProperties": false,