- Move most of the stuff for backwards compatibility support into one class

- Added random port logic
- Updated wait wtrategies
- API alignments to make it similar to other official implementations
- ...

src/Container/Container.php

@@ -6,9 +6,154 @@ namespace Testcontainers\Container;
 
 /**
  * Added for backward compatibility.
- * Just a wrapper for GenericContainer.
  * @deprecated Use GenericContainer instead.
+ * TODO: Remove in next major release.
  */
-class Container extends GenericContainer
+final class Container extends GenericContainer
 {
+    protected ?StartedTestContainer $startedContainer = null;
+
+    protected ?StoppedTestContainer $stoppedContainer = null;
+    public static function make(string $image): self
+    {
+        return new self($image);
+    }
+
+    /**
+     * @deprecated Use `withPrivilegedMode` instead
+     */
+    public function withPrivileged(bool $privileged = true): self
+    {
+        return $this->withPrivilegedMode($privileged);
+    }
+
+    /**
+     * @deprecated Use `withExposedPorts` instead
+     */
+    public function withPort(string $localPort, string $containerPort): self
+    {
+        return $this->withExposedPorts($containerPort);
+    }
+
+    /**
+     * @deprecated there will be no replacement
+     */
+    public function withImage(string $image): self
+    {
+        $this->image = $image;
+
+        return $this;
+    }
+
+    /**
+     * @deprecated Use `start` instead
+     */
+    public function run(): self
+    {
+        $this->startedContainer = $this->start();
+
+        return $this;
+    }
+
+    /**
+     * @param array<string> $commandAsArray
+     * @deprecated Use 'exec' from StartedTestContainer instead
+     */
+    public function execute(array $commandAsArray): string
+    {
+        if($this->startedContainer === null) {
+            throw new \RuntimeException('Container is not started');
+        }
+
+        return $this->startedContainer->exec($commandAsArray);
+    }
+
+    /**
+     * @deprecated Use 'logs' from StartedTestContainer instead
+     */
+    public function logs(): string
+    {
+        if($this->startedContainer === null) {
+            throw new \RuntimeException('Container is not started');
+        }
+
+        return $this->startedContainer->logs();
+    }
+
+    /**
+     * @deprecated Use 'getHost' from StartedTestContainer instead
+     */
+    public function getAddress(): string
+    {
+        if($this->startedContainer === null) {
+            throw new \RuntimeException('Container is not started');
+        }
+
+        return $this->startedContainer->getHost();
+    }
+
+    /**
+     * @deprecated Use 'getFirstMappedPort' from StartedTestContainer instead
+     */
+    public function getPort(): int
+    {
+        if($this->startedContainer === null) {
+            throw new \RuntimeException('Container is not started');
+        }
+
+        return $this->startedContainer->getFirstMappedPort();
+    }
+
+    /**
+     * @deprecated Use 'stop' from StartedTestContainer instead
+     */
+    public function kill(): self
+    {
+        $this->dockerClient->containerKill($this->id);
+
+        return $this;
+    }
+
+    /**
+     * @deprecated Use `stop` from StartedTestContainer instead
+     */
+    public function stop(): self
+    {
+        if($this->startedContainer === null) {
+            throw new \RuntimeException('Container is not started');
+        }
+
+        $this->stoppedContainer = $this->startedContainer->stop();
+
+        return $this;
+    }
+
+    /**
+     * @deprecated Use 'restart' method from StartedTestContainer instead
+     */
+    public function restart(): self
+    {
+        if($this->startedContainer === null) {
+            throw new \RuntimeException('Container is not started');
+        }
+
+        $restartedTestContainer = $this->startedContainer->restart();
+        $this->startedContainer = $restartedTestContainer;
+
+        return $this;
+    }
+
+    /**
+     * @deprecated Use 'stop' method from StartedTestContainer instead
+     */
+    public function remove(): self
+    {
+        if($this->startedContainer === null) {
+            throw new \RuntimeException('Container is not started');
+        }
+
+        $this->startedContainer->stop();
+
+        return $this;
+    }
 }