refactor Container to GenericContainer for better align to other Testcontainers language packages

README.md

@@ -17,9 +17,9 @@ composer req --dev testcontainers/testcontainers
 ```php
 <?php
 
-use Testcontainers\Container\Container;
+use Testcontainers\Container\GenericContainer;
 
-$container = Container::make('nginx:alpine');
+$container = GenericContainer::make('nginx:alpine');
 
 // set an environment variable
 $container->withEnvironment('name', 'var');

src/Container/GenericContainer.php

@@ -23,7 +23,7 @@ use Testcontainers\Wait\WaitInterface;
  * @phpstan-type ContainerInspect ContainerInspectSingleNetwork|ContainerInspectMultipleNetworks
  * @phpstan-type DockerNetwork array{CreatedAt: string, Driver: string, ID: string, IPv6: string, Internal: string, Labels: string, Name: string, Scope: string}
  */
-class Container
+class GenericContainer
 {
     protected Docker $dockerClient;
 
@@ -67,7 +67,7 @@ class Container
 
     public static function make(string $image): self
     {
-        return new Container($image);
+        return new GenericContainer($image);
     }
 
     public function getId(): string

src/Container/MariaDBContainer.php

@@ -6,7 +6,7 @@ namespace Testcontainers\Container;
 
 use Testcontainers\Wait\WaitForExec;
 
-class MariaDBContainer extends Container
+class MariaDBContainer extends GenericContainer
 {
     private function __construct(string $version, string $mysqlRootPassword)
     {

src/Container/MySQLContainer.php

@@ -6,7 +6,7 @@ namespace Testcontainers\Container;
 
 use Testcontainers\Wait\WaitForExec;
 
-class MySQLContainer extends Container
+class MySQLContainer extends GenericContainer
 {
     private function __construct(string $version, string $mysqlRootPassword)
     {

src/Container/OpenSearchContainer.php

@@ -6,7 +6,7 @@ namespace Testcontainers\Container;
 
 use Testcontainers\Wait\WaitForHttp;
 
-class OpenSearchContainer extends Container
+class OpenSearchContainer extends GenericContainer
 {
     private function __construct(string $version)
     {

src/Container/PostgresContainer.php

@@ -6,7 +6,7 @@ namespace Testcontainers\Container;
 
 use Testcontainers\Wait\WaitForExec;
 
-class PostgresContainer extends Container
+class PostgresContainer extends GenericContainer
 {
     private function __construct(string $version, string $rootPassword)
     {

src/Container/RedisContainer.php

@@ -6,7 +6,7 @@ namespace Testcontainers\Container;
 
 use Testcontainers\Wait\WaitForLog;
 
-class RedisContainer extends Container
+class RedisContainer extends GenericContainer
 {
     private function __construct(string $version)
     {

src/Registry.php

@@ -4,18 +4,18 @@ declare(strict_types=1);
 
 namespace Testcontainers;
 
-use Testcontainers\Container\Container;
+use Testcontainers\Container\GenericContainer;
 
 class Registry
 {
     private static bool $registeredCleanup = false;
 
     /**
-     * @var array<int|string, Container>
+     * @var array<int|string, GenericContainer>
      */
     private static array $registry = [];
 
-    public static function add(Container $container): void
+    public static function add(GenericContainer $container): void
     {
         self::$registry[spl_object_id($container)] = $container;
 
@@ -25,7 +25,7 @@ class Registry
         }
     }
 
-    public static function remove(Container $container): void
+    public static function remove(GenericContainer $container): void
     {
         unset(self::$registry[spl_object_id($container)]);
     }

src/Trait/DockerContainerAwareTrait.php

@@ -6,12 +6,12 @@ namespace Testcontainers\Trait;
 
 use JsonException;
 use Symfony\Component\Process\Process;
-use Testcontainers\Container\Container;
+use Testcontainers\Container\GenericContainer;
 use UnexpectedValueException;
 
 /**
- * @phpstan-import-type ContainerInspect from Container
- * @phpstan-import-type DockerNetwork from Container
+ * @phpstan-import-type ContainerInspect from GenericContainer
+ * @phpstan-import-type DockerNetwork from GenericContainer
  */
 trait DockerContainerAwareTrait
 {

tests/Integration/WaitStrategyTest.php

@@ -8,7 +8,7 @@ use PHPUnit\Framework\TestCase;
 use Predis\Client;
 use Predis\Connection\ConnectionException;
 use Symfony\Component\Process\Process;
-use Testcontainers\Container\Container;
+use Testcontainers\Container\GenericContainer;
 use Testcontainers\Exception\ContainerNotReadyException;
 use Testcontainers\Registry;
 use Testcontainers\Trait\DockerContainerAwareTrait;
@@ -32,7 +32,7 @@ class WaitStrategyTest extends TestCase
     {
         $called = false;
 
-        $container = Container::make('mysql')
+        $container = GenericContainer::make('mysql')
             ->withEnvironment('MYSQL_ROOT_PASSWORD', 'root')
             ->withWait(new WaitForExec(['mysqladmin', 'ping', '-h', '127.0.0.1'], function (Process $process) use (&$called) {
                 $called = true;
@@ -60,7 +60,7 @@ class WaitStrategyTest extends TestCase
 
     public function testWaitForLog(): void
     {
-        $container = Container::make('redis:6.2.5')
+        $container = GenericContainer::make('redis:6.2.5')
             ->withWait(new WaitForLog('Ready to accept connections'));
 
         $container->run();
@@ -86,7 +86,7 @@ class WaitStrategyTest extends TestCase
 
     public function testWaitForHTTP(): void
     {
-        $container = Container::make('nginx:alpine')
+        $container = GenericContainer::make('nginx:alpine')
             ->withWait(WaitForHttp::make(80));
 
         $container->run();
@@ -107,7 +107,7 @@ class WaitStrategyTest extends TestCase
      */
     public function testWaitForTcpPortOpen(bool $wait): void
     {
-        $container = Container::make('nginx:alpine');
+        $container = GenericContainer::make('nginx:alpine');
 
         if ($wait) {
             $container->withWait(WaitForTcpPortOpen::make(80));
@@ -140,7 +140,7 @@ class WaitStrategyTest extends TestCase
 
     public function testWaitForHealthCheck(): void
     {
-        $container = Container::make('nginx')
+        $container = GenericContainer::make('nginx')
             ->withHealthCheckCommand('curl --fail http://localhost')
             ->withWait(new WaitForHealthCheck());