Merge pull request #72 from tighten/adc/add-support-dirty

Add support for `--dirty`

Author: driftingly

app/Commands/DusterCommand.php

@@ -61,6 +61,11 @@ protected function configure(): void
                         mode: InputOption::VALUE_REQUIRED,
                         description: 'Lint/Fix using specified (comma separated) tools: tlint,phpcodesniffer,phpcsfixer,pint',
                     ),
+                    new InputOption(
+                        name: 'dirty',
+                        mode: InputOption::VALUE_NONE,
+                        description: 'Only fix files that have uncommitted changes'
+                    ),
                     new InputOption(
                         name: 'github-actions',
                         shortcut: 'g',

app/Providers/DusterServiceProvider.php

@@ -22,10 +22,10 @@ public function register()
         $this->app->singleton(DusterConfig::class, function () {
             $input = $this->app->get(InputInterface::class);
 
-            $dusterConfig = $this->getDusterConfig();
+            $dusterConfig = DusterConfig::all();
 
             return new DusterConfig([
-                'paths' => $input->getArgument('path'),
+                'paths' => Project::paths($input),
                 'lint' => $input->getOption('lint'),
                 'fix' => $input->getOption('fix'),
                 'using' => $input->getOption('using'),
@@ -42,7 +42,7 @@ public function register()
 
             $using = $input->getOption('using')
                 ? explode(',', $input->getOption('using'))
-                : ['tlint', 'phpcs', 'php-cs-fixer', 'pint', ...array_keys($this->getDusterConfig()['scripts'][$mode] ?? [])];
+                : ['tlint', 'phpcs', 'php-cs-fixer', 'pint', ...array_keys(DusterConfig::all()['scripts'][$mode] ?? [])];
 
             $tools = collect($using)
                 ->map(fn ($using): Tool => match (trim($using)) {
@@ -65,25 +65,9 @@ public function register()
         });
     }
 
-    /**
-     * @return  array<string, mixed>
-     */
-    private function getDusterConfig(): array
-    {
-        if (file_exists(Project::path() . '/duster.json')) {
-            return tap(json_decode(file_get_contents(Project::path() . '/duster.json'), true, 512, JSON_THROW_ON_ERROR), function ($configuration) {
-                if (! is_array($configuration)) {
-                    abort(1, 'The configuration file duster.json is not valid JSON.');
-                }
-            });
-        }
-
-        return [];
-    }
-
     private function userScript(string $mode, string $scriptName): ?UserScript
     {
-        $userScript = $this->getDusterConfig()['scripts'][$mode][$scriptName] ?? null;
+        $userScript = DusterConfig::all()['scripts'][$mode][$scriptName] ?? null;
 
         return $userScript
             ? new UserScript($scriptName, $userScript, resolve(DusterConfig::class))

app/Providers/PintServiceProvider.php

@@ -5,11 +5,13 @@
 use App\Actions\ElaborateSummary;
 use App\Actions\FixCode;
 use App\Commands\DefaultCommand;
+use App\Contracts\PathsRepository;
 use App\Contracts\PintInputInterface;
 use App\Output\ProgressOutput;
 use App\Output\SummaryOutput;
 use App\Project;
 use App\Repositories\ConfigurationJsonRepository;
+use App\Repositories\GitPathsRepository;
 use App\Repositories\PintConfigurationJsonRepository;
 use App\Support\DusterConfig;
 use Illuminate\Support\ServiceProvider;
@@ -31,7 +33,7 @@ public function register()
             $input = $this->app->get(InputInterface::class);
 
             return new ArrayInput(
-                ['--test' => $input->getOption('lint'), 'path' => $input->getArgument('path')],
+                ['--test' => $input->getOption('lint'), 'path' => Project::paths($input)],
                 resolve(DefaultCommand::class)->getDefinition()
             );
         });
@@ -66,7 +68,13 @@ public function register()
                 base_path('standards/pint.json'),
             ])->first(fn ($path) => file_exists($path));
 
-            return new PintConfigurationJsonRepository($config, null, resolve(DusterConfig::class));
+            return new PintConfigurationJsonRepository($config, null, DusterConfig::all()['exclude'] ?? []);
+        });
+
+        $this->app->singleton(PathsRepository::class, function () {
+            return new GitPathsRepository(
+                Project::path(),
+            );
         });
     }
 }

app/Repositories/PintConfigurationJsonRepository.php

@@ -2,14 +2,15 @@
 
 namespace App\Repositories;
 
-use App\Support\DusterConfig;
-
 class PintConfigurationJsonRepository extends ConfigurationJsonRepository
 {
+    /**
+     * @param  array<string, array<int, string>|string>  $exclude
+     */
     public function __construct(
         protected $path,
         protected $preset,
-        protected DusterConfig $dusterConfig)
+        protected array $exclude)
     {
     }
 
@@ -20,10 +21,9 @@ protected function get(): array
     {
         $config = $this->getPintConfig();
 
-        collect($this->dusterConfig->get('exclude', []))
-            ->each(function ($path) use (&$config) {
-                $config = $this->addPathToConfig($path, $config);
-            });
+        collect($this->exclude)->each(function ($path) use (&$config) {
+            $config = $this->addPathToConfig($path, $config);
+        });
 
         return $config;
     }

app/Support/DusterConfig.php

@@ -2,6 +2,7 @@
 
 namespace App\Support;
 
+use App\Project;
 use Illuminate\Support\Arr;
 
 class DusterConfig
@@ -27,6 +28,22 @@ public function __construct(
         );
     }
 
+    /**
+     * @return  array<string, mixed>
+     */
+    public static function all(): array
+    {
+        if (file_exists(Project::path() . '/duster.json')) {
+            return tap(json_decode(file_get_contents(Project::path() . '/duster.json'), true, 512, JSON_THROW_ON_ERROR), function ($configuration) {
+                if (! is_array($configuration)) {
+                    abort(1, 'The configuration file duster.json is not valid JSON.');
+                }
+            });
+        }
+
+        return [];
+    }
+
     public function get(string $key, mixed $default = null): mixed
     {
         return Arr::get($this->config, $key, $default);

app/Support/PhpCodeSniffer.php

@@ -49,7 +49,6 @@ private function process(string $tool, array $params = []): int
             '--standard=' . $this->getConfigFile(),
             ...$ignore,
             ...$params,
-            ...$this->dusterConfig->get('include', []),
         ];
 
         $this->resetConfig($tool);
@@ -122,6 +121,7 @@ private function getDefaultDirectories(): array
                 Project::path() . '/resources',
                 Project::path() . '/routes',
                 Project::path() . '/tests',
+                ...$this->dusterConfig->get('include', []),
             ],
             fn ($dir) => is_dir($dir)
         ) ?: [Project::path()];