Merge pull request #6 from samsonasik/bump

Bump to laminas/filter 3 and laminas/validator 3

Author: samsonasik

composer.json

@@ -22,8 +22,8 @@
     ],
     "require": {
         "php": "^8.1",
-        "laminas/laminas-filter": "^2.31",
-        "laminas/laminas-validator": "^2.29",
+        "laminas/laminas-filter": "^3.0",
+        "laminas/laminas-validator": "^3.0",
         "samsonasik/array-lookup": "^1.3",
         "symfony/polyfill-mbstring": "^1.27",
         "webmozart/assert": "^1.11"
@@ -32,8 +32,8 @@
         "kahlan/kahlan": "^5.2.2",
         "laminas/laminas-coding-standard": "^2.5",
         "php-coveralls/php-coveralls": "^2.5.3",
-        "phpstan/phpstan": "^1.9.11",
-        "phpstan/phpstan-webmozart-assert": "^1.2.2",
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-webmozart-assert": "^2.0",
         "rector/rector": "dev-main",
         "squizlabs/php_codesniffer": "^3.7.1"
     },

phpstan.neon

@@ -2,8 +2,8 @@ includes:
 	- vendor/phpstan/phpstan-webmozart-assert/extension.neon
 
 parameters:
+    treatPhpDocTypesAsCertain: false
     ignoreErrors:
-        - '#Parameter \#2 \$filter of static method ArrayLookup\\Finder\:\:first\(\) expects callable\(mixed, int\|string\|null=\): bool, Closure\(string, string\): bool given#'
         -
             identifier: missingType.generics
             path: src/Filter/Naming.php

spec/Filter/NamingSpec.php

@@ -23,7 +23,7 @@
 
             $naming = new Naming();
             foreach ($maps as $key => $value) {
-                expect($naming->filter($key))->toBe($value);
+                expect($naming($key))->toBe($value);
             }
 
         });

src/Filter/Naming.php

@@ -4,7 +4,7 @@
 
 namespace Naming\Filter;
 
-use Laminas\Filter\AbstractFilter;
+use Laminas\Filter\FilterInterface;
 use Laminas\Filter\StringTrim;
 use Laminas\Filter\StripTags;
 use Webmozart\Assert\Assert;
@@ -17,12 +17,12 @@
 
 use const MB_CASE_TITLE;
 
-final class Naming extends AbstractFilter
+final class Naming implements FilterInterface
 {
     /**
      * @param string $value
      */
-    public function filter($value): string
+    public function filter(mixed $value): string
     {
         $value = (new StripTags())->filter($value);
         $value = (new StringTrim())->filter($value);
@@ -45,4 +45,12 @@ public function filter($value): string
         Assert::string($value);
         return $value;
     }
+
+    /**
+     * @param string $value
+     */
+    public function __invoke(mixed $value): string
+    {
+        return $this->filter($value);
+    }
 }

src/Validator/Naming.php

@@ -57,7 +57,7 @@ final class Naming extends AbstractValidator
     private const DOT_TOBE_IN_LAST_WORD = 'DOT_TOBE_IN_LAST_WORD';
 
     /** @var array<string, string> */
-    protected $messageTemplates = [
+    protected array $messageTemplates = [
         self::SPECIAL_OR_NUMBER      => 'Names can contain only letters, hyphens, apostrophe, spaces & full stops',
         self::SINGLE_DOT             => 'Single "." character is not allowed',
         self::SINGLE_HYPHEN          => 'Single "-" character is not allowed',
@@ -69,7 +69,7 @@ final class Naming extends AbstractValidator
     ];
 
     /** @param string $value */
-    public function isValid($value): bool
+    public function isValid(mixed $value): bool
     {
         Assert::string($value);
         $this->setValue($value);
@@ -99,7 +99,8 @@ public function isValid($value): bool
                 "''" => self::CONSECUTIVE_APOSTROPHE,
             ];
 
-            $filter = static fn(string $datum, string $key): bool => str_contains($value, $key);
+            $filter = static fn(mixed $datum, int|string|null $key): bool
+                => is_string($key) && str_contains($value, $key);
             $error  = Finder::first($messageTemplates, $filter);
 
             if (is_string($error)) {