Replace StyleCI with PHP CS Fixer (#41)

mspirkov · web-flow · commit fdc34d92d3ec · 2026-01-13T16:22:11.000+03:00
diff --git a/.github/workflows/rector-cs.yml b/.github/workflows/rector-cs.yml
@@ -0,0 +1,27 @@
+name: Rector + PHP CS Fixer
+
+on:
+  pull_request_target:
+    paths:
+      - 'src/**'
+      - 'tests/**'
+      - '.github/workflows/rector-cs.yml'
+      - 'composer.json'
+      - 'rector.php'
+      - '.php-cs-fixer.dist.php'
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  rector:
+    uses: yiisoft/actions/.github/workflows/rector-cs.yml@master
+    secrets:
+      token: ${{ secrets.YIISOFT_GITHUB_TOKEN }}
+    with:
+      repository: ${{ github.event.pull_request.head.repo.full_name }}
+      php: '8.1'
diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,7 @@ phpunit.phar
 .phpunit.result.cache
 # phpunit coverage report
 coverage.xml
+
+# PHP CS Fixer
+/.php-cs-fixer.cache
+/.php-cs-fixer.php
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
+
+$finder = (new Finder())->in([
+    __DIR__ . '/src',
+    __DIR__ . '/tests',
+]);
+
+return (new Config())
+    ->setRiskyAllowed(true)
+    ->setParallelConfig(ParallelConfigFactory::detect())
+    ->setRules([
+        '@PER-CS3.0' => true,
+        'no_unused_imports' => true,
+        'ordered_class_elements' => true,
+        'class_attributes_separation' => ['elements' => ['method' => 'one']],
+        'declare_strict_types' => true,
+        'native_function_invocation' => true,
+        'native_constant_invocation' => true,
+        'fully_qualified_strict_types' => [
+            'import_symbols' => true
+        ],
+        'global_namespace_import' => [
+            'import_classes' => true,
+            'import_constants' => true,
+            'import_functions' => true,
+        ],
+    ])
+    ->setFinder($finder);
diff --git a/.styleci.yml b/.styleci.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Enh #30: Remove unneeded casting to array in private method `RedisCache::iterableToArray()` (@vjik)
 - Chg #38: Bump minimum PHP version to `8.1` (@s1lver)
 - Chg #40: Make `RedisCache::$client` readonly (@s1lver)
+- Enh #41: Explicitly import classes and functions in "use" section (@mspirkov)
 
 ## 2.0.0 July 10, 2023
 
diff --git a/composer.json b/composer.json
@@ -35,6 +35,7 @@
         "psr/simple-cache": "^3.0"
     },
     "require-dev": {
+        "friendsofphp/php-cs-fixer": "^3.92.5",
         "maglnet/composer-require-checker": "^4.7.1",
         "phpunit/phpunit": "^9.5",
         "rector/rector": "^2.2.14",
diff --git a/src/InvalidArgumentException.php b/src/InvalidArgumentException.php
@@ -4,6 +4,7 @@
 
 namespace Yiisoft\Cache\Redis;
 
-final class InvalidArgumentException extends \RuntimeException implements \Psr\SimpleCache\InvalidArgumentException
-{
-}
+use Psr\SimpleCache\InvalidArgumentException as PsrInvalidArgumentException;
+use RuntimeException;
+
+final class InvalidArgumentException extends RuntimeException implements PsrInvalidArgumentException {}
diff --git a/src/RedisCache.php b/src/RedisCache.php
@@ -22,6 +22,7 @@
 use function serialize;
 use function strpbrk;
 use function unserialize;
+use function in_array;
 
 /**
  * RedisCache stores cache data in a Redis.
@@ -43,26 +44,6 @@ public function __construct(private readonly ClientInterface $client)
         $this->connections = $this->client->getConnection();
     }
 
-    /**
-     * Returns whether Predis cluster is used.
-     *
-     * @return bool Whether Predis cluster is used.
-     */
-    private function isCluster(): bool
-    {
-        /** @psalm-suppress MixedAssignment, PossibleRawObjectIteration */
-        foreach ($this->connections as $connection) {
-            /** @var StreamConnection $connection */
-            $cluster = (new Client($connection->getParameters()))->info('Cluster');
-            /** @psalm-suppress MixedArrayAccess */
-            if (isset($cluster['Cluster']['cluster_enabled']) && 1 === (int)$cluster['Cluster']['cluster_enabled']) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     public function get(string $key, mixed $default = null): mixed
     {
         $this->validateKey($key);
@@ -71,7 +52,7 @@ public function get(string $key, mixed $default = null): mixed
         return $value === null ? $default : unserialize($value);
     }
 
-    public function set(string $key, mixed $value, null|int|DateInterval $ttl = null): bool
+    public function set(string $key, mixed $value, int|DateInterval|null $ttl = null): bool
     {
         $ttl = $this->normalizeTtl($ttl);
 
@@ -145,7 +126,7 @@ public function getMultiple(iterable $keys, mixed $default = null): iterable
         return $values;
     }
 
-    public function setMultiple(iterable $values, null|int|DateInterval $ttl = null): bool
+    public function setMultiple(iterable $values, int|DateInterval|null $ttl = null): bool
     {
         $values = $this->iterableToArray($values);
         $keys = array_map(\strval(...), array_keys($values));
@@ -164,7 +145,7 @@ public function setMultiple(iterable $values, null|int|DateInterval $ttl = null)
         $results = [];
         if ($this->isCluster()) {
             foreach ($serializeValues as $key => $value) {
-                $this->set((string)$key, $value, $this->isInfinityTtl($ttl) ? null : $ttl);
+                $this->set((string) $key, $value, $this->isInfinityTtl($ttl) ? null : $ttl);
             }
         } else {
             if ($this->isInfinityTtl($ttl)) {
@@ -176,14 +157,14 @@ public function setMultiple(iterable $values, null|int|DateInterval $ttl = null)
             $this->client->mset($serializeValues);
 
             foreach ($keys as $key) {
-                $this->client->expire($key, (int)$ttl);
+                $this->client->expire($key, (int) $ttl);
             }
 
             /** @var array|null $results */
             $results = $this->client->exec();
         }
 
-        return !in_array(null, (array)$results, true);
+        return !in_array(null, (array) $results, true);
     }
 
     public function deleteMultiple(iterable $keys): bool
@@ -210,14 +191,34 @@ public function has(string $key): bool
         return $ttl > 0 || $ttl === -1;
     }
 
+    /**
+     * Returns whether Predis cluster is used.
+     *
+     * @return bool Whether Predis cluster is used.
+     */
+    private function isCluster(): bool
+    {
+        /** @psalm-suppress MixedAssignment, PossibleRawObjectIteration */
+        foreach ($this->connections as $connection) {
+            /** @var StreamConnection $connection */
+            $cluster = (new Client($connection->getParameters()))->info('Cluster');
+            /** @psalm-suppress MixedArrayAccess */
+            if (isset($cluster['Cluster']['cluster_enabled']) && 1 === (int) $cluster['Cluster']['cluster_enabled']) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Normalizes cache TTL handling `null` value, strings and {@see DateInterval} objects.
      *
      * @param DateInterval|int|string|null $ttl The raw TTL.
      *
      * @return int|null TTL value as UNIX timestamp.
      */
-    private function normalizeTtl(null|int|string|DateInterval $ttl): ?int
+    private function normalizeTtl(int|string|DateInterval|null $ttl): ?int
     {
         if ($ttl === null) {
             return null;
diff --git a/tests/RedisCacheTest.php b/tests/RedisCacheTest.php
@@ -290,7 +290,7 @@ public function testDeleteMultiple(): void
         $this->assertSameExceptObject($data, $this->cache->getMultiple($keys));
         $this->assertTrue($this->cache->deleteMultiple($keys));
 
-        $emptyData = array_map(static fn () => null, $data);
+        $emptyData = array_map(static fn() => null, $data);
 
         $this->assertSameExceptObject($emptyData, $this->cache->getMultiple($keys));
     }
@@ -359,7 +359,7 @@ public function iterableProvider(): array
             ],
             'IteratorAggregate' => [
                 ['a' => 1, 'b' => 2,],
-                new class () implements IteratorAggregate {
+                new class implements IteratorAggregate {
                     public function getIterator(): ArrayIterator
                     {
                         return new ArrayIterator(['a' => 1, 'b' => 2,]);
diff --git a/tests/RedisClusterCacheTest.php b/tests/RedisClusterCacheTest.php
