From abe8159bcb0a443345fc28381881263d1395ff30 Mon Sep 17 00:00:00 2001
From: Sergei Shitikov <rw4lll@gmail.com>
Date: Fri, 6 Sep 2024 21:30:46 +0200
Subject: [PATCH] cleanup

---
 src/Container/GenericContainer.php        | 8 ++++----
 src/Container/StartedGenericContainer.php | 4 ++++
 src/Modules/OpenSearchContainer.php       | 9 ---------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/Container/GenericContainer.php b/src/Container/GenericContainer.php
index 6517091..ed5a39a 100644
--- a/src/Container/GenericContainer.php
+++ b/src/Container/GenericContainer.php
@@ -195,7 +195,7 @@ class GenericContainer implements TestContainer
         try {
             $containerCreatePostBody = new ContainersCreatePostBody();
             //handle withExposedPorts
-            if(!empty($this->exposedPorts)) {
+            if (!empty($this->exposedPorts)) {
                 $portGenerator = new RandomUniquePortGenerator();
                 $portMap = new \ArrayObject();
 
@@ -209,13 +209,13 @@ class GenericContainer implements TestContainer
                 $hostConfig = new HostConfig();
                 $hostConfig->setPortBindings($portMap);
                 //handle withPrivilegedMode
-                if($this->isPrivileged) {
+                if ($this->isPrivileged) {
                     $hostConfig->setPrivileged($this->isPrivileged);
                 }
                 $containerCreatePostBody->setHostConfig($hostConfig);
             }
             //handle withPrivilegedMode
-            if($this->isPrivileged) {
+            if ($this->isPrivileged) {
                 $hostConfig = new HostConfig();
                 $hostConfig->setPrivileged($this->isPrivileged);
             }
@@ -239,7 +239,7 @@ class GenericContainer implements TestContainer
 
         $this->dockerClient->containerStart($this->id);
 
-        if(!isset($this->waitStrategy)) {
+        if (!isset($this->waitStrategy)) {
             $this->withWait(new WaitForContainer());
         }
 
diff --git a/src/Container/StartedGenericContainer.php b/src/Container/StartedGenericContainer.php
index 5760eab..ee509f4 100644
--- a/src/Container/StartedGenericContainer.php
+++ b/src/Container/StartedGenericContainer.php
@@ -110,12 +110,16 @@ class StartedGenericContainer implements StartedTestContainer
     //TODO: not ready yet
     public function getFirstMappedPort(): int
     {
+        var_dump($this->dockerClient);die(123);
+        /** @var \Docker\API\Model\ContainersIdJsonGetResponse200 | null $containerInspectResponse */
         $containerInspectResponse =  $this->dockerClient->containerInspect($this->id);
         $settings = $containerInspectResponse->getNetworkSettings();
 
         $ports = (array)$settings->getPorts();
         $port = array_key_first($ports);
 
+        var_dump($ports, $port, (int)$ports[$port][0]->getHostPort());
+
         return (int) $ports[$port][0]->getHostPort();
     }
 
diff --git a/src/Modules/OpenSearchContainer.php b/src/Modules/OpenSearchContainer.php
index b4e1f5e..ddbb445 100644
--- a/src/Modules/OpenSearchContainer.php
+++ b/src/Modules/OpenSearchContainer.php
@@ -22,15 +22,6 @@ class OpenSearchContainer extends GenericContainer
         ));
     }
 
-    /**
-     *  @deprecated Use constructor instead
-     *  Left for backward compatibility
-     */
-    public static function make(string $version = 'latest'): self
-    {
-        return new self($version);
-    }
-
     public function withDisabledSecurityPlugin(): self
     {
         $this->withEnvironment('plugins.security.disabled', 'true');