Improve tests around service connection

And fail a couple of edge-cases bugs discovered via new tests
inpsyde · May 27, 2024 · 5c6b990 · 5c6b990
1 parent c05057d
commit 5c6b990
Show file tree

Hide file tree

Showing 2 changed files with 113 additions and 166 deletions.
diff --git a/src/Package.php b/src/Package.php
@@ -275,9 +275,10 @@ public function connect(Package $package): bool
 
             // Don't connect, if already booted or boot failed
             $failed = $this->statusIs(self::STATUS_FAILED);
-            if ($failed || $this->statusIs(self::STATUS_BOOTED)) {
-                $status = $failed ? 'errored' : 'booted';
-                $error = "{$errorMessage} to a {$status} package.";
+            if ($failed || $this->checkStatus(self::STATUS_INITIALIZED, '>=')) {
+                $reason = $failed ? 'an errored package' : 'a package with a built container';
+                $status = $failed ? 'failed' : 'built_container';
+                $error = "{$errorMessage} to {$reason}.";
                 do_action(
                     $this->hookName(self::ACTION_FAILED_CONNECTION),
                     $packageName,
@@ -315,7 +316,10 @@ static function () use ($package): Properties {
 
             return true;
         } catch (\Throwable $throwable) {
-            if (isset($packageName)) {
+            if (
+                isset($packageName)
+                && (($this->connectedPackages[$packageName] ?? false) !== true)
+            ) {
                 $this->connectedPackages[$packageName] = false;
             }
             $this->handleFailure($throwable, self::ACTION_FAILED_BUILD);