Make Package::hasReachedStatus() stricter in statis checking

Not allowing random states passed as argument. Moreover, add test for hasReachedStatus.
inpsyde · Aug 28, 2024 · 18f63b1 · 18f63b1
1 parent 4e8e910
commit 18f63b1
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/src/Package.php b/src/Package.php
@@ -153,6 +153,14 @@ class Package
     public const STATUS_BOOTED = 8;
     public const STATUS_FAILED = -8;
 
+    private const SUCCESS_STATUSES = [
+        self::STATUS_IDLE => self::STATUS_IDLE,
+        self::STATUS_INITIALIZED => self::STATUS_INITIALIZED,
+        self::STATUS_BOOTING => self::STATUS_BOOTING,
+        self::STATUS_READY => self::STATUS_READY,
+        self::STATUS_BOOTED => self::STATUS_BOOTED,
+    ];
+
     private const OPERATORS = [
         '<' => '<',
         '<=' => '<=',
@@ -275,7 +283,7 @@ public function connect(Package $package): bool
 
             // Don't connect, if already booted or boot failed
             $failed = $this->hasFailed();
-            if ($failed || $this->checkStatus(self::STATUS_INITIALIZED, '>=')) {
+            if ($failed || $this->hasReachedStatus(self::STATUS_INITIALIZED)) {
                 $reason = $failed ? 'an errored package' : 'a package with a built container';
                 $status = $failed ? 'failed' : 'built_container';
                 $error = "{$errorMessage} to {$reason}.";
@@ -645,7 +653,11 @@ public function hasFailed(): bool
      */
     public function hasReachedStatus(int $status): bool
     {
-        return ($this->status !== self::STATUS_FAILED) && $this->checkStatus($status, '>=');
+        if (!isset(self::SUCCESS_STATUSES[$status])) {
+            return false;
+        }
+
+        return !$this->hasFailed() && $this->checkStatus($status, '>=');
     }
 
     /**

diff --git a/tests/unit/PackageTest.php b/tests/unit/PackageTest.php
@@ -27,8 +27,27 @@ public function testBasic(): void
         $package = Package::new($propertiesStub);
 
         static::assertTrue($package->statusIs(Package::STATUS_IDLE));
+        static::assertTrue($package->hasReachedStatus(Package::STATUS_IDLE));
+        static::assertFalse($package->hasReachedStatus(Package::STATUS_INITIALIZED));
+        static::assertFalse($package->hasReachedStatus(Package::STATUS_BOOTING));
+        static::assertFalse($package->hasReachedStatus(Package::STATUS_BOOTED));
+
+        $package->build();
+
+        static::assertFalse($package->statusIs(Package::STATUS_IDLE));
+        static::assertTrue($package->hasReachedStatus(Package::STATUS_IDLE));
+        static::assertTrue($package->hasReachedStatus(Package::STATUS_INITIALIZED));
+        static::assertFalse($package->hasReachedStatus(Package::STATUS_BOOTING));
+        static::assertFalse($package->hasReachedStatus(Package::STATUS_BOOTED));
+
         static::assertTrue($package->boot());
+
         static::assertTrue($package->statusIs(Package::STATUS_BOOTED));
+        static::assertTrue($package->hasReachedStatus(Package::STATUS_IDLE));
+        static::assertTrue($package->hasReachedStatus(Package::STATUS_INITIALIZED));
+        static::assertTrue($package->hasReachedStatus(Package::STATUS_BOOTING));
+        static::assertTrue($package->hasReachedStatus(Package::STATUS_BOOTED));
+
         static::assertSame($expectedName, $package->name());
         static::assertInstanceOf(Properties::class, $package->properties());
         static::assertInstanceOf(ContainerInterface::class, $package->container());
@@ -901,6 +920,7 @@ public function testFailureFlowWithFailureOnBootDebugModeOff(): void
         static::assertFalse($package->boot());
         static::assertTrue($package->statusIs(Package::STATUS_FAILED));
         static::assertTrue($package->hasFailed());
+        static::assertFalse($package->hasReachedStatus(Package::STATUS_IDLE));
     }
 
     /**