Inject iointerface instead of factory

phpro · Sep 29, 2023 · 60d09e2 · 60d09e2
1 parent 841c7f8
commit 60d09e2
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 26 deletions.
diff --git a/resources/config/console.yml b/resources/config/console.yml
@@ -28,7 +28,7 @@ services:
             - '@GrumPHP\Locator\StdInFiles'
             - '@GrumPHP\Locator\RegisteredFiles'
             - '@GrumPHP\Runner\TaskRunner'
-            - '@GrumPHP\IO\IOFactory'
+            - '@GrumPHP\IO\IOInterface'
         tags:
             - { name: 'console.command' }
     GrumPHP\Console\Command\Git\CommitMsgCommand:
@@ -39,7 +39,7 @@ services:
             - '@GrumPHP\Runner\TaskRunner'
             - '@grumphp.util.filesystem'
             - '@GrumPHP\Util\Paths'
-            - '@GrumPHP\IO\IOFactory'
+            - '@GrumPHP\IO\IOInterface'
         tags:
             - { name: 'console.command' }
     GrumPHP\Console\Command\Git\DeInitCommand:
@@ -62,7 +62,7 @@ services:
             - '@GrumPHP\Locator\StdInFiles'
             - '@GrumPHP\Locator\ChangedFiles'
             - '@GrumPHP\Runner\TaskRunner'
-            - '@GrumPHP\IO\IOFactory'
+            - '@GrumPHP\IO\IOInterface'
         tags:
             - { name: 'console.command' }
 

diff --git a/resources/config/services.yml b/resources/config/services.yml
@@ -42,7 +42,9 @@ services:
             - '@OndraM\CiDetector\CiDetector'
 
     grumphp.io:
-        class: GrumPHP\IO\IOInterface
+        alias: GrumPHP\IO\IOInterface
+
+    GrumPHP\IO\IOInterface:
         factory: ['@GrumPHP\IO\IOFactory', 'create']
         arguments:
             - '@console.input'

diff --git a/src/Console/Command/Git/CommitMsgCommand.php b/src/Console/Command/Git/CommitMsgCommand.php
@@ -61,7 +61,7 @@ class CommitMsgCommand extends Command
      */
     private $paths;
 
-    private IOFactory $IOFactory;
+    private IOInterface $io;
 
     public function __construct(
         TestSuiteCollection $testSuites,
@@ -70,7 +70,7 @@ public function __construct(
         TaskRunner $taskRunner,
         Filesystem $filesystem,
         Paths $paths,
-        IOFactory $IOFactory
+        IOInterface $io
     ) {
         parent::__construct();
 
@@ -80,7 +80,7 @@ public function __construct(
         $this->filesystem = $filesystem;
         $this->paths = $paths;
         $this->stdInFilesLocator = $stdInFilesLocator;
-        $this->IOFactory = $IOFactory;
+        $this->io = $io;
     }
 
     public static function getDefaultName(): string
@@ -98,8 +98,7 @@ protected function configure(): void
 
     public function execute(InputInterface $input, OutputInterface $output): int
     {
-        $io = $this->IOFactory->create($input, $output);
-        $files = $this->getCommittedFiles($io);
+        $files = $this->getCommittedFiles();
 
         /** @var string $gitUser */
         $gitUser = $input->getOption('git-user');
@@ -129,9 +128,9 @@ public function execute(InputInterface $input, OutputInterface $output): int
         return $results->isFailed() ? self::EXIT_CODE_NOK : self::EXIT_CODE_OK;
     }
 
-    protected function getCommittedFiles(IOInterface $io): FilesCollection
+    protected function getCommittedFiles(): FilesCollection
     {
-        if ($stdin = $io->readCommandInput(STDIN)) {
+        if ($stdin = $this->io->readCommandInput(STDIN)) {
             return $this->stdInFilesLocator->locate($stdin);
         }
 

diff --git a/src/Console/Command/Git/PreCommitCommand.php b/src/Console/Command/Git/PreCommitCommand.php
@@ -47,22 +47,22 @@ class PreCommitCommand extends Command
      */
     private $taskRunner;
 
-    private IOFactory $IOFactory;
+    private IOInterface $io;
 
     public function __construct(
         TestSuiteCollection $testSuites,
         StdInFiles $stdInFilesLocator,
         ChangedFiles $changedFilesLocator,
         TaskRunner $taskRunner,
-        IOFactory $IOFactory
+        IOInterface $io
     ) {
         parent::__construct();
 
         $this->testSuites = $testSuites;
         $this->stdInFilesLocator = $stdInFilesLocator;
         $this->changedFilesLocator = $changedFilesLocator;
         $this->taskRunner = $taskRunner;
-        $this->IOFactory = $IOFactory;
+        $this->io = $io;
     }
 
     public static function getDefaultName(): string
@@ -83,8 +83,7 @@ protected function configure(): void
 
     public function execute(InputInterface $input, OutputInterface $output): int
     {
-        $io = $this->IOFactory->create($input, $output);
-        $files = $this->getCommittedFiles($io);
+        $files = $this->getCommittedFiles();
 
         $context = (
             new TaskRunnerContext(
@@ -100,9 +99,9 @@ public function execute(InputInterface $input, OutputInterface $output): int
         return $results->isFailed() ? self::EXIT_CODE_NOK : self::EXIT_CODE_OK;
     }
 
-    protected function getCommittedFiles(IOInterface $io): FilesCollection
+    protected function getCommittedFiles(): FilesCollection
     {
-        if ($stdin = $io->readCommandInput(STDIN)) {
+        if ($stdin = $this->io->readCommandInput(STDIN)) {
             return $this->stdInFilesLocator->locate($stdin);
         }
 

diff --git a/src/Console/Command/RunCommand.php b/src/Console/Command/RunCommand.php
@@ -45,22 +45,22 @@ class RunCommand extends Command
      */
     private $taskRunner;
 
-    private IOFactory $IOFactory;
+    private IOInterface $io;
 
     public function __construct(
         TestSuiteCollection $testSuites,
         StdInFiles $stdInFileLocator,
         RegisteredFiles $registeredFilesLocator,
         TaskRunner $taskRunner,
-        IOFactory $IOFactory
+        IOInterface $io
     ) {
         parent::__construct();
 
         $this->testSuites = $testSuites;
         $this->stdInFileLocator = $stdInFileLocator;
         $this->registeredFilesLocator = $registeredFilesLocator;
         $this->taskRunner = $taskRunner;
-        $this->IOFactory = $IOFactory;
+        $this->io = $io;
     }
 
     public static function getDefaultName(): string
@@ -88,15 +88,13 @@ protected function configure(): void
 
     public function execute(InputInterface $input, OutputInterface $output): int
     {
-        $io = $this->IOFactory->create($input, $output);
-
         /** @var string $taskNames */
         $taskNames = $input->getOption('tasks') ?? '';
 
         /** @var string $testsSuite */
         $testsSuite = $input->getOption('testsuite') ?? '';
 
-        $files = $this->detectFiles($io);
+        $files = $this->detectFiles();
         $tasks = Str::explodeWithCleanup(',', $taskNames);
 
         $context = new TaskRunnerContext(
@@ -112,9 +110,9 @@ public function execute(InputInterface $input, OutputInterface $output): int
         return $results->isFailed() ? self::EXIT_CODE_NOK : self::EXIT_CODE_OK;
     }
 
-    private function detectFiles(IOInterface $io): FilesCollection
+    private function detectFiles(): FilesCollection
     {
-        if ($stdin = $io->readCommandInput(STDIN)) {
+        if ($stdin = $this->io->readCommandInput(STDIN)) {
             return $this->stdInFileLocator->locate($stdin);
         }