Replace StyleCI to PHP CS Fixer

.github/workflows/build.yml

@@ -30,3 +30,5 @@ jobs:
         ['ubuntu-latest', 'windows-latest']
       php: >-
         ['8.1', '8.2', '8.3', '8.4', '8.5']
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/rector-cs.yml

@@ -0,0 +1,26 @@
+name: rector-cs
+
+on:
+  pull_request:
+    paths:
+      - 'src/**'
+      - 'tests/**'
+      - 'rector.php'
+      - '.php-cs-fixer.dist.php'
+      - 'composer.json'
+      - '.github/workflows/rector-cs.yml'
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  rector-cs:
+    permissions:
+      contents: write # Required to push rector/CS fixes to PR branch
+    uses: yiisoft/actions/.github/workflows/rector-cs.yml@master
+    with:
+      php: '8.1'

.gitignore

@@ -33,3 +33,6 @@ composer.phar
 
 # PHPBench
 .phpbench
+
+# PHP CS Fixer
+/.php-cs-fixer.cache

.php-cs-fixer.dist.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpCsFixer\Finder;
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
+use Yiisoft\CodeStyle\ConfigBuilder;
+
+$finder = (new Finder())->in([
+    __DIR__ . '/src',
+    __DIR__ . '/tests',
+]);
+
+return ConfigBuilder::build()
+    ->setRiskyAllowed(true)
+    ->setParallelConfig(ParallelConfigFactory::detect())
+    ->setRules([
+        '@Yiisoft/Core' => true,
+        '@Yiisoft/Core:risky' => true,
+    ])
+    ->setFinder($finder);

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 2.7.1 under development
 
 - New #156: Add `NumericHelper::trimDecimalZeros()` (@samdark, @vjik)
+- Enh #163: Explicitly import classes, functions, and constants in "use" sections (@vjik)
 
 ## 2.7.0 November 23, 2025
 

composer.json

@@ -33,11 +33,13 @@
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8.2",
+        "friendsofphp/php-cs-fixer": "^3.95",
         "maglnet/composer-require-checker": "^4.7.1",
+        "phpbench/phpbench": "^1.4.1",
         "phpunit/phpunit": "^10.5.48",
         "rector/rector": "^2.1.2",
         "spatie/phpunit-watcher": "^1.24",
-        "phpbench/phpbench": "^1.4.1"
+        "yiisoft/code-style": "^1.0"
     },
     "autoload": {
         "psr-4": {
@@ -64,6 +66,8 @@
         }
     },
     "scripts": {
+        "cs-fix": "php-cs-fixer fix",
+        "rector": "rector",
         "test": "phpunit --testdox --no-interaction",
         "test-watch": "phpunit-watcher watch"
     }

rector.php

@@ -5,6 +5,7 @@
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\Config\RectorConfig;
 use Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector;
+use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
 use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
 
 return RectorConfig::configure()
@@ -18,5 +19,6 @@
     ])
     ->withSkip([
         ClosureToArrowFunctionRector::class,
+        ReadOnlyPropertyRector::class,
         NullToStrictStringFuncCallArgRector::class,
     ]);

src/AbstractCombinedRegexp.php

@@ -68,7 +68,7 @@ protected function throwFailedMatchException(string $string): void
                 'Failed to match pattern "%s" with string "%s".',
                 $this->getCompiledPattern(),
                 $string,
-            )
+            ),
         );
     }
 }

src/CombinedRegexp.php

@@ -36,13 +36,13 @@
      */
     public function __construct(
         array $patterns,
-        private readonly string $flags = ''
+        private readonly string $flags = '',
     ) {
         if (empty($patterns)) {
             throw new InvalidArgumentException('At least one pattern should be specified.');
         }
 
         $this->patterns = array_values($patterns);
         $this->compiledPattern = $this->compilePatterns($this->patterns) . $this->flags;
     }
 
@@ -85,6 +85,16 @@
         return count($matches) - 1;
     }
 
+    public function getPatterns(): array
+    {
+        return $this->patterns;
+    }
+
+    public function getFlags(): string
+    {
+        return $this->flags;
+    }
+
     /**
      * @param string[] $patterns
      *
@@ -101,24 +111,14 @@
          * https://regex101.com/r/lE1Q1S/1, https://regex101.com/r/rWg7Fj/1
          */
         foreach ($patterns as $i => $pattern) {
             $quotedPatterns[] = $pattern . str_repeat('()', $i);
         }
 
         $combinedRegexps = '(?|' . strtr(
             implode('|', $quotedPatterns),
-            [self::REGEXP_DELIMITER => self::QUOTE_REPLACER]
+            [self::REGEXP_DELIMITER => self::QUOTE_REPLACER],
         ) . ')';
 
         return self::REGEXP_DELIMITER . $combinedRegexps . self::REGEXP_DELIMITER;
     }
-
-    public function getPatterns(): array
-    {
-        return $this->patterns;
-    }
-
-    public function getFlags(): string
-    {
-        return $this->flags;
-    }
 }

src/Inflector.php

@@ -384,8 +384,8 @@
     }
 
     /**
-     * @param string|Transliterator $transliterator Either a {@see \Transliterator}, or a string from which
-     * a {@see \Transliterator} can be built for transliteration. Used by {@see toTransliterated()} when intl is available.
+     * @param string|Transliterator $transliterator Either a {@see Transliterator}, or a string from which
+     * a {@see Transliterator} can be built for transliteration. Used by {@see toTransliterated()} when intl is available.
      * Defaults to {@see TRANSLITERATE_LOOSE}.
      *
      * @return self
@@ -507,8 +507,8 @@
         $words = preg_replace('/(?<!\p{Lu})(\p{Lu})|(\p{Lu})(?=\p{Ll})/u', ' \0', $input);
         return mb_strtolower(
             trim(
-                str_replace(['-', '_', '.'], ' ', $words)
-            )
+                str_replace(['-', '_', '.'], ' ', $words),
+            ),
         );
     }
 
@@ -535,8 +535,8 @@
          */
         $result = preg_replace($regex, addslashes($separator) . '\1', $input);
 
         if ($separator !== '_') {
             $result = str_replace('_', $separator, $result);
         }
 
         return mb_strtolower(trim($result, $separator));
@@ -602,7 +602,7 @@
     {
         $input = $this->toPascalCase($input);
 
         return mb_strtolower(mb_substr($input, 0, 1)) . mb_substr($input, 1);
     }
 
     /**
@@ -668,7 +668,7 @@
      */
     public function toSlug(string $input, string $replacement = '-', bool $lowercase = true): string
     {
         $quotedReplacement = preg_quote($replacement, '/');
 
         /**
          * Replace all non-words character
@@ -685,7 +685,7 @@
          * `preg_replace()` never returns `false`.
          */
         $input = preg_replace(
             "/^(?:$quotedReplacement)+|(?:$quotedReplacement)+$/u" . ($lowercase ? 'i' : ''),
             '',
             $input,
         );
@@ -703,8 +703,8 @@
      * @noinspection PhpComposerExtensionStubsInspection
      *
      * @param string $input Input string. It must be valid UTF-8 string.
-     * @param string|Transliterator|null $transliterator either a {@see \Transliterator} or a string
-     * from which a {@see \Transliterator} can be built. If null, value set with {@see withTransliterator()}
+     * @param string|Transliterator|null $transliterator either a {@see Transliterator} or a string
+     * from which a {@see Transliterator} can be built. If null, value set with {@see withTransliterator()}
      * or {@see TRANSLITERATE_LOOSE} is used.
      */
     public function toTransliterated(string $input, $transliterator = null): string

src/MemoizedCombinedRegexp.php

@@ -4,6 +4,8 @@
 
 namespace Yiisoft\Strings;
 
+use Exception;
+
 /**
  * `MemoizedCombinedRegexp` is a decorator for {@see AbstractCombinedRegexp} that caches results of
  * - {@see AbstractCombinedRegexp::matches()}
@@ -19,8 +21,7 @@
 
     public function __construct(
         private readonly AbstractCombinedRegexp $decorated,
-    ) {
-    }
+    ) {}
 
     public function getCompiledPattern(): string
     {
@@ -36,7 +37,7 @@
 
     public function getMatchingPattern(string $string): string
     {
         $this->evaluate($string);
 
         return $this->getPatterns()[$this->getMatchingPatternPosition($string)];
     }
@@ -48,6 +49,16 @@
         return $this->results[$string]['position'] ?? $this->throwFailedMatchException($string);
     }
 
+    public function getPatterns(): array
+    {
+        return $this->decorated->getPatterns();
+    }
+
+    public function getFlags(): string
+    {
+        return $this->decorated->getFlags();
+    }
+
     private function evaluate(string $string): void
     {
         if (isset($this->results[$string])) {
@@ -58,18 +69,8 @@
 
             $this->results[$string]['matches'] = true;
             $this->results[$string]['position'] = $position;
-        } catch (\Exception) {
+        } catch (Exception) {
             $this->results[$string]['matches'] = false;
         }
     }
-
-    public function getPatterns(): array
-    {
-        return $this->decorated->getPatterns();
-    }
-
-    public function getFlags(): string
-    {
-        return $this->decorated->getFlags();
-    }
 }

src/NumericHelper.php

@@ -18,6 +18,9 @@
 use function preg_replace;
 use function str_replace;
 use function substr;
+use function sprintf;
+
+use const FILTER_VALIDATE_INT;
 
 /**
  * Provides static methods to work with numeric strings.
@@ -68,8 +71,8 @@
             throw new InvalidArgumentException("Value must be numeric. $type given.");
         }
 
-        if (fmod((float)$value, 1) !== 0.00) {
-            return (string)$value;
+        if (fmod((float) $value, 1) !== 0.00) {
+            return (string) $value;
         }
 
         if (in_array($value % 100, [11, 12, 13], true)) {
@@ -157,7 +160,7 @@
                 throw new InvalidArgumentException("Not supported postfix '$postfix' in input string: $string");
             }
 
             return (int) ((float) $numericPart * $postfixMultiplier);
         }
 
         throw new InvalidArgumentException("Incorrect input string: $string");
@@ -184,7 +187,7 @@
 
         if (!is_numeric($value)) {
             throw new InvalidArgumentException(
-                sprintf('Value must be numeric string or null. "%s" given.', $value)
+                sprintf('Value must be numeric string or null. "%s" given.', $value),
             );
         }