fix: correct port handling in WaitForHttp and enhance test coverage

Author: awu

src/Wait/WaitForHttp.php

@@ -104,7 +104,7 @@ public function wait(StartedTestContainer $container): void
                 $this->resolvePort($container);
                 $containerAddress = $container->getHost();
 
-                $url = sprintf('%s://%s:%d%s', $this->protocol, $containerAddress, $container->getMappedPort((int) $this->port), $this->path);
+                $url = sprintf('%s://%s:%d%s', $this->protocol, $containerAddress, $this->port, $this->path);
                 $responseCode = $this->makeHttpRequest($url);
 
                 if ($responseCode === $this->expectedStatusCode) {
@@ -147,8 +147,8 @@ private function makeHttpRequest(string $url): int
 
     private function resolvePort(StartedTestContainer $container): void
     {
-        if ($this->port === null) {
-            $this->port = $container->getFirstMappedPort();
-        }
+        $this->port = $this->port === null
+            ? $container->getFirstMappedPort()
+            : $container->getMappedPort($this->port);
     }
 }

tests/Integration/GenericContainerTest.php

@@ -129,7 +129,7 @@ public function testShouldReturnFirstMappedPortWithWaitForHttp(): void
     {
         $container = (new GenericContainer('nginx'))
             ->withExposedPorts(80)
-            ->withWait((new WaitForHttp(80))->withPath('/'))
+            ->withWait((new WaitForHttp())->withMethod('GET')->withPath('/'))
             ->start();
         $firstMappedPort = $container->getFirstMappedPort();
 
@@ -138,6 +138,19 @@ public function testShouldReturnFirstMappedPortWithWaitForHttp(): void
         $container->stop();
     }
 
+    public function testShouldReturnMappedPortWithWaitForHttp(): void
+    {
+        $container = (new GenericContainer('nginx'))
+            ->withExposedPorts(80)
+            ->withWait((new WaitForHttp(80))->withMethod('GET')->withPath('/'))
+            ->start();
+        $mappedPort = $container->getMappedPort(80);
+
+        self::assertSame($mappedPort, $container->getFirstMappedPort());
+
+        $container->stop();
+    }
+
     public function testShouldSetLabels(): void
     {
         $labels = [