Expects true fails if the throwable is null

phpstan-baseline.neon

@@ -6,7 +6,7 @@ parameters:
 			path: src/Assertions.php
 
 		-
-			message: "#^Method Spectator\\\\Assertions\\:\\:expectsTrue\\(\\) invoked with 2 parameters, 0 required\\.$#"
+			message: "#^Method Spectator\\\\Assertions\\:\\:expectsTrue\\(\\) invoked with 3 parameters, 0 required\\.$#"
 			count: 2
 			path: src/Assertions.php
 

src/Assertions.php

@@ -55,7 +55,7 @@ public function assertInvalidRequest()
             $this->expectsTrue($exception, [
                 InvalidPathException::class,
                 RequestValidationException::class,
-            ]);
+            ], 'Failed asserting that the request is invalid.');
 
             return $this;
         });
@@ -103,7 +103,7 @@ public function assertInvalidResponse()
             $this->expectsTrue($exception, [
                 InvalidPathException::class,
                 ResponseValidationException::class,
-            ]);
+            ], 'Failed asserting that the response is invalid.');
 
             if ($status) {
                 $actual = $this->getStatusCode();

src/Concerns/HasExpectations.php

@@ -35,7 +35,7 @@ public function expectsTrue()
          * @param array $exceptions
          * @return void
          */
-        return function (?Throwable $throwable = null, array $exceptions = []) {
+        return function (?Throwable $throwable = null, array $exceptions = [], string $message = '') {
             if ($throwable) {
                 $class = get_class($throwable);
 
@@ -44,7 +44,7 @@ public function expectsTrue()
                     $throwable->getMessage(),
                 );
             } else {
-                PHPUnit::assertTrue(true);
+                PHPUnit::assertTrue(false, $message);
             }
         };
     }

src/Validation/RequestValidator.php

@@ -114,18 +114,27 @@ protected function validateParameters()
                     if (isset($expectedParameterSchema->type) && gettype($parameterValue) !== $expectedParameterSchema->type) {
                         $expectedType = $expectedParameterSchema->type;
 
-                        if ($expectedType === 'number') {
-                            $expectedType = is_float($parameterValue) ? 'float' : 'int';
+                        $expectedType = match ($expectedType) {
+                            'integer' => 'int',
+                            'number' => 'float',
+                            default => $expectedType,
+                        };
+
+                        if (is_numeric($parameterValue)) {
+                            $parameterValue = match ($expectedType) {
+                                'int' => (int) $parameterValue,
+                                'float' => (float) $parameterValue,
+                                default => $parameterValue,
+                            };
                         }
-
-                        settype($parameterValue, $expectedType);
                     }
 
                     $result = $validator->validate($parameterValue, $expectedParameterSchema);
 
                     // If the result is not valid, then display failure reason.
                     if ($result->isValid() === false) {
-                        $message = RequestValidationException::validationErrorMessage($expectedParameterSchema, $result->error());
+                        $message = RequestValidationException::validationErrorMessage($expectedParameterSchema,
+                            $result->error());
 
                         throw RequestValidationException::withError($message, $result->error());
                     }

tests/Fixtures/AllOf.v1.yml

@@ -48,6 +48,9 @@ paths:
                             owner:
                               type: string
                               nullable: true
+                          required:
+                            - id
+                            - owner
                         - $ref: '#/components/schemas/Dog'
 
 components:

tests/Fixtures/Enum.yml

@@ -27,7 +27,7 @@ paths:
         name: type
         required: true
         schema:
-          $refs: '#/components/schemas/TestEnum'
+          $ref: '#/components/schemas/TestEnum'
     get:
       summary: Request with enum in path via reference
       tags: []

tests/RequestValidatorTest.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\UploadedFile;
-use Illuminate\Routing\Exceptions\BackedEnumCaseNotFoundException;
 use Illuminate\Routing\Middleware\SubstituteBindings;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Route;
@@ -793,8 +792,6 @@ public function test_enum_in_path(string $type, bool $isValid): void
     {
         Spectator::using('Enum.yml');
 
-        $this->withoutExceptionHandling([BackedEnumCaseNotFoundException::class]);
-
         Route::get('/enum-in-path/{type}', function (TestEnum $type) {
             return response()->noContent();
         })->middleware([SubstituteBindings::class, Middleware::class]);
@@ -815,8 +812,6 @@ public function test_enum_in_path_via_reference(string $type, bool $isValid): vo
     {
         Spectator::using('Enum.yml');
 
-        $this->withoutExceptionHandling([BackedEnumCaseNotFoundException::class]);
-
         Route::get('/enum-in-path-via-reference/{type}', function (TestEnum $type) {
             return response()->noContent();
         })->middleware([SubstituteBindings::class, Middleware::class]);
@@ -838,7 +833,7 @@ public static function enumProvider(): array
                 true,
             ],
             'invalid enum' => [
-                'foo',
+                'invalid',
                 false,
             ],
         ];
@@ -853,4 +848,5 @@ enum TestEnum: string
 {
     case name = 'name';
     case email = 'email';
+    case invalid = 'invalid';
 }

tests/ResponseValidatorTest.php

@@ -2,6 +2,7 @@
 
 namespace Spectator\Tests;
 
+use ErrorException;
 use Exception;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Route;
@@ -69,6 +70,26 @@ public function test_validates_invalid_json_response(): void
             ->assertValidationMessage('All array items must match schema');
     }
 
+    public function test_fails_to_invalidate_valid_json_response(): void
+    {
+        Route::get('/users', static function () {
+            return [
+                [
+                    'id' => 1,
+                    'name' => 'Jim',
+                    'email' => '[email protected]',
+                ],
+            ];
+        })->middleware(Middleware::class);
+
+        $this->expectException(ErrorException::class);
+        $this->expectExceptionMessage("Failed asserting that the response is invalid.\nFailed asserting that false is true.");
+
+        $this->getJson('/users')
+            ->assertValidRequest()
+            ->assertInvalidResponse();
+    }
+
     public function test_validates_valid_streamed_json_response(): void
     {
         Route::get('/users', static function () {
@@ -421,10 +442,6 @@ public function test_nullable_array_of_nullable_strings($version, $payload, $isV
             return ['data' => $payload];
         })->middleware(Middleware::class);
 
-        $this->getJson('/nullable-array-of-nullable-string')
-            ->assertValidRequest()
-            ->assertValidResponse();
-
         if ($isValid) {
             $this->getJson('/nullable-array-of-nullable-string')
                 ->assertValidRequest()
@@ -462,7 +479,7 @@ public static function nullableArrayOfNullableStringsProvider()
             ],
             '3.0, array with int' => [
                 $v30,
-                ['foo', null],
+                [1, null],
                 $invalidResponse,
             ],
             '3.1, null' => [
@@ -482,10 +499,9 @@ public static function nullableArrayOfNullableStringsProvider()
             ],
             '3.1, array with int' => [
                 $v31,
-                ['foo', null],
+                [1, null],
                 $invalidResponse,
             ],
-
         ];
     }
 
@@ -749,7 +765,7 @@ public static function allOfWithNullableProvider(): array
                 ],
                 $invalid,
             ],
-            'invalid, invalid owner missing' => [
+            'invalid, invalid owner' => [
                 [
                     'id' => 1,
                     'pet_type' => 'Dog',