code modernization (#7)

chaos-php · Jun 1, 2024 · feb03ed · feb03ed
1 parent 7423fab
commit feb03ed
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 40 deletions.
diff --git a/src/Assault/ExceptionAssault.php b/src/Assault/ExceptionAssault.php
@@ -7,13 +7,10 @@
 use Chaos\Monkey\Assault;
 use Chaos\Monkey\Settings;
 
-class ExceptionAssault implements Assault
+final class ExceptionAssault implements Assault
 {
-    private Settings $settings;
-
-    public function __construct(Settings $settings)
+    public function __construct(private readonly Settings $settings)
     {
-        $this->settings = $settings;
     }
 
     public function isActive(): bool

diff --git a/src/Assault/KillAppAssault.php b/src/Assault/KillAppAssault.php
@@ -9,11 +9,8 @@
 
 class KillAppAssault implements Assault
 {
-    private Settings $settings;
-
-    public function __construct(Settings $settings)
+    public function __construct(private readonly Settings $settings)
     {
-        $this->settings = $settings;
     }
 
     public function isActive(): bool

diff --git a/src/Assault/LatencyAssault.php b/src/Assault/LatencyAssault.php
@@ -7,13 +7,10 @@
 use Chaos\Monkey\Assault;
 use Chaos\Monkey\Settings;
 
-class LatencyAssault implements Assault
+final class LatencyAssault implements Assault
 {
-    private Settings $settings;
-
-    public function __construct(Settings $settings)
+    public function __construct(private readonly Settings $settings)
     {
-        $this->settings = $settings;
     }
 
     public function isActive(): bool
@@ -23,7 +20,7 @@ public function isActive(): bool
 
     public function attack(): void
     {
-        $latencyMs = random_int($this->settings->latencyMinMs(), $this->settings->latencyMaxMs());
+        $latencyMs = \random_int($this->settings->latencyMinMs(), $this->settings->latencyMaxMs());
         usleep($latencyMs * 1000);
     }
 }
diff --git a/src/Assault/MemoryAssault.php b/src/Assault/MemoryAssault.php
@@ -8,19 +8,17 @@
 use Chaos\Monkey\Assault;
 use Chaos\Monkey\Settings;
 
-class MemoryAssault implements Assault
+final class MemoryAssault implements Assault
 {
-    private Settings $settings;
     private int $totalMemory;
 
     /**
-     * @var mixed[]
+     * @var int[][]
      */
     private array $memoryVector;
 
-    public function __construct(Settings $settings)
+    public function __construct(private readonly Settings $settings)
     {
-        $this->settings = $settings;
         $this->totalMemory = (new Runtime())->totalMemory();
     }
 
@@ -37,7 +35,7 @@ public function attack(): void
     }
 
     /**
-     * @return mixed[]
+     * @return int[][]
      */
     public function memoryVector(): array
     {

diff --git a/src/ChaosMonkey.php b/src/ChaosMonkey.php
@@ -4,24 +4,13 @@
 
 namespace Chaos\Monkey;
 
-class ChaosMonkey
+final class ChaosMonkey
 {
     /**
-     * @var Assault[]
+     * @param list<Assault> $assaults
      */
-    private array $assaults = [];
-
-    private Settings $settings;
-
-    /**
-     * @param iterable<Assault> $assaults
-     */
-    public function __construct(iterable $assaults, Settings $settings)
+    public function __construct(private readonly array $assaults, private readonly Settings $settings)
     {
-        foreach ($assaults as $assault) {
-            $this->assaults[] = $assault;
-        }
-        $this->settings = $settings;
     }
 
     public function call(): void
@@ -43,7 +32,7 @@ private function isEnable(): bool
 
     private function isTrouble(): bool
     {
-        return $this->settings->probability() >= random_int(0, 100);
+        return $this->settings->probability() >= \random_int(0, 100);
     }
 
     private function chooseAndRunAttack(): void
@@ -57,15 +46,15 @@ private function chooseAndRunAttack(): void
     }
 
     /**
-     * @return Assault[]
+     * @return list<Assault>
      */
     private function getActiveAssaults(): array
     {
-        return array_filter($this->assaults, fn (Assault $assault) => $assault->isActive());
+        return array_values(array_filter($this->assaults, fn (Assault $assault) => $assault->isActive()));
     }
 
     /**
-     * @param Assault[] $assaults
+     * @param list<Assault> $assaults
      */
     private function getRandomAssault(array $assaults): Assault
     {

diff --git a/src/Settings.php b/src/Settings.php
@@ -4,7 +4,7 @@
 
 namespace Chaos\Monkey;
 
-class Settings
+final class Settings
 {
     private bool $enabled;
     private int $probability;