Make phpstan happy again

testcontainers · Jul 16, 2024 · 0edcaee · 0edcaee
1 parent 6c3c74c
commit 0edcaee
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/Container/Container.php b/src/Container/Container.php
@@ -9,9 +9,12 @@
 use Testcontainer\Registry;
 use Testcontainer\Wait\WaitForNothing;
 use Testcontainer\Wait\WaitInterface;
+use UnexpectedValueException;
 
 /**
- * @phpstan-type ContainerInspect array{0: array{NetworkSettings: array{IPAddress: string}}}
+ * @phpstan-type ContainerInspectSingleNetwork array<int, array{'NetworkSettings': array{'IPAddress': string}}>
+ * @phpstan-type ContainerInspectMultipleNetworks array<int, array{'NetworkSettings': array{'Networks': array<string, array{'IPAddress': string}>}}>
+ * @phpstan-type ContainerInspect ContainerInspectSingleNetwork|ContainerInspectMultipleNetworks
  */
 class Container
 {
@@ -165,7 +168,7 @@ public function run(bool $wait = true): self
         $inspect = new Process(['docker', 'inspect', $this->id]);
         $inspect->mustRun();
 
-        /** @var ContainerInspect $inspectedData  */
+        /** @var ContainerInspectSingleNetwork|ContainerInspectMultipleNetworks $inspectedData  */
         $inspectedData = json_decode($inspect->getOutput(), true, 512, JSON_THROW_ON_ERROR);
 
         $this->inspectedData = $inspectedData;
@@ -256,10 +259,20 @@ public function logs(): string
 
     public function getAddress(): string
     {
-        if ($this->network !== null && !empty($this->inspectedData[0]['NetworkSettings']['Networks'][$this->network]['IPAddress'])) {
-            return $this->inspectedData[0]['NetworkSettings']['Networks'][$this->network]['IPAddress'];
+        if (is_string($this->network)) {
+            $containerAddress = $this->inspectedData[0]['NetworkSettings']['Networks'][$this->network]['IPAddress'] ?? null;
+
+            if (is_string($containerAddress)) {
+                return $containerAddress;
+            }
+        }
+
+        $containerAddress = $this->inspectedData[0]['NetworkSettings']['IPAddress'] ?? null;
+
+        if (is_string($containerAddress)) {
+            return $containerAddress;
         }
 
-        return $this->inspectedData[0]['NetworkSettings']['IPAddress'];
+        throw new UnexpectedValueException('Unable to find container IP address');
     }
 }
diff --git a/src/Wait/WaitForTcpPortOpen.php b/src/Wait/WaitForTcpPortOpen.php
@@ -10,7 +10,7 @@
 use Testcontainer\Exception\ContainerNotReadyException;
 
 /**
- * @phpstan-type ContainerInspect array<int, array{'NetworkSettings': array{'IPAddress': string}}>
+ * @phpstan-import-type ContainerInspect from \Testcontainer\Container\Container
  */
 final class WaitForTcpPortOpen implements WaitInterface
 {