refactor: make phpstan happy

instride-ch · Feb 8, 2023 · 449abee · 449abee
1 parent 29b2a14
commit 449abee
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 18 deletions.
diff --git a/src/PimcoreMonitorBundle/Check/AbstractCheck.php b/src/PimcoreMonitorBundle/Check/AbstractCheck.php
@@ -21,6 +21,8 @@
 
 abstract class AbstractCheck implements BaseCheckInterface, CheckInterface
 {
+    protected const IDENTIFIER = '__undefined__';
+
     /**
      * {@inheritDoc}
      */

diff --git a/src/PimcoreMonitorBundle/Check/DiskUsage.php b/src/PimcoreMonitorBundle/Check/DiskUsage.php
@@ -43,8 +43,8 @@ public function check(): ResultInterface
             return new Skip('Check was skipped');
         }
 
-        $df = \disk_free_space($this->path);
-        $dt = \disk_total_space($this->path);
+        $df = (int) \floor(\disk_free_space($this->path));
+        $dt = (int) \floor(\disk_total_space($this->path));
         $du = $dt - $df;
         $dp = ($du / $dt) * 100;
 

diff --git a/src/PimcoreMonitorBundle/Check/PimcoreMaintenance.php b/src/PimcoreMonitorBundle/Check/PimcoreMaintenance.php
@@ -40,14 +40,13 @@ public function check(): ResultInterface
         }
 
         $lastExecution = $this->maintenanceExecutor->getLastExecution();
-        $lastRun = Carbon::createFromTimestampUTC($lastExecution);
         $data = [
             'active' => false,
-            'last_execution' => $lastRun instanceof Carbon ? $lastRun->toIso8601String() : $lastExecution,
+            'last_execution' => Carbon::createFromTimestampUTC($lastExecution)->toIso8601String(),
         ];
 
         // Maintenance script should run at least every hour + a little tolerance
-        if ($lastExecution && (\time() - $lastExecution) < 3660) {
+        if ($lastExecution > 0 && (\time() - $lastExecution) < 3660) {
             $data['active'] = true;
 
             return new Success('Pimcore maintenance is activated', $data);

diff --git a/src/PimcoreMonitorBundle/Check/PimcoreUsers.php b/src/PimcoreMonitorBundle/Check/PimcoreUsers.php
@@ -46,14 +46,13 @@ public function check(): ResultInterface
                 continue;
             }
 
-            $lastLoginTs = $user->getLastLogin();
-            $lastLogin = Carbon::createFromTimestampUTC($lastLoginTs);
+            $lastLogin = $user->getLastLogin();
 
             $users[] = [
                 'name' => $user->getName(),
                 'active' => $user->isActive(),
                 'is_admin' => $user->isAdmin(),
-                'last_login' => $lastLogin instanceof Carbon ? $lastLogin->toIso8601String() : $lastLoginTs,
+                'last_login' => Carbon::createFromTimestampUTC($lastLogin)->toIso8601String(),
             ];
         }
 

diff --git a/src/PimcoreMonitorBundle/Command/HealthReportCommand.php b/src/PimcoreMonitorBundle/Command/HealthReportCommand.php
@@ -37,7 +37,7 @@ class HealthReportCommand extends Command
     public function __construct(
         private string $reportEndpoint,
         private string $apiKey,
-        private array $pimcoreSystemConfig,
+        private array $systemConfig,
         private string $secret,
         private HttpClientInterface $httpClient,
         private RunnerManager $runnerManager
@@ -77,7 +77,7 @@ protected function configure(): void
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $instanceId = $this->getInstanceId();
-        $hostDomain = $this->pimcoreSystemConfig['general']['domain'];
+        $hostDomain = $this->systemConfig['general']['domain'];
 
         if (null === $instanceId) {
             $output->writeln('<comment>Please define the secret parameter.</comment>');

diff --git a/src/PimcoreMonitorBundle/PimcoreMonitorBundle.php b/src/PimcoreMonitorBundle/PimcoreMonitorBundle.php
@@ -27,14 +27,6 @@ class PimcoreMonitorBundle extends AbstractPimcoreBundle
 {
     use PackageVersionTrait;
 
-    /**
-     * {@inheritDoc}
-     */
-    protected function getComposerPackageName(): string
-    {
-        return 'w-vision/pimcore-monitor-bundle';
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -84,4 +76,12 @@ public function build(ContainerBuilder $container): void
 
         $container->addCompilerPass(new CheckTagCompilerPass());
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function getComposerPackageName(): string
+    {
+        return 'w-vision/pimcore-monitor-bundle';
+    }
 }
diff --git a/src/PimcoreMonitorBundle/Reporter/ArrayReporter.php b/src/PimcoreMonitorBundle/Reporter/ArrayReporter.php
@@ -24,6 +24,7 @@
 use Laminas\Diagnostics\Result\SuccessInterface;
 use Laminas\Diagnostics\Result\WarningInterface;
 use Laminas\Diagnostics\Runner\Reporter\ReporterInterface;
+use Pimcore\Tool\Requirements\Check;
 use Wvision\Bundle\PimcoreMonitorBundle\Check\CheckInterface;
 
 class ArrayReporter implements ReporterInterface
@@ -72,6 +73,10 @@ public function onBeforeRun(BaseCheckInterface|CheckInterface $check, $checkAlia
 
     public function onAfterRun(BaseCheckInterface|CheckInterface $check, ResultInterface $result, $checkAlias = null)
     {
+        if (!$check instanceof CheckInterface) {
+            return;
+        }
+
         switch (true) {
             case $result instanceof SuccessInterface:
                 $status = 0;