- Introduce Collection usage: Import Illuminate\Support\Collection for better type hinting and usage.

- Update analizeCommittedFiles method: Refactor the method to better describe its purpose and work with a Collection of ChangedFile objects.
- Add validateConfigPath method: Implement validation for configuration file paths to ensure they exist.
- Refactor suggestAutoFixOrExit: Separate the autofix logic into a new method autoFixFiles for better readability and testability.
- Update PintPreCommitHook: Simplify the conditional logic when validating the config path.
- Add test datasets: Introduce new datasets for testing cases when ESLint autofixer does not fix files completely.
- Add new test: Create a test to ensure the commit fails when ESLint autofixer is unable to fix all files.

Author: igorsgm

src/Console/Commands/Hooks/BaseCodeAnalyzerPreCommitHook.php

@@ -9,6 +9,7 @@
 use Igorsgm\GitHooks\Git\ChangedFiles;
 use Igorsgm\GitHooks\Traits\ProcessHelper;
 use Illuminate\Console\Command;
+use Illuminate\Support\Collection;
 use Symfony\Component\Console\Terminal;
 
 abstract class BaseCodeAnalyzerPreCommitHook
@@ -93,14 +94,15 @@ public function handleCommittedFiles(ChangedFiles $files, Closure $next)
     }
 
     /**
-     * Analyzes the committed files and checks if they are properly formatted.
+     * Analyzes an array of ChangedFile objects and checks whether each file can be analyzed,
+     * whether it is properly formatted according to the configured analyzer, and collects
+     * paths of any files that are not properly formatted.
      *
-     * @param  mixed  $commitFiles  The files to analyze.
+     * @param  ChangedFile[]|Collection  $commitFiles  The files to analyze.
      * @return $this
      */
     protected function analizeCommittedFiles($commitFiles)
     {
-        /** @var ChangedFile $file */
         foreach ($commitFiles as $file) {
             if (! $this->canFileBeAnalyzed($file)) {
                 continue;
@@ -181,6 +183,14 @@ protected function validateAnalyzerInstallation()
         throw new HookFailException();
     }
 
+    /**
+     * Validates the given configuration path.
+     *
+     * @param  string  $path  The path to the configuration file.
+     * @return $this This instance for method chaining.
+     *
+     * @throws HookFailException If the configuration file does not exist.
+     */
     protected function validateConfigPath($path)
     {
         if (file_exists($path)) {
@@ -199,27 +209,50 @@ protected function validateConfigPath($path)
 
     /**
      * Suggests attempting to automatically fix the incorrectly formatted files or exit.
-     *
-     * @return void
+     * If any files cannot be fixed, throws a HookFailException to cancel the commit.
      *
      * @throws HookFailException
      */
-    protected function suggestAutoFixOrExit()
+    protected function suggestAutoFixOrExit(): bool
     {
         $hasFixerCommand = ! empty($this->fixerCommand());
 
         if (Terminal::hasSttyAvailable() && $hasFixerCommand &&
-            $this->command->confirm('Would you like to attempt to correct files automagically?')
+            $this->command->confirm('Would you like to attempt to correct files automagically?') &&
+            $this->autoFixFiles()
         ) {
-            $errorFilesString = implode(' ', $this->filesBadlyFormattedPaths);
-
-            $this->runCommands([
-                $this->fixerCommand().' '.$errorFilesString,
-                'git add '.$errorFilesString,
-            ]);
-        } else {
-            throw new HookFailException();
+            return true;
+        }
+
+        throw new HookFailException();
+    }
+
+    /**
+     * Automatically fixes any files in the `$filesBadlyFormattedPaths` array using the
+     * configured fixer command. For each fixed file, adds it to Git and removes its path
+     * from the `$filesBadlyFormattedPaths` array.
+     *
+     *
+     * @throws HookFailException if any files cannot be fixed.
+     */
+    private function autoFixFiles(): bool
+    {
+        foreach ($this->filesBadlyFormattedPaths as $key => $filePath) {
+            $wasProperlyFixed = $this->runCommands($this->fixerCommand().' '.$filePath)->isSuccessful();
+
+            if ($wasProperlyFixed) {
+                $this->runCommands('git add '.$filePath);
+                unset($this->filesBadlyFormattedPaths[$key]);
+
+                continue;
+            }
+
+            $this->command->getOutput()->writeln(
+                sprintf('<fg=red> %s Autofix Failed:</> %s', $this->getName(), $filePath)
+            );
         }
+
+        return empty($this->filesBadlyFormattedPaths);
     }
 
     /**

src/Console/Commands/Hooks/PintPreCommitHook.php

@@ -61,9 +61,7 @@ protected function configParam(): string
     {
         $pintConfigFile = config('git-hooks.code_analyzers.laravel_pint.config');
 
-        if (! empty($pintConfigFile)) {
-            $this->validateConfigPath($pintConfigFile);
-
+        if (! empty($pintConfigFile) && $this->validateConfigPath($pintConfigFile)) {
             return '--config '.trim($pintConfigFile, '/');
         }
 

tests/Datasets/GitLogsDataset.php

@@ -36,3 +36,9 @@
         'AM temp/fixable-js-file.js',
     ]),
 ]);
+
+dataset('listOfNonFixableJSFiles', [
+    'List of Fixable Files' => implode(PHP_EOL, [
+        'AM temp/not-fully-fixable-js-file.js',
+    ]),
+]);

tests/Datasets/PreCommitHooksDataset.php

@@ -79,7 +79,9 @@
 $nonExistentPath = [
     'path' => 'nonexistent/path',
     'phpcs_path' => 'nonexistent/path',
+    'preset' => null,
     'config' => __DIR__.'/../Fixtures/pintFixture.json',
+
 ];
 
 dataset('codeAnalyzersList', [

tests/Features/Commands/Hooks/ESLintPreCommitHookTest.php

@@ -47,6 +47,27 @@ function ($eslintConfiguration, $listOfFixableJSFiles) {
             ->assertExitCode(1);
     })->with('eslintConfiguration', 'listOfFixableJSFiles');
 
+test('Fails commit when ESLint autofixer does not fix the files completely',
+    function ($eslintConfiguration, $listOfFixableNonJSFiles) {
+        $this->config->set('git-hooks.code_analyzers.eslint', $eslintConfiguration);
+        $this->config->set('git-hooks.pre-commit', [
+            ESLintPreCommitHook::class,
+        ]);
+
+        $this->makeTempFile('not-fully-fixable-js-file.js',
+            file_get_contents(__DIR__.'/../../../Fixtures/not-fully-fixable-js-file.js')
+        );
+
+        GitHooks::shouldReceive('isMergeInProgress')->andReturn(false);
+        GitHooks::shouldReceive('getListOfChangedFiles')->andReturn($listOfFixableNonJSFiles);
+
+        $this->artisan('git-hooks:pre-commit')
+            ->expectsOutputToContain('ESLint Failed')
+            ->expectsOutputToContain('COMMIT FAILED')
+            ->expectsConfirmation('Would you like to attempt to correct files automagically?', 'yes')
+            ->expectsOutputToContain('ESLint Autofix Failed');
+    })->with('eslintConfiguration', 'listOfNonFixableJSFiles');
+
 test('Commit passes when ESLint fixes the files', function ($eslintConfiguration, $listOfFixableJSFiles) {
     $this->config->set('git-hooks.code_analyzers.eslint', $eslintConfiguration);
     $this->config->set('git-hooks.pre-commit', [

tests/Fixtures/not-fully-fixable-js-file.js

@@ -0,0 +1,6 @@
+function test()
+
+{
+  return false;
+
+}