Merge pull request #161 from msamgan/refactortoring

Refactortoring
tighten · Oct 9, 2024 · 8f4746a · 8f4746a
2 parents 519dbcc + 05aa096
commit 8f4746a
Show file tree

Hide file tree

Showing 13 changed files with 48 additions and 39 deletions.
diff --git a/app/Actions/Clean.php b/app/Actions/Clean.php
@@ -2,7 +2,7 @@
 
 namespace App\Actions;
 
-use App\Support\Tool;
+use App\Contracts\Tool;
 use Illuminate\Console\Command;
 
 class Clean

diff --git a/app/Commands/FixCommand.php b/app/Commands/FixCommand.php
@@ -2,8 +2,8 @@
 
 namespace App\Commands;
 
-use App\Support\ConfiguresForLintOrFix;
-use App\Support\GetsCleaner;
+use App\Concerns\ConfiguresForLintOrFix;
+use App\Concerns\GetsCleaner;
 use Exception;
 use LaravelZero\Framework\Commands\Command;
 use LaravelZero\Framework\Exceptions\ConsoleException;

diff --git a/app/Commands/LintCommand.php b/app/Commands/LintCommand.php
@@ -2,8 +2,8 @@
 
 namespace App\Commands;
 
-use App\Support\ConfiguresForLintOrFix;
-use App\Support\GetsCleaner;
+use App\Concerns\ConfiguresForLintOrFix;
+use App\Concerns\GetsCleaner;
 use Exception;
 use LaravelZero\Framework\Commands\Command;
 use LaravelZero\Framework\Exceptions\ConsoleException;

diff --git a/app/Concerns/CommandHelpers.php b/app/Concerns/CommandHelpers.php
@@ -10,4 +10,14 @@ public function success(string $message): void
     {
         render('<div class="text-green-900 bg-green-300 px-1 font-bold">>> success: ' . $message . '</div>');
     }
+
+    public function heading(string $heading): void
+    {
+        render('<div class="font-bold bg-yellow-800 px-1">=> ' . $heading . '</div>');
+    }
+
+    public function failure(string $message): void
+    {
+        render('<div class="text-red-900 bg-red-300 px-1 font-bold">!! error: ' . $message . '</div>');
+    }
 }
diff --git a/app/Support/ConfiguresForLintOrFix.php → app/Concerns/ConfiguresForLintOrFix.php b/app/Support/ConfiguresForLintOrFix.php → app/Concerns/ConfiguresForLintOrFix.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support;
+namespace App\Concerns;
 
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;

diff --git a/app/Support/GetsCleaner.php → app/Concerns/GetsCleaner.php b/app/Support/GetsCleaner.php → app/Concerns/GetsCleaner.php
@@ -1,8 +1,15 @@
 <?php
 
-namespace App\Support;
+namespace App\Concerns;
 
 use App\Actions\Clean;
+use App\Contracts\Tool;
+use App\Support\DusterConfig;
+use App\Support\PhpCodeSniffer;
+use App\Support\PhpCsFixer;
+use App\Support\Pint;
+use App\Support\TLint;
+use App\Support\UserScript;
 
 trait GetsCleaner
 {

diff --git a/app/Contracts/Tool.php b/app/Contracts/Tool.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Contracts;
+
+use App\Concerns\CommandHelpers;
+use App\Support\DusterConfig;
+
+abstract class Tool
+{
+    use CommandHelpers;
+
+    public function __construct(
+        protected DusterConfig $dusterConfig,
+    ) {}
+
+    abstract public function lint(): int;
+
+    abstract public function fix(): int;
+}
diff --git a/app/Support/PhpCodeSniffer.php b/app/Support/PhpCodeSniffer.php
@@ -2,6 +2,7 @@
 
 namespace App\Support;
 
+use App\Contracts\Tool;
 use App\Project;
 use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Runner;

diff --git a/app/Support/PhpCsFixer.php b/app/Support/PhpCsFixer.php
@@ -3,9 +3,9 @@
 namespace App\Support;
 
 use App\Actions\ElaborateSummary;
+use App\Contracts\Tool;
 use App\Project;
 use ArrayIterator;
-use PhpCsFixer\Config;
 use PhpCsFixer\ConfigInterface;
 use PhpCsFixer\ConfigurationException\InvalidConfigurationException;
 use PhpCsFixer\Console\ConfigurationResolver;

diff --git a/app/Support/Pint.php b/app/Support/Pint.php
@@ -5,6 +5,7 @@
 use App\Actions\ElaborateSummary;
 use App\Actions\FixCode;
 use App\Commands\DefaultCommand;
+use App\Contracts\Tool;
 
 class Pint extends Tool
 {

diff --git a/app/Support/TLint.php b/app/Support/TLint.php
@@ -2,6 +2,7 @@
 
 namespace App\Support;
 
+use App\Contracts\Tool;
 use Illuminate\Console\Command;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;

diff --git a/app/Support/Tool.php b/app/Support/Tool.php
diff --git a/app/Support/UserScript.php b/app/Support/UserScript.php
@@ -2,6 +2,7 @@
 
 namespace App\Support;
 
+use App\Contracts\Tool;
 use Illuminate\Console\Command;
 use JsonException;
 use Psr\Container\ContainerExceptionInterface;