Kill mutants

infection.json.dist

@@ -8,6 +8,6 @@
     "logs": {
         "text": "infection.log"
     },
-    "minMsi": 84.54,
-    "minCoveredMsi": 85.42
+    "minMsi": 100,
+    "minCoveredMsi": 100
 }

src/Routing/CreateAndFetchEndpoint.php

@@ -15,7 +15,7 @@ final class CreateAndFetchEndpoint extends Endpoint
     public ?string $query;
     public ?string $redirectTo;
 
-    /** @param mixed[] $values */
+    /** @param array{path?: string, value?: string, name?: string, app?: string, methods?: list<string>, command?: string, query?: string, redirectTo?: string} $values */
     public function __construct(array $values)
     {
         parent::__construct($values);

src/Routing/CreateEndpoint.php

@@ -15,7 +15,7 @@ final class CreateEndpoint extends Endpoint
     public ?string $redirectTo;
     public bool $async;
 
-    /** @param mixed[] $values */
+    /** @param array{path?: string, value?: string, name?: string, app?: string, methods?: list<string>, command?: string, redirectTo?: string, async?: bool} $values */
     public function __construct(array $values)
     {
         parent::__construct($values);

src/Routing/Endpoint.php

@@ -15,10 +15,10 @@ abstract class Endpoint implements Annotation
     public ?string $name;
     public ?string $app;
 
-    /** @var string[] */
+    /** @var list<string> */
     public array $methods;
 
-    /** @param mixed[] $values */
+    /** @param array{path?: string, value?: string, name?: string, app?: string, methods?: list<string>} $values */
     public function __construct(array $values)
     {
         $this->path    = $values['path'] ?? $values['value'] ?? null;
@@ -41,6 +41,6 @@ public function validate(string $context): void
     /** @throws AnnotationException */
     abstract protected function validateAdditionalData(Validator $validator): void;
 
-    /** @return string[] */
+    /** @return list<string> */
     abstract protected function defaultMethods(): array;
 }

src/Routing/ExecuteAndFetchEndpoint.php

@@ -14,7 +14,7 @@ final class ExecuteAndFetchEndpoint extends Endpoint
     public ?string $command;
     public ?string $query;
 
-    /** @param mixed[] $values */
+    /** @param array{path?: string, value?: string, name?: string, app?: string, methods?: list<string>, command?: string, query?: string} $values */
     public function __construct(array $values)
     {
         parent::__construct($values);

src/Routing/ExecuteEndpoint.php

@@ -14,7 +14,7 @@ final class ExecuteEndpoint extends Endpoint
     public ?string $command;
     public bool $async;
 
-    /** @param mixed[] $values */
+    /** @param array{path?: string, value?: string, name?: string, app?: string, methods?: list<string>, command?: string, async?: bool} $values */
     public function __construct(array $values)
     {
         parent::__construct($values);

src/Routing/FetchEndpoint.php

@@ -13,7 +13,7 @@ final class FetchEndpoint extends Endpoint
 {
     public ?string $query;
 
-    /** @param mixed[] $values */
+    /** @param array{path?: string, value?: string, name?: string, app?: string, methods?: list<string>, query?: string} $values */
     public function __construct(array $values)
     {
         parent::__construct($values);

src/Routing/Middleware.php

@@ -17,7 +17,7 @@ final class Middleware implements AnnotationInterface
     public int $priority;
     public ?string $app;
 
-    /** @param mixed[] $values */
+    /** @param array{path?: string, value?: string, name?: string, app?: string, priority?: int} $values */
     public function __construct(array $values)
     {
         $this->path     = $values['path'] ?? $values['value'] ?? '/';

src/ServiceBus/CommandHandler.php

@@ -15,7 +15,7 @@ final class CommandHandler implements AnnotationInterface
 {
     public ?string $handles;
 
-    /** @param mixed[] $values */
+    /** @param array{handles?: string, value?: string} $values */
     public function __construct(array $values)
     {
         $this->handles = $values['handles'] ?? $values['value'] ?? null;

src/ServiceBus/Middleware.php

@@ -16,7 +16,7 @@ final class Middleware implements AnnotationInterface
     public ?string $bus;
     public int $priority;
 
-    /** @param mixed[] $values */
+    /** @param array{bus?: string, value?: string, priority?: int} $values */
     public function __construct(array $values)
     {
         $this->bus      = $values['bus'] ?? $values['value'] ?? null;

src/ServiceBus/QueryHandler.php

@@ -15,7 +15,7 @@ final class QueryHandler implements AnnotationInterface
 {
     public ?string $handles;
 
-    /** @param mixed[] $values */
+    /** @param array{handles?: string, value?: string} $values */
     public function __construct(array $values)
     {
         $this->handles = $values['handles'] ?? $values['value'] ?? null;

src/Validator.php

@@ -6,8 +6,8 @@
 use Doctrine\Common\Annotations\AnnotationException;
 
 use function array_intersect;
-use function gettype;
 use function implode;
+use function trim;
 
 /** @internal */
 final class Validator
@@ -32,7 +32,7 @@ public function requiredScalar(string $attribute, string $type, $value): void
             throw AnnotationException::requiredError($attribute, $this->annotation, $this->context, $type);
         }
 
-        $this->verifyType($attribute, $type, $value);
+        $this->requireNonEmptyString($attribute, $type, $value);
     }
 
     /**
@@ -46,7 +46,21 @@ public function nonRequiredScalar(string $attribute, string $type, $value): void
             return;
         }
 
-        $this->verifyType($attribute, $type, $value);
+        $this->requireNonEmptyString($attribute, $type, $value);
+    }
+
+    /**
+     * @param mixed $value
+     *
+     * @throws AnnotationException
+     */
+    private function requireNonEmptyString(string $attribute, string $type, $value): void
+    {
+        if ($type !== 'string' || trim($value) !== '') {
+            return;
+        }
+
+        throw AnnotationException::requiredError($attribute, $this->annotation, $this->context, $type);
     }
 
     /**
@@ -61,8 +75,6 @@ public function enumArray(string $attribute, array $allowedValues, $value): void
             throw AnnotationException::requiredError($attribute, $this->annotation, $this->context, 'array');
         }
 
-        $this->verifyType($attribute, 'array', $value);
-
         if (array_intersect($value, $allowedValues) === []) {
             // @phpstan-ignore-next-line
             throw AnnotationException::enumeratorError(
@@ -74,18 +86,4 @@ public function enumArray(string $attribute, array $allowedValues, $value): void
             );
         }
     }
-
-    /**
-     * @param mixed $value
-     *
-     * @throws AnnotationException
-     */
-    private function verifyType(string $attribute, string $type, $value): void
-    {
-        $actualType = gettype($value);
-
-        if ($actualType !== $type) {
-            throw AnnotationException::attributeTypeError($attribute, $this->annotation, $this->context, $type, $value);
-        }
-    }
 }

tests/Unit/ReaderTest.php

@@ -154,7 +154,7 @@ public function getClassAnnotationShouldReturnMatchedAnnotation(): void
         $annotation = $this->createMock(Annotation::class);
         $class      = new ReflectionClass(self::class);
 
-        $annotation->expects(self::exactly(1))
+        $annotation->expects(self::once())
                    ->method('validate')
                    ->with('class ' . self::class);
 

tests/Unit/Routing/CreateAndFetchEndpointTest.php

@@ -45,23 +45,49 @@ public function validateShouldNotRaiseExceptionsWhenStateIsValid(): void
      * @covers \Chimera\Mapping\Validator
      * @covers \Chimera\Mapping\Routing\Endpoint
      *
-     * @param mixed[] $values
+     * @param array{query?: string, command?: string, redirectTo?: string} $values
      */
-    public function validateShouldRaiseExceptionWhenInvalidDataWasProvided(array $values): void
+    public function validateShouldRaiseExceptionWhenInvalidDataWasProvided(array $values, string $expectedMessage): void
     {
         $annotation = new CreateAndFetchEndpoint(self::ENDPOINT_DATA + $values);
 
         $this->expectException(AnnotationException::class);
+        $this->expectExceptionMessage($expectedMessage);
+
         $annotation->validate('class A');
     }
 
-    /** @return mixed[][] */
-    public function invalidScenarios(): array
+    /** @return iterable<string, array{0: array{query?: string, command?: string, redirectTo?: string}, 1: string}> */
+    public function invalidScenarios(): iterable
     {
-        return [
-            'empty command'      => [['query' => 'test', 'redirectTo' => 'test3']],
-            'empty query'        => [['command' => 'test', 'redirectTo' => 'test3']],
-            'empty redirectTo'      => [['command' => 'test', 'query' => 'test']],
+        yield 'missing command' => [
+            ['query' => 'test', 'redirectTo' => 'test3'],
+            '"command" of @Chimera\Mapping\Routing\CreateAndFetchEndpoint declared on class A expects string.',
+        ];
+
+        yield 'empty command' => [
+            ['command' => '   ', 'query' => 'test', 'redirectTo' => 'test3'],
+            '"command" of @Chimera\Mapping\Routing\CreateAndFetchEndpoint declared on class A expects string.',
+        ];
+
+        yield 'missing query' => [
+            ['command' => 'test', 'redirectTo' => 'test3'],
+            '"query" of @Chimera\Mapping\Routing\CreateAndFetchEndpoint declared on class A expects string.',
+        ];
+
+        yield 'empty query' => [
+            ['command' => 'test', 'query' => '', 'redirectTo' => 'test3'],
+            '"query" of @Chimera\Mapping\Routing\CreateAndFetchEndpoint declared on class A expects string.',
+        ];
+
+        yield 'missing redirectTo' => [
+            ['command' => 'test', 'query' => 'test'],
+            '"redirectTo" of @Chimera\Mapping\Routing\CreateAndFetchEndpoint declared on class A expects string.',
+        ];
+
+        yield 'empty redirectTo' => [
+            ['command' => 'test', 'query' => 'test', 'redirectTo' => ''],
+            '"redirectTo" of @Chimera\Mapping\Routing\CreateAndFetchEndpoint declared on class A expects string.',
         ];
     }
 }

tests/Unit/Routing/CreateEndpointTest.php

@@ -65,22 +65,39 @@ public function validateShouldNotRaiseExceptionsWhenAsyncNotIsProvided(): void
      * @covers \Chimera\Mapping\Validator
      * @covers \Chimera\Mapping\Routing\Endpoint
      *
-     * @param mixed[] $values
+     * @param array{command?: string, redirectTo?: string} $values
      */
-    public function validateShouldRaiseExceptionWhenInvalidDataWasProvided(array $values): void
+    public function validateShouldRaiseExceptionWhenInvalidDataWasProvided(array $values, string $expectedMessage): void
     {
         $annotation = new CreateEndpoint(self::ENDPOINT_DATA + $values);
 
         $this->expectException(AnnotationException::class);
+        $this->expectExceptionMessage($expectedMessage);
+
         $annotation->validate('class A');
     }
 
-    /** @return mixed[][] */
-    public function invalidScenarios(): array
+    /** @return iterable<string, array{0: array{command?: string, redirectTo?: string}, 1: string}> */
+    public function invalidScenarios(): iterable
     {
-        return [
-            'empty command'         => [['redirectTo' => 'test']],
-            'empty redirectTo'      => [['command' => 'test']],
+        yield 'missing command' => [
+            ['redirectTo' => 'test'],
+            '"command" of @Chimera\Mapping\Routing\CreateEndpoint declared on class A expects string.',
+        ];
+
+        yield 'empty command' => [
+            ['command' => '', 'redirectTo' => 'test'],
+            '"command" of @Chimera\Mapping\Routing\CreateEndpoint declared on class A expects string.',
+        ];
+
+        yield 'missing redirectTo' => [
+            ['command' => 'test'],
+            '"redirectTo" of @Chimera\Mapping\Routing\CreateEndpoint declared on class A expects string.',
+        ];
+
+        yield 'empty redirectTo' => [
+            ['command' => 'test', 'redirectTo' => ''],
+            '"redirectTo" of @Chimera\Mapping\Routing\CreateEndpoint declared on class A expects string.',
         ];
     }
 }