Merge pull request #4 from samsonasik/3.0.x

3.0.0

Author: samsonasik

.github/workflows/ci_build.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.3', '7.4', 8.0']
+        php-versions: ['8.1', '8.2']
     steps:
       - name: Setup PHP Action
         uses: shivammathur/setup-php@v2

composer.json

@@ -21,24 +21,28 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
-        "laminas/laminas-filter": "^2.9",
-        "laminas/laminas-validator": "^2.12",
-        "symfony/polyfill-mbstring": "^1.10",
-        "webmozart/assert": "^1.4"
+        "php": "^8.1",
+        "laminas/laminas-filter": "^2.31",
+        "laminas/laminas-validator": "^2.29",
+        "samsonasik/array-lookup": "*",
+        "symfony/polyfill-mbstring": "^1.27",
+        "webmozart/assert": "^1.11"
     },
     "require-dev": {
-        "kahlan/kahlan": "^5.0",
-        "laminas/laminas-coding-standard": "^2.0",
-        "php-coveralls/php-coveralls": "^2.1",
-        "phpstan/phpstan": "^0.12",
-        "phpstan/phpstan-webmozart-assert": "^0.12.0",
+        "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",
         "rector/rector": "dev-main",
-        "squizlabs/php_codesniffer": "^3.5.8"
+        "squizlabs/php_codesniffer": "^3.7.1"
     },
     "config": {
         "bin-dir": "bin",
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "autoload": {
         "psr-4": {

phpstan.neon

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

rector.php

@@ -1,35 +1,30 @@
 <?php
 
-use Rector\CodingStyle\Rector\FuncCall\CallUserFuncArrayToVariadicRector;
-use Rector\Core\Configuration\Option;
-use Rector\Core\ValueObject\PhpVersion;
+use Rector\CodingStyle\Rector\ArrowFunction\StaticArrowFunctionRector;
+use Rector\CodingStyle\Rector\Closure\StaticClosureRector;
+use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
 use Rector\Set\ValueObject\SetList;
-use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedPropertyRector;
-use Rector\TypeDeclaration\Rector\Param\ParamTypeFromStrictTypedPropertyRector;
-use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Rector\Set\ValueObject\LevelSetList;
+use Rector\Config\RectorConfig;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $containerConfigurator->import(SetList::CODING_STYLE);
-    $containerConfigurator->import(SetList::PHP_70);
-    $containerConfigurator->import(SetList::PHP_71);
-    $containerConfigurator->import(SetList::PHP_72);
-    $containerConfigurator->import(SetList::PHP_73);
-    $containerConfigurator->import(SetList::CODE_QUALITY);
-    $containerConfigurator->import(SetList::TYPE_DECLARATION);
-    $containerConfigurator->import(SetList::TYPE_DECLARATION_STRICT);
-
-    $parameters = $containerConfigurator->parameters();
-    $parameters->set(Option::PATHS, [__DIR__ . '/src', __DIR__ . '/spec']);
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->sets([
+        SetList::CODING_STYLE,
+        LevelSetList::UP_TO_PHP_81,
+        SetList::CODE_QUALITY,
+        SetList::TYPE_DECLARATION
+    ]);
 
-    $parameters->set(Option::AUTO_IMPORT_NAMES, true);
-    $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_73);
+    $rectorConfig->paths([__DIR__ . '/src', __DIR__ . '/spec', __FILE__]);
+    $rectorConfig->importNames();
 
-    $parameters->set(Option::SKIP, [
-        // requires php 7.4
-        CallUserFuncArrayToVariadicRector::class,
-        ReturnTypeFromStrictTypedPropertyRector::class,
-        TypedPropertyFromStrictConstructorRector::class,
-        ParamTypeFromStrictTypedPropertyRector::class,
+    $rectorConfig->skip([
+        NullToStrictStringFuncCallArgRector::class,
+        StaticArrowFunctionRector::class => [
+            __DIR__ . '/spec',
+        ],
+        StaticClosureRector::class => [
+            __DIR__ . '/spec',
+        ]
     ]);
 };

spec/Validator/NamingSpec.php

@@ -4,13 +4,9 @@
 
 use Naming\Validator\Naming;
 
-describe('Naming', function () {
+describe('Naming', function (): void {
 
-    given('validator', function () {
-
-       return new Naming();
-
-    });
+    given('validator', fn(): Naming => new Naming());
 
     describe('->isValid', function (): void {
 

src/Filter/Naming.php

@@ -17,26 +17,32 @@
 
 use const MB_CASE_TITLE;
 
-class Naming extends AbstractFilter
+final class Naming extends AbstractFilter
 {
-    /** @param string $value */
+    /**
+     * @param string $value
+     */
     public function filter($value): string
     {
         $value = (new StripTags())->filter($value);
         $value = (new StringTrim())->filter($value);
-        $value = mb_convert_case($value, MB_CASE_TITLE, 'UTF-8');
-        $value = preg_replace('#\s{2,}#', ' ', $value);
 
         Assert::string($value);
 
+        $value = mb_convert_case($value, MB_CASE_TITLE, 'UTF-8');
+        $value = preg_replace('#\s{2,}#', ' ', $value);
+
         $chars = ["'", '-'];
-        array_walk($chars, function ($row) use (&$value): void {
+        array_walk($chars, static function ($row) use (&$value): void {
+            Assert::string($value);
+
             $position = mb_strpos($value, $row);
             if ($position !== false && isset($value[$position + 1])) {
                 $value[$position + 1] = mb_strtoupper($value[$position + 1]);
             }
         });
 
+        Assert::string($value);
         return $value;
     }
 }

src/Validator/Naming.php

@@ -4,59 +4,57 @@
 
 namespace Naming\Validator;
 
+use ArrayLookup\Finder;
 use Laminas\Validator\AbstractValidator;
 use Webmozart\Assert\Assert;
 
-use function array_filter;
 use function array_key_exists;
-use function current;
+use function is_string;
 use function mb_strlen;
 use function preg_match;
-use function strpos;
+use function str_contains;
 
-use const ARRAY_FILTER_USE_KEY;
-
-class Naming extends AbstractValidator
+final class Naming extends AbstractValidator
 {
     /**
      * @var string
      */
-    public const SPECIAL_OR_NUMBER = 'SPECIAL_OR_NUMBER';
+    private const SPECIAL_OR_NUMBER = 'SPECIAL_OR_NUMBER';
 
     /**
      * @var string
      */
-    public const SINGLE_DOT = 'SINGLE_DOT';
+    private const SINGLE_DOT = 'SINGLE_DOT';
 
     /**
      * @var string
      */
-    public const SINGLE_HYPHEN = 'SINGLE_HYPHEN';
+    private const SINGLE_HYPHEN = 'SINGLE_HYPHEN';
 
     /**
      * @var string
      */
-    public const SINGLE_APOSTROPHE = 'SINGLE_APOSTROPHE';
+    private const SINGLE_APOSTROPHE = 'SINGLE_APOSTROPHE';
 
     /**
      * @var string
      */
-    public const CONSECUTIVE_DOT = 'CONSECUTIVE_DOT';
+    private const CONSECUTIVE_DOT = 'CONSECUTIVE_DOT';
 
     /**
      * @var string
      */
-    public const CONSECUTIVE_HYPHEN = 'CONSECUTIVE_HYPHEN';
+    private const CONSECUTIVE_HYPHEN = 'CONSECUTIVE_HYPHEN';
 
     /**
      * @var string
      */
-    public const CONSECUTIVE_APOSTROPHE = 'CONSECUTIVE_APOSTROPHE';
+    private const CONSECUTIVE_APOSTROPHE = 'CONSECUTIVE_APOSTROPHE';
 
     /**
      * @var string
      */
-    public const DOT_TOBE_IN_LAST_WORD = 'DOT_TOBE_IN_LAST_WORD';
+    private const DOT_TOBE_IN_LAST_WORD = 'DOT_TOBE_IN_LAST_WORD';
 
     /** @var array<string, string> */
     protected $messageTemplates = [
@@ -109,12 +107,11 @@ public function isValid($value): bool
                 "''" => self::CONSECUTIVE_APOSTROPHE,
             ];
 
-            $error = array_filter($messageTemplates, function ($key) use ($value): bool {
-                return strpos($value, $key) !== false;
-            }, ARRAY_FILTER_USE_KEY);
+            $filter = static fn(string $datum, string $key): bool => str_contains($value, $key);
+            $error  = Finder::first($messageTemplates, $filter);
 
-            if ($error !== []) {
-                $this->error(current($error));
+            if (is_string($error)) {
+                $this->error($error);
                 return false;
             }
         }