Some little refactoring

SbWereWolf · Feb 10, 2023 · 07348d0 · 07348d0
1 parent 5f02b12
commit 07348d0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "sbwerewolf/stopwatch",
-  "description": "Primitive stopwatch with simple start and stop for measurement of every time periods and whole time",
+  "description": "Primitive stopwatch with simple start and stop for measurement of every single time periods and whole time",
   "type": "libary",
   "license": "MIT",
   "authors": [

diff --git a/src/SbWereWolf/Stopwatch/DateTimeStopwatch.php b/src/SbWereWolf/Stopwatch/DateTimeStopwatch.php
@@ -21,7 +21,7 @@ protected function calcDiffNowWith($moment): int
         /** @var DateTimeImmutable $readings */
         $readings = $this->getReadings();
         $delta = $readings->diff($moment);
-        $duration = $this->toNanoSeconds($delta);
+        $duration = static::toNanoSeconds($delta);
 
         return $duration;
     }
@@ -32,11 +32,23 @@ protected function getReadings()
         return new DateTimeImmutable();
     }
 
+    /**
+     * @param int $moment
+     * @return int
+     */
+    protected function calcDiffLastEndWith($moment): int
+    {
+        $delta = $this->lastEndedAt->diff($moment);
+        $duration = $this->toNanoSeconds($delta);
+
+        return $duration;
+    }
+
     /**
      * @param DateInterval $delta
      * @return float|int
      */
-    private function toNanoSeconds(DateInterval $delta)
+    private static function toNanoSeconds(DateInterval $delta)
     {
         $duration =
             ($delta->s + $delta->f) * ITimerReadings::TO_SECONDS +
@@ -49,16 +61,4 @@ private function toNanoSeconds(DateInterval $delta)
 
         return (int)$duration;
     }
-
-    /**
-     * @param int $moment
-     * @return int
-     */
-    protected function calcDiffLastEndWith($moment): int
-    {
-        $delta = $this->lastEndedAt->diff($moment);
-        $duration = $this->toNanoSeconds($delta);
-
-        return $duration;
-    }
 }
diff --git a/src/SbWereWolf/Stopwatch/MicroTimeStopwatch.php b/src/SbWereWolf/Stopwatch/MicroTimeStopwatch.php
@@ -21,8 +21,8 @@ protected function getReadings()
      */
     protected function calcDiffNowWith($moment): int
     {
-        $start = $this->readingsToNanoseconds($moment);
-        $now = $this->readingsToNanoseconds($this->getReadings());
+        $start = static::readingsToNanoseconds($moment);
+        $now = static::readingsToNanoseconds($this->getReadings());
 
         $duration = $now - $start;
 
@@ -35,8 +35,8 @@ protected function calcDiffNowWith($moment): int
      */
     protected function calcDiffLastEndWith($moment): int
     {
-        $start = $this->readingsToNanoseconds($moment);
-        $end = $this->readingsToNanoseconds($this->lastEndedAt);
+        $start = static::readingsToNanoseconds($moment);
+        $end = static::readingsToNanoseconds($this->lastEndedAt);
 
         $duration = $end - $start;
 
@@ -47,7 +47,7 @@ protected function calcDiffLastEndWith($moment): int
      * @param $readings
      * @return float|int
      */
-    private function readingsToNanoseconds($readings)
+    private static function readingsToNanoseconds($readings)
     {
         list($mcs, $s) = explode(' ', $readings);
         $moment =