refactor (Tools/Execution)

Wtyd · Oct 13, 2022 · 4742247 · 4742247
1 parent d2cabf9
commit 4742247
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 25 deletions.
diff --git a/src/Container/RegisterBindings.php b/src/Container/RegisterBindings.php
@@ -3,8 +3,8 @@
 namespace Wtyd\GitHooks\Container;
 
 use Illuminate\Container\Container;
-use Wtyd\GitHooks\Tools\Execution\ProcessExecutionFactory;
-use Wtyd\GitHooks\Tools\Execution\ProcessExecutionFactoryAbstract;
+use Wtyd\GitHooks\Tools\Process\ProcessExecutionFactory\ProcessExecutionFactory;
+use Wtyd\GitHooks\Tools\Process\ProcessExecutionFactory\ProcessExecutionFactoryAbstract;
 use Wtyd\GitHooks\Utils\FileUtils;
 use Wtyd\GitHooks\Utils\FileUtilsInterface;
 

diff --git a/...ols/Execution/MultiProcessesExecution.php → ...ess/Execution/MultiProcessesExecution.php b/...ols/Execution/MultiProcessesExecution.php → ...ess/Execution/MultiProcessesExecution.php
@@ -2,10 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Wtyd\GitHooks\Tools\Execution;
+namespace Wtyd\GitHooks\Tools\Process\Execution;
 
 use Symfony\Component\Process\Exception\ProcessTimedOutException;
 use Wtyd\GitHooks\Tools\Errors;
+use Wtyd\GitHooks\Tools\Process\Process;
 
 class MultiProcessesExecution extends ProcessExecutionAbstract
 {

diff --git a/...Execution/MultiProcessesExecutionFake.php → ...Execution/MultiProcessesExecutionFake.php b/...Execution/MultiProcessesExecutionFake.php → ...Execution/MultiProcessesExecutionFake.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Wtyd\GitHooks\Tools\Execution;
+namespace Wtyd\GitHooks\Tools\Process\Execution;
+
+use Wtyd\GitHooks\Tools\Process\ExecutionFakeTrait;
 
 class MultiProcessesExecutionFake extends MultiProcessesExecution
 {

diff --git a/src/Tools/Execution/ProcessExecution.php → ...ls/Process/Execution/ProcessExecution.php b/src/Tools/Execution/ProcessExecution.php → ...ls/Process/Execution/ProcessExecution.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Wtyd\GitHooks\Tools\Execution;
+namespace Wtyd\GitHooks\Tools\Process\Execution;
 
 use Wtyd\GitHooks\Tools\Errors;
 

diff --git a/...ls/Execution/ProcessExecutionAbstract.php → ...ss/Execution/ProcessExecutionAbstract.php b/...ls/Execution/ProcessExecutionAbstract.php → ...ss/Execution/ProcessExecutionAbstract.php
@@ -2,9 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Wtyd\GitHooks\Tools\Execution;
+namespace Wtyd\GitHooks\Tools\Process\Execution;
 
 use Wtyd\GitHooks\Tools\Errors;
+use Wtyd\GitHooks\Tools\Process\Process;
 use Wtyd\GitHooks\Tools\Tool\ToolAbstract;
 use Wtyd\GitHooks\Utils\Printer;
 

diff --git a/src/Tools/Execution/ProcessExecutionFake.php → ...rocess/Execution/ProcessExecutionFake.php b/src/Tools/Execution/ProcessExecutionFake.php → ...rocess/Execution/ProcessExecutionFake.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Wtyd\GitHooks\Tools\Execution;
+namespace Wtyd\GitHooks\Tools\Process\Execution;
+
+use Wtyd\GitHooks\Tools\Process\ExecutionFakeTrait;
 
 class ProcessExecutionFake extends ProcessExecution
 {

diff --git a/src/Tools/Execution/ExecutionFakeTrait.php → src/Tools/Process/ExecutionFakeTrait.php b/src/Tools/Execution/ExecutionFakeTrait.php → src/Tools/Process/ExecutionFakeTrait.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Wtyd\GitHooks\Tools\Execution;
+namespace Wtyd\GitHooks\Tools\Process;
 
 /**
  * Trait for testing purposes. Gives public visibility for some methods and properties.

diff --git a/src/Tools/Execution/Process.php → src/Tools/Process/Process.php b/src/Tools/Execution/Process.php → src/Tools/Process/Process.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Wtyd\GitHooks\Tools\Execution;
+namespace Wtyd\GitHooks\Tools\Process;
 
 use Symfony\Component\Process\Exception\LogicException;
 use Symfony\Component\Process\Process as SymfonyProcess;

diff --git a/...ols/Execution/ProcessExecutionFactory.php → ...cutionFactory/ProcessExecutionFactory.php b/...ols/Execution/ProcessExecutionFactory.php → ...cutionFactory/ProcessExecutionFactory.php
@@ -2,8 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Wtyd\GitHooks\Tools\Execution;
+namespace Wtyd\GitHooks\Tools\Process\ProcessExecutionFactory;
 
+use Wtyd\GitHooks\Tools\Process\Execution\MultiProcessesExecution;
+use Wtyd\GitHooks\Tools\Process\Execution\ProcessExecution;
+use Wtyd\GitHooks\Tools\Process\Execution\ProcessExecutionAbstract;
 use Wtyd\GitHooks\Tools\Tool\ToolAbstract;
 
 class ProcessExecutionFactory extends ProcessExecutionFactoryAbstract

diff --git a/...ution/ProcessExecutionFactoryAbstract.php → ...ctory/ProcessExecutionFactoryAbstract.php b/...ution/ProcessExecutionFactoryAbstract.php → ...ctory/ProcessExecutionFactoryAbstract.php
@@ -2,9 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Wtyd\GitHooks\Tools\Execution;
+namespace Wtyd\GitHooks\Tools\Process\ProcessExecutionFactory;
 
 use Illuminate\Contracts\Container\Container;
+use Wtyd\GitHooks\Tools\Process\Execution\ProcessExecutionAbstract;
 use Wtyd\GitHooks\Utils\Printer;
 
 abstract class ProcessExecutionFactoryAbstract

diff --git a/...Execution/ProcessExecutionFactoryFake.php → ...onFactory/ProcessExecutionFactoryFake.php b/...Execution/ProcessExecutionFactoryFake.php → ...onFactory/ProcessExecutionFactoryFake.php
@@ -2,8 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Wtyd\GitHooks\Tools\Execution;
+namespace Wtyd\GitHooks\Tools\Process\ProcessExecutionFactory;
 
+use Wtyd\GitHooks\Tools\Process\Execution\MultiProcessesExecutionFake;
+use Wtyd\GitHooks\Tools\Process\Execution\ProcessExecutionAbstract;
+use Wtyd\GitHooks\Tools\Process\Execution\ProcessExecutionFake;
 use Wtyd\GitHooks\Tools\Tool\ToolAbstract;
 
 class ProcessExecutionFactoryFake extends ProcessExecutionFactoryAbstract

diff --git a/src/Tools/Execution/ProcessFake.php → src/Tools/Process/ProcessFake.php b/src/Tools/Execution/ProcessFake.php → src/Tools/Process/ProcessFake.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Wtyd\GitHooks\Tools\Execution;
+namespace Wtyd\GitHooks\Tools\Process;
 
 use Wtyd\GitHooks\Tools\Tool\ToolAbstract;
 
@@ -83,7 +83,7 @@ public function isSuccessful(): bool
      * Only in MultiProcessExecution when the execution fails
      * @inheritDoc
      */
-    public function getOutput()
+    public function getOutput(): string
     {
         return $this->output;
     }
@@ -92,7 +92,7 @@ public function getOutput()
      * Only in ProcessExecution
      * @inheritDoc
      */
-    public function wait(callable $callback = null)
+    public function wait(callable $callback = null): int
     {
         return $this->isSuccessful ? 0 : 1;
     }

diff --git a/tests/Integration/IgnoreErrorsOnExitFlagTest.php b/tests/Integration/IgnoreErrorsOnExitFlagTest.php
@@ -4,8 +4,8 @@
 
 use Tests\Utils\TestCase\ConsoleTestCase;
 use Wtyd\GitHooks\ConfigurationFile\FileReader;
-use Wtyd\GitHooks\Tools\Execution\MultiProcessesExecutionFake;
-use Wtyd\GitHooks\Tools\Execution\ProcessExecutionFake;
+use Wtyd\GitHooks\Tools\Process\Execution\MultiProcessesExecutionFake;
+use Wtyd\GitHooks\Tools\Process\Execution\ProcessExecutionFake;
 
 class IgnoreErrorsOnExitFlagTest extends ConsoleTestCase
 {

diff --git a/tests/System/Commands/ExecuteToolCommandTest.php b/tests/System/Commands/ExecuteToolCommandTest.php
@@ -7,8 +7,8 @@
 use Tests\Utils\FileUtilsFake;
 use Tests\Utils\PhpFileBuilder;
 use Tests\Utils\TestCase\SystemTestCase;
-use Wtyd\GitHooks\Tools\Execution\MultiProcessesExecutionFake;
-use Wtyd\GitHooks\Tools\Execution\ProcessExecutionFake;
+use Wtyd\GitHooks\Tools\Process\Execution\MultiProcessesExecutionFake;
+use Wtyd\GitHooks\Tools\Process\Execution\ProcessExecutionFake;
 use Wtyd\GitHooks\Utils\FileUtils;
 use Wtyd\GitHooks\Utils\FileUtilsInterface;
 

diff --git a/tests/Unit/Tools/Execution/MultiProcessesExecutionTest.php b/tests/Unit/Tools/Execution/MultiProcessesExecutionTest.php
@@ -8,7 +8,7 @@
 use Tests\Utils\ConfigurationFileBuilder;
 use Tests\Utils\TestCase\UnitTestCase;
 use Wtyd\GitHooks\ConfigurationFile\ConfigurationFile;
-use Wtyd\GitHooks\Tools\Execution\MultiProcessesExecutionFake;
+use Wtyd\GitHooks\Tools\Process\Execution\MultiProcessesExecutionFake;
 use Wtyd\GitHooks\Tools\ToolsFactoy;
 use Wtyd\GitHooks\Utils\Printer;
 

diff --git a/tests/Unit/Tools/Execution/ProcessExecutionTest.php b/tests/Unit/Tools/Execution/ProcessExecutionTest.php
@@ -8,7 +8,7 @@
 use Tests\Utils\ConfigurationFileBuilder;
 use Tests\Utils\TestCase\UnitTestCase;
 use Wtyd\GitHooks\ConfigurationFile\ConfigurationFile;
-use Wtyd\GitHooks\Tools\Execution\ProcessExecutionFake;
+use Wtyd\GitHooks\Tools\Process\Execution\ProcessExecutionFake;
 use Wtyd\GitHooks\Tools\ToolsFactoy;
 use Wtyd\GitHooks\Utils\Printer;
 

diff --git a/tests/Utils/TestCase/ConsoleTestCase.php b/tests/Utils/TestCase/ConsoleTestCase.php
@@ -8,8 +8,8 @@
     ZeroTestCase,
     PendingCommand
 };
-use Wtyd\GitHooks\Tools\Execution\ProcessExecutionFactoryAbstract;
-use Wtyd\GitHooks\Tools\Execution\ProcessExecutionFactoryFake;
+use Wtyd\GitHooks\Tools\Process\ProcessExecutionFactory\ProcessExecutionFactoryAbstract;
+use Wtyd\GitHooks\Tools\Process\ProcessExecutionFactory\ProcessExecutionFactoryFake;
 use Wtyd\GitHooks\Tools\Tool\{
     CodeSniffer\Phpcbf,
     CodeSniffer\PhpcbfFake,

diff --git a/tests/Utils/TestCase/SystemTestCase.php b/tests/Utils/TestCase/SystemTestCase.php
@@ -5,8 +5,6 @@
 use Tests\Utils\ConfigurationFileBuilder;
 use Tests\Utils\FileUtilsFake;
 use Tests\Utils\Traits\FileSystemTrait;
-use Wtyd\GitHooks\Tools\Execution\ProcessExecutionFactoryAbstract;
-use Wtyd\GitHooks\Tools\Execution\ProcessExecutionFactoryFake;
 use Wtyd\GitHooks\Utils\FileUtilsInterface;
 
 abstract class SystemTestCase extends ConsoleTestCase