Merge pull request #66 from tighten/adc/fix-lint-staged

Fix issue with PHP CS Fixer when providing multiple files

Author: driftingly

app/Support/PhpCsFixer.php

@@ -49,6 +49,7 @@ private function process(): int
         $resolver = new ConfigurationResolver(
             $this->getConfig(),
             [
+                'config' => $this->getConfigFilePath(),
                 'allow-risky' => 'yes',
                 'diff' => $output->isVerbose(),
                 'dry-run' => $this->dusterConfig->get('lint'),
@@ -63,7 +64,7 @@ private function process(): int
         );
 
         $changes = (new Runner(
-            $resolver->getFinder(),
+            $this->getConfig()->getFinder(),
             $resolver->getFixers(),
             $resolver->getDiffer(),
             app()->get(EventDispatcher::class),
@@ -84,13 +85,29 @@ private function process(): int
 
     private function getConfig(): ConfigInterface
     {
-        $config = $this->getConfigFile();
+        $config = $this->includeConfig();
 
         if (! $config instanceof ConfigInterface) {
             throw new InvalidConfigurationException("The PHP CS Fixer config file does not return a 'PhpCsFixer\ConfigInterface' instance.");
         }
 
-        $finder = $config->getFinder();
+        return $config->setFinder($this->updateFinder($config->getFinder()));
+    }
+
+    /**
+     * Update the finder with the paths and exclude from the config.
+     * We are bypassing resolveFinder() in ConfigurationResolver
+     * to allow for us to use the global duster config.
+     */
+    private function updateFinder(Finder $finder): Finder
+    {
+        collect($this->dusterConfig->get('paths', []))->each(function ($path) use ($finder) {
+            if (is_dir($path)) {
+                $finder = $finder->in($path);
+            } elseif (is_file($path)) {
+                $finder = $finder->append([$path]);
+            }
+        });
 
         collect($this->dusterConfig->get('exclude', []))->each(function ($path) use ($finder) {
             if (is_dir($path)) {
@@ -100,12 +117,17 @@ private function getConfig(): ConfigInterface
             }
         });
 
-        return $config->setFinder($finder);
+        return $finder;
+    }
+
+    private function includeConfig(): Config
+    {
+        return include $this->getConfigFilePath();
     }
 
-    private function getConfigFile(): Config
+    private function getConfigFilePath(): string
     {
-        return include (string) collect([
+        return (string) collect([
             Project::path() . '/.php-cs-fixer.dist.php',
             Project::path() . '/.php-cs-fixer.php',
             base_path('standards/.php-cs-fixer.dist.php'),

builds/duster

@@ -26,7 +26,7 @@
     |
     */
 
-    'version' => '0.5.5',
+    'version' => '0.5.6',
 
     /*
     |--------------------------------------------------------------------------

config/app.php

@@ -128,3 +128,19 @@
         ->not->toContain('Linting using PHP_CodeSniffer')
         ->not->toContain('Linting using PHP CS Fixer');
 });
+
+it('lints multiple provided files', function () {
+    [$statusCode, $output] = run('duster', [
+        'path' => [
+            base_path('tests/Fixtures/MultipleFixableIssues/file.blade.php'),
+            base_path('tests/Fixtures/MultipleFixableIssues/file.php'),
+        ],
+    ]);
+
+    expect($statusCode)->toBe(1)
+        ->and($output)
+        ->toContain('Linting using TLint')
+        ->toContain('Put a space between blade control structure names and the opening paren:`@if(` -> `@if (`')
+        ->toContain('Linting using Pint')
+        ->toContain('concat_space');
+});

tests/Feature/DusterCommandTest.php

@@ -2,6 +2,7 @@
 
 use App\Commands\DusterCommand;
 use App\Kernel;
+use Illuminate\Support\Arr;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\BufferedOutput;
@@ -65,7 +66,7 @@ function run($command, $arguments)
         '--lint' => true,
     ], $arguments);
 
-    $arguments['path'] = [$arguments['path']];
+    $arguments['path'] = Arr::wrap($arguments['path']);
 
     $input = new ArrayInput($arguments, resolve(DusterCommand::class)->getDefinition());
     $output = new BufferedOutput(