NGGW-94 rename class, extend list of default extensions, refactor dup…

…licated function
netgen · Mar 6, 2023 · 9157fea · emodric · Mar 6, 2023 · emodric
1 parent a9a1c1a
commit 9157fea
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 29 deletions.
diff --git a/src/Action/Action.php b/src/Action/Action.php
@@ -45,4 +45,17 @@ private function isEnabled(ActionConfig $action): bool
     {
         return $action->getOptions()->get('enabled', true);
     }
+
+    public function getChangedFiles(Config\Action $action, Repository $repository): array
+    {
+        $excludedFiles = $action->getOptions()->get('excluded_files');
+        $extensions = $action->getOptions()->get('extensions', ['php', 'twig']);
+
+        $changedFiles = [];
+        foreach ($extensions as $extension) {
+            $changedFiles = [...$changedFiles, ...$repository->getIndexOperator()->getStagedFilesOfType($extension)];
+        }
+
+        return array_diff($changedFiles, $excludedFiles);
+    }
 }
diff --git a/src/Action/CheckForTabs.php b/src/Action/CheckForTabs.php
@@ -25,7 +25,7 @@ protected function doExecute(Config $config, IO $io, Repository $repository, Con
         $arguments = array_merge(
             [
                 'grep',
-                '\t',
+                '$\t',
             ],
             $files
         );
@@ -40,17 +40,4 @@ protected function doExecute(Config $config, IO $io, Repository $repository, Con
             $this->throwError($action, $io);
         }
     }
-
-    private function getChangedFiles(Config\Action $action, Repository $repository): array
-    {
-        $excludedFiles = $action->getOptions()->get('excluded_files');
-        $extensions = $action->getOptions()->get('extensions', ['php']);
-
-        $changedFiles = [];
-        foreach ($extensions as $extension) {
-            $changedFiles = [...$changedFiles, ...$repository->getIndexOperator()->getStagedFilesOfType($extension)];
-        }
-
-        return array_diff($changedFiles, $excludedFiles);
-    }
 }
diff --git a/src/Action/CheckForSpacesInEOL.php → src/Action/CheckForWhiteSpaceAtEOL.php b/src/Action/CheckForSpacesInEOL.php → src/Action/CheckForWhiteSpaceAtEOL.php
@@ -11,9 +11,9 @@
 use function array_diff;
 use function implode;
 
-final class CheckForSpacesInEOL extends Action
+final class CheckForWhiteSpaceAtEOL extends Action
 {
-    protected const ERROR_MESSAGE = 'You have spaces at EOL!';
+    protected const ERROR_MESSAGE = 'You have white spaces at EOL!';
 
     protected function doExecute(Config $config, IO $io, Repository $repository, Config\Action $action): void
     {
@@ -40,17 +40,4 @@ protected function doExecute(Config $config, IO $io, Repository $repository, Con
             $this->throwError($action, $io);
         }
     }
-
-    private function getChangedFiles(Config\Action $action, Repository $repository): array
-    {
-        $excludedFiles = $action->getOptions()->get('excluded_files');
-        $extensions = $action->getOptions()->get('extensions', ['php']);
-
-        $changedFiles = [];
-        foreach ($extensions as $extension) {
-            $changedFiles = [...$changedFiles, ...$repository->getIndexOperator()->getStagedFilesOfType($extension)];
-        }
-
-        return array_diff($changedFiles, $excludedFiles);
-    }
 }