Merge pull request #11 from KaririCode-Framework/develop

Develop

Author: walmir-silva

src/Command/AbstractCommand.php

@@ -81,13 +81,7 @@ protected function confirm(string $question, bool $default = false): bool
     /** @param list<string> $arguments */
     protected function hasFlag(array $arguments, string ...$flags): bool
     {
-        foreach ($flags as $flag) {
-            if (\in_array($flag, $arguments, true)) {
-                return true;
-            }
-        }
-
-        return false;
+        return array_any($flags, fn ($flag): bool => \in_array($flag, $arguments, true));
     }
 
     /**

src/Command/InitCommand.php

@@ -5,6 +5,7 @@
 namespace KaririCode\Devkit\Command;
 
 use KaririCode\Devkit\Core\Devkit;
+use KaririCode\Devkit\Core\MigrationDetector;
 
 /**
  * Generates all config files inside `.kcode/`.
@@ -45,11 +46,11 @@ public function execute(Devkit $devkit, array $arguments): int
 
         // Scaffold devkit.php if requested
         if ($this->hasFlag($arguments, '--config')) {
-            $this->scaffoldDevkitConfig($context->projectRoot, $context);
+            $this->scaffoldDevkitConfig($context->projectRoot);
         }
 
         // Hint: detect redundant root-level configs and dev dependencies
-        $detector = new \KaririCode\Devkit\Core\MigrationDetector();
+        $detector = new MigrationDetector();
         $migration = $detector->detect($context->projectRoot);
 
         if ($migration->hasRedundancies) {
@@ -64,7 +65,7 @@ public function execute(Devkit $devkit, array $arguments): int
         return 0;
     }
 
-    private function scaffoldDevkitConfig(string $projectRoot, \KaririCode\Devkit\Core\ProjectContext $context): void
+    private function scaffoldDevkitConfig(string $projectRoot): void
     {
         $configPath = $projectRoot . \DIRECTORY_SEPARATOR . 'devkit.php';
 
@@ -74,7 +75,7 @@ private function scaffoldDevkitConfig(string $projectRoot, \KaririCode\Devkit\Co
             return;
         }
 
-        $content = <<<'PHP'
+        $content = <<<'PHP_WRAP'
             <?php
 
             declare(strict_types=1);
@@ -146,7 +147,7 @@ private function scaffoldDevkitConfig(string $projectRoot, \KaririCode\Devkit\Co
                 //     'psalm'        => '^6.0',
                 // ],
             ];
-            PHP;
+            PHP_WRAP;
 
         file_put_contents($configPath, $content . \PHP_EOL);
 

src/Configuration/CsFixerConfigGenerator.php

@@ -78,8 +78,7 @@ private function exportRules(array $rules): string
         $export = (string) preg_replace('/^array \($/m', '[', $export);
         $export = (string) preg_replace('/^\)$/m', ']', $export);
         $export = str_replace('array (', '[', $export);
-        $export = str_replace(')', ']', $export);
 
-        return $export;
+        return str_replace(')', ']', $export);
     }
 }

src/Core/DevkitConfig.php

@@ -117,7 +117,7 @@ public function toolVersions(): array
         /** @var array<string, string> $typed */
         $typed = array_filter(
             $tools,
-            static fn (mixed $v): bool => \is_string($v),
+            \is_string(...),
         );
 
         return $typed;

src/Core/ProjectContext.php

@@ -15,7 +15,6 @@
 final readonly class ProjectContext
 {
     public string $devkitDir;
-
     public string $buildDir;
 
     /**
@@ -63,13 +62,13 @@ public function buildPath(string $filename = ''): string
     /** @return list<string> Convert absolute source dirs to project-relative paths. */
     public function relativeSourceDirs(): array
     {
-        return array_map(fn (string $dir): string => $this->relativize($dir), $this->sourceDirs);
+        return array_map($this->relativize(...), $this->sourceDirs);
     }
 
     /** @return list<string> Convert absolute test dirs to project-relative paths. */
     public function relativeTestDirs(): array
     {
-        return array_map(fn (string $dir): string => $this->relativize($dir), $this->testDirs);
+        return array_map($this->relativize(...), $this->testDirs);
     }
 
     public function relativize(string $absolutePath): string

src/ValueObject/MigrationReport.php

@@ -13,7 +13,6 @@
 final readonly class MigrationReport
 {
     public bool $hasRedundancies;
-
     public int $totalItems;
 
     /**

src/ValueObject/QualityReport.php

@@ -12,9 +12,7 @@
 final readonly class QualityReport
 {
     public bool $passed;
-
     public float $totalSeconds;
-
     public int $failureCount;
 
     /** @param list<ToolResult> $results */