wip

vormkracht10 · May 26, 2023 · 080f5aa · 080f5aa
1 parent 49e6cfc
commit 080f5aa
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 22 deletions.
diff --git a/src/Checks/Base/Check.php b/src/Checks/Base/Check.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Vormkracht10\LaravelOK\Checks;
+namespace Vormkracht10\LaravelOK\Checks\Base;
 
 use Cron\CronExpression;
 use Illuminate\Console\Scheduling\ManagesFrequencies;

diff --git a/src/Checks/Base/Result.php b/src/Checks/Base/Result.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Vormkracht10\LaravelOK\Checks;
+namespace Vormkracht10\LaravelOK\Checks\Base;
 
 use Carbon\CarbonInterface;
 use Vormkracht10\LaravelOK\Enums\Status;

diff --git a/src/Checks/DebugModeCheck.php b/src/Checks/DebugModeCheck.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Vormkracht10\LaravelOK\Checks\Checks;
+namespace Vormkracht10\LaravelOK\Checks;
 
 use function config;
-use Vormkracht10\LaravelOK\Checks\Check;
-use Vormkracht10\LaravelOK\Checks\Result;
+use Vormkracht10\LaravelOK\Checks\Base\Check;
+use Vormkracht10\LaravelOK\Checks\Base\Result;
 
 class DebugModeCheck extends Check
 {

diff --git a/src/Checks/EnvironmentCheck.php b/src/Checks/EnvironmentCheck.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Vormkracht10\LaravelOK\Checks\Checks;
+namespace Vormkracht10\LaravelOK\Checks;
 
-use Vormkracht10\LaravelOK\Checks\Check;
-use Vormkracht10\LaravelOK\Checks\Result;
+use Vormkracht10\LaravelOK\Checks\Base\Check;
+use Vormkracht10\LaravelOK\Checks\Base\Result;
 
 class EnvironmentCheck extends Check
 {

diff --git a/src/Checks/Traits/ChecksDatabaseQueryCountResult.php b/src/Checks/Traits/ChecksDatabaseQueryCountResult.php
@@ -2,7 +2,7 @@
 
 namespace Vormkracht10\LaravelOK\Checks\Traits;
 
-use Vormkracht10\LaravelOK\Checks\Result;
+use Vormkracht10\LaravelOK\Checks\Base\Result;
 
 trait ChecksDatabaseQueryCountResult
 {
@@ -13,7 +13,7 @@ public function checkExpectedCount(int $count)
         return $this->expectedCount === $count;
     }
 
-    public function run()
+    public function run(): Result
     {
         $currentCount = $this->queryCount();
 
@@ -22,7 +22,7 @@ public function run()
         return $this->checkExpectedCount($currentCount)
             ? $result->ok()
             : $result->failed(
-                $this->message() ?: "The database query count should be {$this->expectedCount}, but currently is {$currentCount}"
+                $this->getMessage() ?: "The database query count should be {$this->expectedCount}, but currently is {$currentCount}"
             );
     }
 }
diff --git a/src/Commands/RunChecksCommand.php b/src/Commands/RunChecksCommand.php
@@ -4,8 +4,8 @@
 
 use Exception;
 use Illuminate\Console\Command;
-use Vormkracht10\LaravelOK\Checks\Check;
-use Vormkracht10\LaravelOK\Checks\Result;
+use Vormkracht10\LaravelOK\Checks\Base\Check;
+use Vormkracht10\LaravelOK\Checks\Base\Result;
 use Vormkracht10\LaravelOK\Enums\Status;
 use Vormkracht10\LaravelOK\Events\CheckEnded;
 use Vormkracht10\LaravelOK\Events\CheckStarted;
@@ -35,7 +35,9 @@ public function runChecks()
     {
         return app(OK::class)
             ->configuredChecks()
-            ->dd()
+            ->map(function (mixed $check) {
+                return is_string($check) ? app($check) : $check;
+            })
             ->map(function (Check $check): Result {
                 return $check->shouldRun()
                     ? $this->runCheck($check)
@@ -48,7 +50,6 @@ public function runCheck(Check $check)
         event(new CheckStarted($check));
 
         try {
-            $this->line('');
             $this->line("Running check: {$check->getName()}...");
             $result = $check->run();
         } catch (Exception $exception) {
@@ -64,8 +65,6 @@ public function runCheck(Check $check)
         $result->check($check)
             ->endedAt(now());
 
-        dump($this->thrownExceptions);
-
         $this->outputResultToConsole($result, $exception ?? null);
 
         event(new CheckEnded($check, $result));
@@ -77,8 +76,8 @@ protected function outputResultToConsole(Result $result, ?Exception $exception =
     {
         match ($result->status) {
             Status::OK => $this->info('Success'),
-            Status::FAILED => $this->error("{$result->status}: {$result->getMessage()}"),
-            Status::CRASHED => $this->error("{$result->status}}: `{$exception?->getMessage()}`"),
+            Status::FAILED => $this->error("{$result->status->value}: {$result->getMessage()}"),
+            Status::CRASHED => $this->error("{$result->status->value}: `{$exception?->getMessage()}`"),
             default => null,
         };
     }

diff --git a/src/Events/CheckEnded.php b/src/Events/CheckEnded.php
@@ -2,7 +2,7 @@
 
 namespace Vormkracht10\LaravelOK\Events;
 
-use Vormkracht10\LaravelOK\Checks\Check;
+use Vormkracht10\LaravelOK\Checks\Base\Check;
 
 class CheckEnded
 {

diff --git a/src/Events/CheckStarted.php b/src/Events/CheckStarted.php
@@ -2,7 +2,7 @@
 
 namespace Vormkracht10\LaravelOK\Events;
 
-use Vormkracht10\LaravelOK\Checks\Check;
+use Vormkracht10\LaravelOK\Checks\Base\Check;
 
 class CheckStarted
 {

diff --git a/src/Exceptions/CheckDidNotComplete.php b/src/Exceptions/CheckDidNotComplete.php
@@ -3,7 +3,7 @@
 namespace Vormkracht10\LaravelOK\Exceptions;
 
 use Exception;
-use Vormkracht10\LaravelOK\Checks\Check;
+use Vormkracht10\LaravelOK\Checks\Base\Check;
 
 class CheckDidNotComplete extends Exception
 {

diff --git a/src/LaravelOKServiceProvider.php b/src/LaravelOKServiceProvider.php
@@ -18,4 +18,10 @@ public function configurePackage(Package $package): void
                 RunChecksCommand::class,
             );
     }
+
+    public function packageRegistered(): void
+    {
+        $this->app->singleton(OK::class);
+        $this->app->alias(OK::class, 'ok');
+    }
 }