Improve from static analysis results

Author: schmengler

composer.json

@@ -34,7 +34,10 @@
   "autoload-dev": {
     "psr-4":  {
       "IntegerNet\\DeployerTimer\\": "tests/"
-    }
+    },
+    "files": [
+      "recipe/timer.php"
+    ]
   },
   "scripts": {
     "test": "phpunit && infection && phpstan analyze --level 7 src tests && phan"

recipe/timer.php

@@ -7,11 +7,16 @@
 use IntegerNet\DeployerTimer\ResultTaskFactory;
 use IntegerNet\DeployerTimer\TimerTaskDecorator;
 
-function timer(): ResultTaskFactory
-{
-    $deployer = Deployer::get();
-    $decorateAllTasks = new DecorateAllTasks($deployer);
-    $timer = new TimerTaskDecorator();
-    $decorateAllTasks->with($timer);
-    return new ResultTaskFactory($deployer, $timer);
+/**
+ * @SuppressWarnings(PHPMD.StaticAccess)
+ */
+if (!function_exists(__NAMESPACE__ . '\timer')) {
+    function timer(): ResultTaskFactory
+    {
+        $deployer = Deployer::get();
+        $decorateAllTasks = new DecorateAllTasks($deployer);
+        $timer = new TimerTaskDecorator();
+        $decorateAllTasks->with($timer);
+        return new ResultTaskFactory($deployer, $timer);
+    }
 }

src/Clock.php

@@ -6,4 +6,4 @@
 interface Clock
 {
     public function microtime(): float;
-}
+}

src/DecorateAllTasks.php

@@ -23,8 +23,14 @@ public function with(TaskDecorator $decorator): void
         foreach ($this->deployer->tasks as $taskName => $task) {
             $beforeName = $taskName . '.' . $decorator->name() . '.before';
             $afterName = $taskName . '.' . $decorator->name() . '.after';
-            $this->deployer->tasks->set($beforeName, (new Task($beforeName, $decorator->callbackBefore($taskName)))->shallow());
-            $this->deployer->tasks->set($afterName, (new Task($afterName, $decorator->callbackAfter($taskName)))->shallow());
+            $this->deployer->tasks->set(
+                $beforeName,
+                (new Task($beforeName, $decorator->callbackBefore($taskName)))->shallow()
+            );
+            $this->deployer->tasks->set(
+                $afterName,
+                (new Task($afterName, $decorator->callbackAfter($taskName)))->shallow()
+            );
             if (!in_array($task->getName(), [$beforeName, $afterName], true)) {
                 $task->addBefore($beforeName);
                 $task->addAfter($afterName);

src/FakeClock.php

@@ -20,9 +20,8 @@ public function microtime(): float
         return $this->timestamp;
     }
 
-    public function advanceMs(int $ms): void
+    public function advanceMillis(int $millis): void
     {
-        $this->timestamp += ($ms * 0.001);
+        $this->timestamp += ($millis * 0.001);
     }
-
-}
+}

src/ResultTaskFactory.php

@@ -33,4 +33,4 @@ public function createCsvResultTask($fileName): string
 
         return $taskName;
     }
-}
+}

src/TimerEvents.php

@@ -23,4 +23,4 @@ public function asCsv(): string
         }
         return implode("\n", $lines);
     }
-}
+}

src/TimerTaskDecorator.php

@@ -33,23 +33,25 @@ public function name(): string
 
     public function callbackBefore(string $taskName): callable
     {
-        return function() use ($taskName) {
+        return function () use ($taskName) {
             \array_push($this->startTimeStack, $this->clock->microtime());
             $this->events->append(new TimerEvent(TimerEvent::TYPE_BEGIN, $taskName, $this->clock->microtime(), 0));
         };
     }
 
     public function callbackAfter(string $taskName): callable
     {
-        return function() use ($taskName) {
+        return function () use ($taskName) {
             $startTime = \array_pop($this->startTimeStack);
             $duration = $this->clock->microtime() - $startTime;
-            $this->events->append(new TimerEvent(TimerEvent::TYPE_END, $taskName, $this->clock->microtime(), $duration));
+            $this->events->append(
+                new TimerEvent(TimerEvent::TYPE_END, $taskName, $this->clock->microtime(), $duration)
+            );
         };
     }
 
     public function resultsAsCsv(): string
     {
         return $this->events->asCsv();
     }
-}
+}

tests/FakeClockTest.php

@@ -11,9 +11,9 @@ public function testAdvanceMs()
     {
         $clock = new FakeClock((float) strtotime('2000-01-01'));
         $this->assertEqualsWithDelta(946684800, $clock->microtime(), 0.001);
-        $clock->advanceMs(500);
+        $clock->advanceMillis(500);
         $this->assertEqualsWithDelta(946684800.5, $clock->microtime(), 0.001);
-        $clock->advanceMs(50);
+        $clock->advanceMillis(50);
         $this->assertEqualsWithDelta(946684800.55, $clock->microtime(), 0.001);
     }
 }

tests/TaskDecoratorTest.php

@@ -17,6 +17,9 @@
 use function Deployer\task;
 use function Deployer\writeln;
 
+/**
+ * @SuppressWarnings(PHPMD.StaticAccess)
+ */
 class TaskDecoratorTest extends TestCase
 {
     /**