nullable type allows null value v2

Zrnik · May 31, 2024 · c1eb175 · c1eb175
1 parent 5044462
commit c1eb175
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/PHPUnit/OpenApiSchemaCheck.php b/src/PHPUnit/OpenApiSchemaCheck.php
@@ -72,13 +72,20 @@ public function assertSchemaReturnsCorrectJson(object $schemaObject, ?string $me
 
                 /** @var string|class-string $forcedType */
                 foreach ($forcedTypes as $forcedType) {
+                    /** @noinspection NotOptimalIfConditionsInspection */
+                    /** @noinspection PhpParamsInspection */
                     if ($this->objectExists($forcedType) && ($value instanceof $forcedType) && $this->isSchemaClass($value)) {
+                        /** @noinspection PhpParamsInspection */
                         $this->assertSchemaReturnsCorrectJson($value);
                         continue 2;
                     }
 
                     $types[] = $forcedType;
                 }
+
+                if($schemaAttribute->nullable === true) {
+                    $types[] = 'null';
+                }
             }
 
             if ($forcedType === null) {
@@ -92,15 +99,15 @@ public function assertSchemaReturnsCorrectJson(object $schemaObject, ?string $me
                      */
                     foreach ($reflectionTypeContainer->getTypes() as $reflectionNamedType) {
                         $types[] = $reflectionNamedType->getName();
-                        if($reflectionNamedType->allowsNull()) {
+                        if ($reflectionNamedType->allowsNull()) {
                             $types[] = 'null';
                         }
                     }
                 }
 
                 if ($reflectionTypeContainer instanceof ReflectionNamedType) {
                     $types[] = $reflectionTypeContainer->getName();
-                    if($reflectionTypeContainer->allowsNull()) {
+                    if ($reflectionTypeContainer->allowsNull()) {
                         $types[] = 'null';
                     }
                 }
@@ -109,7 +116,7 @@ public function assertSchemaReturnsCorrectJson(object $schemaObject, ?string $me
                     /** @var ReflectionNamedType $reflectionNamedType */
                     foreach ($reflectionTypeContainer->getTypes() as $reflectionNamedType) {
                         $types[] = $reflectionNamedType->getName();
-                        if($reflectionNamedType->allowsNull()) {
+                        if ($reflectionNamedType->allowsNull()) {
                             $types[] = 'null';
                         }
                     }

diff --git a/tests/ExampleSchema/SchemaClass.php b/tests/ExampleSchema/SchemaClass.php
@@ -23,6 +23,8 @@ public function __construct(
         public readonly ?string $nullableText = 'nullable-text',
         #[Property(nullable: true)]
         public readonly ?string $nullableTextIsNull = null,
+        #[Property(type: 'string', nullable: true)]
+        public readonly ?string $nullableWithForcedTypeTextIsNull = null,
         #[Property]
         public readonly RuntimeException|LogicException|MisconfiguredOpenApiGeneratorException $unionExceptionProperty = new RuntimeException(),
         #[Property(type: UnrelatedSchemaClass::class)]
@@ -48,6 +50,7 @@ public function jsonSerialize(): array
             'text' => $this->text,
             'nullableText' => $this->nullableText,
             'nullableTextIsNull' => $this->nullableTextIsNull,
+            'nullableWithForcedTypeTextIsNull' => $this->nullableWithForcedTypeTextIsNull,
             'unionExceptionProperty' => $this->unionExceptionProperty,
             'unrelatedSchema' => new UnrelatedSchemaClass(),
             'unrelatedNonSchemaClass' => new NotASchemaClass(),