Refactor

Author: bruli

src/PhpGitHooks/Application/Message/MessageConfigData.php

@@ -52,7 +52,7 @@ public function config(array $data)
     private function configMessages()
     {
         if (!isset($this->configData[self::TOOL])) {
-            $this->configData = null;
+            $this->configData = [];
             $rightMessage = $this->setMessage(
                 sprintf('Write a right message for %s hook:', $this->hook),
                 self::DEFAULT_RIGHT_MESSAGE

src/PhpGitHooks/Infrastructure/Common/ErrorOutput.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace PhpGitHooks\Infrastructure\Common;
+
+use PhpGitHooks\Command\BadJobLogo;
+
+class ErrorOutput
+{
+    /**
+     * @param $errorText
+     *
+     * @return string
+     */
+    public static function write($errorText)
+    {
+        return BadJobLogo::paint($errorText);
+    }
+}

src/PhpGitHooks/Infrastructure/Common/ToolHandler.php

@@ -30,4 +30,14 @@ public function setOutput(OutputInterface $outputInterface)
     {
         $this->output = $outputInterface;
     }
+
+    /**
+     * @param \Exception $exceptionClass
+     * @param string     $errorText
+     */
+    protected function writeOutputError(\Exception $exceptionClass, $errorText)
+    {
+        ErrorOutput::write($errorText);
+        throw new $exceptionClass();
+    }
 }

src/PhpGitHooks/Infrastructure/JsonLint/JsonLintHandler.php

@@ -3,14 +3,13 @@
 namespace PhpGitHooks\Infrastructure\JsonLint;
 
 use PhpGitHooks\Application\Message\MessageConfigData;
-use PhpGitHooks\Command\BadJobLogo;
 use PhpGitHooks\Infrastructure\Common\RecursiveToolInterface;
 use PhpGitHooks\Infrastructure\Common\ToolHandler;
 use Symfony\Component\Process\ProcessBuilder;
 
 final class JsonLintHandler extends ToolHandler implements RecursiveToolInterface
 {
-    /** @var array  */
+    /** @var array */
     private $files = [];
     /** @var  string */
     private $needle;
@@ -52,8 +51,10 @@ public function run(array $messages)
         });
 
         if ($errors) {
-            $this->output->writeln(BadJobLogo::paint($messages[MessageConfigData::KEY_ERROR_MESSAGE]));
-            throw new JsonLintViolationsException(implode('', $errors));
+            $this->writeOutputError(
+                new JsonLintViolationsException(implode('', $errors)),
+                $messages[MessageConfigData::KEY_ERROR_MESSAGE]
+            );
         }
 
         $this->output->writeln($this->outputHandler->getSuccessfulStepMessage());

src/PhpGitHooks/Infrastructure/PhpCsFixer/PhpCsFixerHandler.php

@@ -3,7 +3,6 @@
 namespace PhpGitHooks\Infrastructure\PhpCsFixer;
 
 use PhpGitHooks\Application\Message\MessageConfigData;
-use PhpGitHooks\Command\BadJobLogo;
 use PhpGitHooks\Infrastructure\Common\InteractiveToolInterface;
 use PhpGitHooks\Infrastructure\Common\ToolHandler;
 use Symfony\Component\Process\ProcessBuilder;
@@ -56,8 +55,10 @@ public function run(array $messages)
                 }
 
                 if ($errors) {
-                    $this->output->writeln(BadJobLogo::paint($messages[MessageConfigData::KEY_ERROR_MESSAGE]));
-                    throw new PhpCsFixerException(implode('', $errors));
+                    $this->writeOutputError(
+                        new PhpCsFixerException(implode('', $errors)),
+                        $messages[MessageConfigData::KEY_ERROR_MESSAGE]
+                    );
                 }
 
                 $this->output->writeln($this->outputHandler->getSuccessfulStepMessage());

src/PhpGitHooks/Infrastructure/PhpMD/PhpMDHandler.php

@@ -3,7 +3,6 @@
 namespace PhpGitHooks\Infrastructure\PhpMD;
 
 use PhpGitHooks\Application\Message\MessageConfigData;
-use PhpGitHooks\Command\BadJobLogo;
 use PhpGitHooks\Infrastructure\Common\RecursiveToolInterface;
 use PhpGitHooks\Infrastructure\Common\ToolHandler;
 use Symfony\Component\Process\ProcessBuilder;
@@ -59,8 +58,10 @@ public function run(array $messages)
         });
 
         if ($errors) {
-            $this->output->writeln(BadJobLogo::paint(MessageConfigData::KEY_ERROR_MESSAGE));
-            throw new PHPMDViolationsException(implode('', $errors));
+            $this->writeOutputError(
+                new PHPMDViolationsException(implode('', $errors)),
+                MessageConfigData::KEY_ERROR_MESSAGE
+            );
         }
 
         $this->output->writeln($this->outputHandler->getSuccessfulStepMessage());