Use the new trait

phpro · May 26, 2024 · 0cb1122 · 0cb1122
1 parent c7cc1b5
commit 0cb1122
Show file tree

Hide file tree

Showing 63 changed files with 82 additions and 127 deletions.
diff --git a/src/Task/AbstractExternalTask.php b/src/Task/AbstractExternalTask.php
@@ -14,6 +14,8 @@
  */
 abstract class AbstractExternalTask implements TaskInterface
 {
+    use GitContextTrait;
+
     /**
      * @var TaskConfigInterface
      */

diff --git a/src/Task/AbstractLinterTask.php b/src/Task/AbstractLinterTask.php
@@ -17,6 +17,8 @@
  */
 abstract class AbstractLinterTask implements TaskInterface
 {
+    use GitContextTrait;
+
     /**
      * @var TaskConfigInterface
      */

diff --git a/src/Task/AbstractParserTask.php b/src/Task/AbstractParserTask.php
@@ -17,6 +17,8 @@
  */
 abstract class AbstractParserTask implements TaskInterface
 {
+    use GitContextTrait;
+
     /**
      * @var TaskConfigInterface
      */

diff --git a/src/Task/Ant.php b/src/Task/Ant.php
@@ -9,7 +9,6 @@
 use GrumPHP\Runner\TaskResultInterface;
 use GrumPHP\Task\Config\ConfigOptionsResolver;
 use GrumPHP\Task\Context\ContextInterface;
-use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -36,7 +35,7 @@ public static function getConfigurableOptions(): ConfigOptionsResolver
 
     public function canRunInContext(ContextInterface $context): bool
     {
-        return $context instanceof GitPreCommitContext || $context instanceof RunContext;
+        return $this->isGitContextAllowed($context) || $context instanceof RunContext;
     }
 
     public function run(ContextInterface $context): TaskResultInterface

diff --git a/src/Task/Atoum.php b/src/Task/Atoum.php
@@ -9,7 +9,6 @@
 use GrumPHP\Runner\TaskResultInterface;
 use GrumPHP\Task\Config\ConfigOptionsResolver;
 use GrumPHP\Task\Context\ContextInterface;
-use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -47,7 +46,7 @@ public static function getConfigurableOptions(): ConfigOptionsResolver
      */
     public function canRunInContext(ContextInterface $context): bool
     {
-        return $context instanceof GitPreCommitContext || $context instanceof RunContext;
+        return $this->isGitContextAllowed($context) || $context instanceof RunContext;
     }
 
     /**

diff --git a/src/Task/Behat.php b/src/Task/Behat.php
@@ -9,7 +9,6 @@
 use GrumPHP\Runner\TaskResultInterface;
 use GrumPHP\Task\Config\ConfigOptionsResolver;
 use GrumPHP\Task\Context\ContextInterface;
-use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -43,7 +42,7 @@ public static function getConfigurableOptions(): ConfigOptionsResolver
      */
     public function canRunInContext(ContextInterface $context): bool
     {
-        return $context instanceof GitPreCommitContext || $context instanceof RunContext;
+        return $this->isGitContextAllowed($context) || $context instanceof RunContext;
     }
 
     /**

diff --git a/src/Task/Brunch.php b/src/Task/Brunch.php
@@ -9,7 +9,6 @@
 use GrumPHP\Runner\TaskResultInterface;
 use GrumPHP\Task\Config\ConfigOptionsResolver;
 use GrumPHP\Task\Context\ContextInterface;
-use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -43,7 +42,7 @@ public static function getConfigurableOptions(): ConfigOptionsResolver
      */
     public function canRunInContext(ContextInterface $context): bool
     {
-        return $context instanceof GitPreCommitContext || $context instanceof RunContext;
+        return $this->isGitContextAllowed($context) || $context instanceof RunContext;
     }
 
     /**

diff --git a/src/Task/CloverCoverage.php b/src/Task/CloverCoverage.php
@@ -10,7 +10,6 @@
 use GrumPHP\Task\Config\EmptyTaskConfig;
 use GrumPHP\Task\Config\TaskConfigInterface;
 use GrumPHP\Task\Context\ContextInterface;
-use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
 use GrumPHP\Util\Filesystem;
 use SimpleXMLElement;
@@ -19,6 +18,8 @@
 
 class CloverCoverage implements TaskInterface
 {
+    use GitContextTrait;
+
     /**
      * @var Filesystem
      */
@@ -72,7 +73,7 @@ public static function getConfigurableOptions(): ConfigOptionsResolver
      */
     public function canRunInContext(ContextInterface $context): bool
     {
-        return $context instanceof GitPreCommitContext || $context instanceof RunContext;
+        return $this->isGitContextAllowed($context) || $context instanceof RunContext;
     }
 
     /**

diff --git a/src/Task/Codeception.php b/src/Task/Codeception.php
@@ -9,7 +9,6 @@
 use GrumPHP\Runner\TaskResultInterface;
 use GrumPHP\Task\Config\ConfigOptionsResolver;
 use GrumPHP\Task\Context\ContextInterface;
-use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -45,7 +44,7 @@ public static function getConfigurableOptions(): ConfigOptionsResolver
      */
     public function canRunInContext(ContextInterface $context): bool
     {
-        return $context instanceof GitPreCommitContext || $context instanceof RunContext;
+        return $this->isGitContextAllowed($context) || $context instanceof RunContext;
     }
 
     /**

diff --git a/src/Task/Composer.php b/src/Task/Composer.php
@@ -10,7 +10,6 @@
 use GrumPHP\Runner\TaskResultInterface;
 use GrumPHP\Task\Config\ConfigOptionsResolver;
 use GrumPHP\Task\Context\ContextInterface;
-use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
 use GrumPHP\Util\Filesystem;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -61,7 +60,7 @@ public static function getConfigurableOptions(): ConfigOptionsResolver
 
     public function canRunInContext(ContextInterface $context): bool
     {
-        return $context instanceof GitPreCommitContext || $context instanceof RunContext;
+        return $this->isGitContextAllowed($context) || $context instanceof RunContext;
     }
 
     public function run(ContextInterface $context): TaskResultInterface

diff --git a/src/Task/ComposerNormalize.php b/src/Task/ComposerNormalize.php
@@ -8,7 +8,6 @@
 use GrumPHP\Runner\TaskResultInterface;
 use GrumPHP\Task\Config\ConfigOptionsResolver;
 use GrumPHP\Task\Context\ContextInterface;
-use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Process\Process;
@@ -20,7 +19,7 @@ class ComposerNormalize extends AbstractExternalTask
 {
     public function canRunInContext(ContextInterface $context): bool
     {
-        return $context instanceof GitPreCommitContext || $context instanceof RunContext;
+        return $this->isGitContextAllowed($context) || $context instanceof RunContext;
     }
 
     public static function getConfigurableOptions(): ConfigOptionsResolver

diff --git a/src/Task/ComposerRequireChecker.php b/src/Task/ComposerRequireChecker.php
@@ -9,7 +9,6 @@
 use GrumPHP\Runner\TaskResultInterface;
 use GrumPHP\Task\Config\ConfigOptionsResolver;
 use GrumPHP\Task\Context\ContextInterface;
-use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -41,7 +40,7 @@ public static function getConfigurableOptions(): ConfigOptionsResolver
      */
     public function canRunInContext(ContextInterface $context): bool
     {
-        return $context instanceof GitPreCommitContext || $context instanceof RunContext;
+        return $this->isGitContextAllowed($context) || $context instanceof RunContext;
     }
 
     /**

diff --git a/src/Task/ComposerScript.php b/src/Task/ComposerScript.php
@@ -9,7 +9,6 @@
 use GrumPHP\Runner\TaskResultInterface;
 use GrumPHP\Task\Config\ConfigOptionsResolver;
 use GrumPHP\Task\Context\ContextInterface;
-use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -39,7 +38,7 @@ public static function getConfigurableOptions(): ConfigOptionsResolver
      */
     public function canRunInContext(ContextInterface $context): bool
     {
-        return $context instanceof GitPreCommitContext || $context instanceof RunContext;
+        return $this->isGitContextAllowed($context) || $context instanceof RunContext;
     }
 
     /**

diff --git a/src/Task/Deptrac.php b/src/Task/Deptrac.php
@@ -9,7 +9,6 @@
 use GrumPHP\Runner\TaskResultInterface;
 use GrumPHP\Task\Config\ConfigOptionsResolver;
 use GrumPHP\Task\Context\ContextInterface;
-use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -38,7 +37,7 @@ public static function getConfigurableOptions(): ConfigOptionsResolver
 
     public function canRunInContext(ContextInterface $context): bool
     {
-        return $context instanceof GitPreCommitContext || $context instanceof RunContext;
+        return $this->isGitContextAllowed($context) || $context instanceof RunContext;
     }
 
     public function run(ContextInterface $context): TaskResultInterface

diff --git a/src/Task/DoctrineOrm.php b/src/Task/DoctrineOrm.php
@@ -9,7 +9,6 @@
 use GrumPHP\Runner\TaskResultInterface;
 use GrumPHP\Task\Config\ConfigOptionsResolver;
 use GrumPHP\Task\Context\ContextInterface;
-use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -39,7 +38,7 @@ public static function getConfigurableOptions(): ConfigOptionsResolver
      */
     public function canRunInContext(ContextInterface $context): bool
     {
-        return $context instanceof GitPreCommitContext || $context instanceof RunContext;
+        return $this->isGitContextAllowed($context) || $context instanceof RunContext;
     }
 
     /**

diff --git a/src/Task/ESLint.php b/src/Task/ESLint.php
@@ -11,7 +11,6 @@
 use GrumPHP\Runner\TaskResultInterface;
 use GrumPHP\Task\Config\ConfigOptionsResolver;
 use GrumPHP\Task\Context\ContextInterface;
-use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -60,7 +59,7 @@ public static function getConfigurableOptions(): ConfigOptionsResolver
 
     public function canRunInContext(ContextInterface $context): bool
     {
-        return ($context instanceof GitPreCommitContext || $context instanceof RunContext);
+        return ($this->isGitContextAllowed($context) || $context instanceof RunContext);
     }
 
     public function run(ContextInterface $context): TaskResultInterface

diff --git a/src/Task/Ecs.php b/src/Task/Ecs.php
@@ -12,7 +12,6 @@
 use GrumPHP\Runner\TaskResultInterface;
 use GrumPHP\Task\Config\ConfigOptionsResolver;
 use GrumPHP\Task\Context\ContextInterface;
-use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Process\Process;
@@ -48,7 +47,7 @@ public static function getConfigurableOptions(): ConfigOptionsResolver
 
     public function canRunInContext(ContextInterface $context): bool
     {
-        return $context instanceof GitPreCommitContext || $context instanceof RunContext;
+        return $this->isGitContextAllowed($context) || $context instanceof RunContext;
     }
 
     public function run(ContextInterface $context): TaskResultInterface
@@ -102,7 +101,7 @@ private function addPaths(
         FilesCollection $files,
         array $config
     ): void {
-        if ($context instanceof GitPreCommitContext && $config['files_on_pre_commit']) {
+        if ($this->isGitContextAllowed($context) && $config['files_on_pre_commit']) {
             $arguments->addFiles($files);
             return;
         }

diff --git a/src/Task/FileSize.php b/src/Task/FileSize.php
@@ -10,12 +10,13 @@
 use GrumPHP\Task\Config\EmptyTaskConfig;
 use GrumPHP\Task\Config\TaskConfigInterface;
 use GrumPHP\Task\Context\ContextInterface;
-use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class FileSize implements TaskInterface
 {
+    use GitContextTrait;
+
     /**
      * @var TaskConfigInterface
      */
@@ -55,7 +56,7 @@ public function withConfig(TaskConfigInterface $config): TaskInterface
 
     public function canRunInContext(ContextInterface $context): bool
     {
-        return $context instanceof RunContext || $context instanceof GitPreCommitContext;
+        return $context instanceof RunContext || $this->isGitContextAllowed($context);
     }
 
     public function run(ContextInterface $context): TaskResultInterface

diff --git a/src/Task/Gherkin.php b/src/Task/Gherkin.php
@@ -9,7 +9,6 @@
 use GrumPHP\Runner\TaskResultInterface;
 use GrumPHP\Task\Config\ConfigOptionsResolver;
 use GrumPHP\Task\Context\ContextInterface;
-use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -38,7 +37,7 @@ public static function getConfigurableOptions(): ConfigOptionsResolver
      */
     public function canRunInContext(ContextInterface $context): bool
     {
-        return $context instanceof GitPreCommitContext || $context instanceof RunContext;
+        return $this->isGitContextAllowed($context) || $context instanceof RunContext;
     }
 
     /**

diff --git a/src/Task/Git/Blacklist.php b/src/Task/Git/Blacklist.php
@@ -12,7 +12,6 @@
 use GrumPHP\Task\AbstractExternalTask;
 use GrumPHP\Task\Config\ConfigOptionsResolver;
 use GrumPHP\Task\Context\ContextInterface;
-use GrumPHP\Task\Context\GitPreCommitContext;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
@@ -63,7 +62,7 @@ public static function getConfigurableOptions(): ConfigOptionsResolver
 
     public function canRunInContext(ContextInterface $context): bool
     {
-        return $context instanceof GitPreCommitContext;
+        return $this->isGitContextAllowed($context);
     }
 
     public function run(ContextInterface $context): TaskResultInterface

diff --git a/src/Task/Git/BranchName.php b/src/Task/Git/BranchName.php
@@ -12,14 +12,16 @@
 use GrumPHP\Task\Config\EmptyTaskConfig;
 use GrumPHP\Task\Config\TaskConfigInterface;
 use GrumPHP\Task\Context\ContextInterface;
-use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
+use GrumPHP\Task\GitContextTrait;
 use GrumPHP\Util\Regex;
 use GrumPHP\Task\TaskInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class BranchName implements TaskInterface
 {
+    use GitContextTrait;
+
     /**
      * @var TaskConfigInterface
      */
@@ -69,7 +71,7 @@ public static function getConfigurableOptions(): ConfigOptionsResolver
 
     public function canRunInContext(ContextInterface $context): bool
     {
-        return $context instanceof RunContext || $context instanceof GitPreCommitContext;
+        return $context instanceof RunContext || $this->isGitContextAllowed($context);
     }
 
     public function run(ContextInterface $context): TaskResultInterface

diff --git a/src/Task/Grunt.php b/src/Task/Grunt.php
@@ -9,7 +9,6 @@
 use GrumPHP\Runner\TaskResultInterface;
 use GrumPHP\Task\Config\ConfigOptionsResolver;
 use GrumPHP\Task\Context\ContextInterface;
-use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -39,7 +38,7 @@ public static function getConfigurableOptions(): ConfigOptionsResolver
      */
     public function canRunInContext(ContextInterface $context): bool
     {
-        return $context instanceof GitPreCommitContext || $context instanceof RunContext;
+        return $this->isGitContextAllowed($context) || $context instanceof RunContext;
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,8 @@ @@
      */
     abstract class AbstractExternalTask implements TaskInterface
     {
+        use GitContextTrait;
         /**
          * @var TaskConfigInterface
          */
@@ Expand Down @@