Use beste/php-cs-fixer-config:^3.1

beste · Jul 26, 2024 · 7acdf26 · 7acdf26
1 parent 2e5f256
commit 7acdf26
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -2,20 +2,10 @@
 
 declare(strict_types=1);
 
-$finder = PhpCsFixer\Finder::create()->in(__DIR__);
+use Beste\PhpCsFixer\Config;
 
-return (new PhpCsFixer\Config())
-    ->setRiskyAllowed(true)
-    ->setRules([
-        '@PER-CS2.0' => true,
-        'no_unused_imports' => true,
-        'ordered_imports' => [
-            'imports_order' => [
-                'class',
-                'function',
-                'const',
-            ],
-            'sort_algorithm' => 'alpha',
-        ],
-    ])
-    ->setFinder($finder);
+$config = Config\Factory::fromRuleSet(new Config\RuleSet\Php81());
+
+$config->getFinder()->in(__DIR__);
+
+return $config;
diff --git a/composer.json b/composer.json
@@ -17,6 +17,7 @@
     },
     "require-dev": {
         "beste/clock": "^3.0",
+        "beste/php-cs-fixer-config": "^3.1",
         "friendsofphp/php-cs-fixer": "^3.60.0",
         "phpstan/extension-installer": "^1.4.1",
         "phpstan/phpstan": "^1.11.8",

diff --git a/src/InMemoryCache.php b/src/InMemoryCache.php
@@ -17,7 +17,7 @@ final class InMemoryCache implements CacheItemPoolInterface
     private array $deferredItems;
 
     public function __construct(
-        ClockInterface $clock = null
+        ClockInterface $clock = null,
     ) {
         $this->clock = $clock ?? new class () implements ClockInterface {
             public function now(): DateTimeImmutable

diff --git a/tests/CacheKeyTest.php b/tests/CacheKeyTest.php
@@ -8,6 +8,9 @@
 use PHPUnit\Framework\TestCase;
 use Psr\Cache\InvalidArgumentException;
 
+/**
+ * @internal
+ */
 class CacheKeyTest extends TestCase
 {
     #[DataProvider('validValues')]