#234: Fixed PHPStan issues

Author: raymondschouten

composer.json

@@ -14,7 +14,9 @@
         "symfony/validator": "6.0.*"
     },
     "require-dev": {
-      "phpstan/phpstan": "^1.11",
+        "phpstan/phpstan": "^1.11",
+        "phpstan/phpstan-phpunit": "^1.4",
+        "phpstan/phpstan-symfony": "^1.4",
         "phpunit/phpunit": "^9.5",
         "rector/rector": "^1.1"
     },

phpstan.neon

@@ -1,5 +1,10 @@
+includes:
+    - 'vendor/phpstan/phpstan-phpunit/extension.neon'
+    - 'vendor/phpstan/phpstan-symfony/extension.neon'
+
 parameters:
-    level: 1
+    level: 8
+
     paths:
-        - src
-        - tests
+        - 'src'
+        - 'tests'

rector.php

@@ -16,6 +16,5 @@
         SymfonySetList::SYMFONY_60,
     ])
     ->withImportNames(
-        importDocBlockNames: false,
         importShortClasses: false,
     );

src/Bsn.php

@@ -25,8 +25,6 @@
 use Symfony\Component\Validator\Constraint;
 
 /**
- * BSN constraint.
- *
  * @Annotation
  *
  * @Target({"PROPERTY", "METHOD", "ANNOTATION"})

src/BsnValidator.php

@@ -46,9 +46,7 @@
 class BsnValidator extends ConstraintValidator
 {
     /**
-     * Checks if the value is valid.
-     *
-     * @throws \Symfony\Component\Validator\Exception\UnexpectedTypeException
+     * @throws UnexpectedTypeException
      */
     public function validate(mixed $value, Constraint $constraint): void
     {
@@ -67,7 +65,7 @@ public function validate(mixed $value, Constraint $constraint): void
         $value = (string) $value;
 
         if ('000000000' !== $value && preg_match('/^\d{9}$/', $value)) {
-            [$a, $b, $c, $d, $e, $f, $g, $h, $i] = str_split($value);
+            [$a, $b, $c, $d, $e, $f, $g, $h, $i] = array_map('intval', str_split($value));
 
             $sum = (9 * $a) + (8 * $b) + (7 * $c) + (6 * $d) + (5 * $e) + (4 * $f) + (3 * $g) + (2 * $h) + (-1 * $i);
 

src/Collection.php

@@ -27,8 +27,6 @@
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
 
 /**
- * Collection constraint.
- *
  * @Annotation
  *
  * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
@@ -39,12 +37,9 @@
  */
 class Collection extends Constraint
 {
-    /** @var \Symfony\Component\Validator\Constraint[] */
+    /** @var Constraint[] */
     public array $constraints;
 
-    /**
-     * Constructor.
-     */
     public function __construct(mixed $options = null)
     {
         parent::__construct($options);
@@ -68,17 +63,11 @@ public function __construct(mixed $options = null)
         }
     }
 
-    /**
-     * Returns the name of the default option.
-     */
     public function getDefaultOption(): string
     {
         return 'constraints';
     }
 
-    /**
-     * Returns the name of the required options.
-     */
     public function getRequiredOptions(): array
     {
         return ['constraints'];

src/CollectionValidator.php

@@ -27,18 +27,14 @@
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
 /**
- * Collection validator.
- *
  * @author Raymond Schouten
  *
  * @since 2.3
  */
 class CollectionValidator extends ConstraintValidator
 {
     /**
-     * Checks if the value is valid.
-     *
-     * @throws \Symfony\Component\Validator\Exception\UnexpectedTypeException
+     * @throws UnexpectedTypeException
      */
     public function validate(mixed $value, Constraint $constraint): void
     {

src/Json.php

@@ -25,8 +25,6 @@
 use Symfony\Component\Validator\Constraint;
 
 /**
- * JSON constraint.
- *
  * @Annotation
  *
  * @Target({"PROPERTY", "METHOD", "ANNOTATION"})

src/JsonValidator.php

@@ -25,18 +25,14 @@
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
 /**
- * JSON validator.
- *
  * @author Raymond Schouten
  *
  * @since 2.3
  */
 class JsonValidator extends ConstraintValidator
 {
     /**
-     * Checks if the value is valid.
-     *
-     * @throws \Symfony\Component\Validator\Exception\UnexpectedTypeException
+     * @throws UnexpectedTypeException
      */
     public function validate(mixed $value, Constraint $constraint): void
     {
@@ -52,7 +48,7 @@ public function validate(mixed $value, Constraint $constraint): void
             throw new UnexpectedTypeException($value, 'string');
         }
 
-        if (json_decode($value) || json_last_error() === JSON_ERROR_NONE) {
+        if (json_decode((string) $value) || json_last_error() === JSON_ERROR_NONE) {
             return;
         }
 

tests/BsnValidatorTest.php

@@ -42,7 +42,7 @@ protected function createValidator(): BsnValidator
     /**
      * @dataProvider providerValidBsn
      */
-    public function testValidate(mixed $value): void
+    public function testValidate(string|\Stringable $value): void
     {
         $this->validator->validate($value, new Bsn());
 
@@ -87,7 +87,7 @@ public function testValidateNoScalar(mixed $value): void
     /**
      * @dataProvider providerInvalidBsn
      */
-    public function testValidateViolation(mixed $value): void
+    public function testValidateViolation(string|\Stringable $value): void
     {
         $constraint = new Bsn();
 
@@ -98,6 +98,9 @@ public function testValidateViolation(mixed $value): void
             ->assertRaised();
     }
 
+    /**
+     * @return array<string, array{string|\Stringable}>
+     */
     public function providerValidBsn(): array
     {
         return [
@@ -107,6 +110,9 @@ public function providerValidBsn(): array
         ];
     }
 
+    /**
+     * @return array<string, array{mixed}>
+     */
     public function providerNoScalar(): array
     {
         return [
@@ -117,6 +123,9 @@ public function providerNoScalar(): array
         ];
     }
 
+    /**
+     * @return array<string, array{string|\Stringable}>
+     */
     public function providerInvalidBsn(): array
     {
         return [