Merge pull request #29 from testcontainers/0.2

Author: shyim

.github/workflows/php.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
 
 permissions:
   contents: read

README.md

@@ -17,12 +17,15 @@ composer req --dev testcontainers/testcontainers
 ```php
 <?php
 
-use Testcontainers\Container\Container;
+use Testcontainers\Container\GenericContainer;
 
-$container = Container::make('nginx:alpine');
+$container = new GenericContainer('nginx:alpine');
 
 // set an environment variable
-$container->withEnvironment('name', 'var');
+$container->withEnvironment([
+    'key1' => 'val1',
+    'key2' => 'val2'
+]);
 
 // enable health check for an container
 $container->withHealthCheckCommand('curl --fail localhost');
@@ -35,10 +38,19 @@ Normally you have to wait until the Container is ready. so for this you can defi
 
 ```php
 
+use Testcontainers\Container\GenericContainer;
+use Testcontainers\Wait\WaitForExec;
+use Testcontainers\Wait\WaitForLog;
+use Testcontainers\Wait\WaitForHttp;
+use Testcontainers\Wait\WaitForHealthCheck;
+use Testcontainers\Wait\WaitForHostPort;
+
+$container = new GenericContainer('nginx:alpine');
+
 // Run mysqladmin ping until the command returns exit code 0
 $container->withWait(new WaitForExec(['mysqladmin', 'ping', '-h', '127.0.0.1']));
 
-$container->withWait(new WaitForExec(['mysqladmin', 'ping', '-h', '127.0.0.1']), function(Process $process) {
+$container->withWait(new WaitForExec(['mysqladmin', 'ping', '-h', '127.0.0.1']), function($exitCode, $contents) {
     // throw exception if process result is bad
 });
 
@@ -47,7 +59,10 @@ $container->withWait(new WaitForLog('Ready to accept connections'));
 
 
 // Wait for an http request to succeed
-$container->withWait(WaitForHttp::make($port, $method = 'GET', $path = '/'));
+$container->withWait(new WaitForHttp($port, $method = 'GET', $path = '/'));
+
+// Wait for all bound ports to be open
+$container->withWait(new WaitForHostPort());
 
 // Wait until the docker heartcheck is green
 $container->withWait(new WaitForHealthCheck());
@@ -58,16 +73,19 @@ $container->withWait(new WaitForHealthCheck());
 ```php
 <?php
 
-use Testcontainers\Container\MySQLContainer;
+use Testcontainers\Modules\MySQLContainer;
 
-$container = MySQLContainer::make('8.0');
-$container->withMySQLDatabase('foo');
-$container->withMySQLUser('bar', 'baz');
-
-$container->run();
+$container = (new MySQLContainer('8.0'))
+    ->withMySQLDatabase('foo')
+    ->withMySQLUser('bar', 'baz')
+    ->start();
 
 $pdo = new \PDO(
-    sprintf('mysql:host=%s;port=3306', $container->getAddress()),
+    sprintf(
+        'mysql:host=%s;port=%d',
+        $container->getHost(),
+        $container->getFirstMappedPort()
+    ),
     'bar',
     'baz',
 );
@@ -80,16 +98,19 @@ $pdo = new \PDO(
 ```php
 <?php
 
-use Testcontainers\Container\MariaDBContainer;
-
-$container = MariaDBContainer::make('8.0');
-$container->withMariaDBDatabase('foo');
-$container->withMariaDBUser('bar', 'baz');
+use Testcontainers\Modules\MariaDBContainer;
 
-$container->run();
+$container = $container = (new MariaDBContainer())
+    ->withMariaDBDatabase('foo')
+    ->withMariaDBUser('bar', 'baz')
+    ->start();
 
 $pdo = new \PDO(
-    sprintf('mysql:host=%s;port=3306', $container->getAddress()),
+    sprintf(
+        'mysql:host=%s;port=%d',
+        $container->getHost(),
+        $container->getFirstMappedPort()
+    ),
     'bar',
     'baz',
 );
@@ -102,18 +123,21 @@ $pdo = new \PDO(
 ```php
 <?php
 
-use Testcontainers\Container\PostgresContainer;
+use Testcontainers\Modules\PostgresContainer;
 
-$container = PostgresContainer::make('15.0', 'password');
-$container->withPostgresDatabase('database');
-$container->withPostgresUser('username');
-
-$container->run();
+$container = (new PostgresContainer())
+    ->withPostgresUser('bar')
+    ->withPostgresDatabase('foo')
+    ->start();
 
 $pdo = new \PDO(
-    sprintf('pgsql:host=%s;port=5432;dbname=database', $container->getAddress()),
-    'username',
-    'password',
+    sprintf(
+        'pgsql:host=%s;port=%d;dbname=foo',
+        self::$container->getHost(),
+        self::$container->getFirstMappedPort()
+    ),
+    'bar',
+    'test',
 );
 
 // Do something with pdo
@@ -123,14 +147,13 @@ $pdo = new \PDO(
 
 ```php
 
-use Testcontainers\Container\RedisContainer;
+use Testcontainers\Modules\RedisContainer;
 
-$container = RedisContainer::make('6.0');
-
-$container->run();
+$container = (new RedisContainer())
+    ->start();
 
 $redis = new \Redis();
-$redis->connect($container->getAddress());
+$redis->connect($container->getHost(), $container->getFirstMappedPort());
 
 // Do something with redis
 ```
@@ -139,12 +162,11 @@ $redis->connect($container->getAddress());
 
 ```php
 
-use Testcontainers\Container\OpenSearchContainer;
-
-$container = OpenSearchContainer::make('2');
-$container->disableSecurityPlugin();
+use Testcontainers\Modules\OpenSearchContainer;
 
-$container->run();
+$container = (new OpenSearchContainer())
+    ->withDisabledSecurityPlugin()
+    ->start();
 
 // Do something with opensearch
 ```
@@ -166,7 +188,7 @@ use Doctrine\Bundle\DoctrineBundle\ConnectionFactory;
 use Doctrine\Common\EventManager;
 use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Tools\DsnParser;
-use Testcontainers\Container\PostgresContainer;
+use Testcontainers\Modules\PostgresContainer;
 
 class TestConnectionFactory extends ConnectionFactory
 {
@@ -175,11 +197,12 @@ class TestConnectionFactory extends ConnectionFactory
     public function __construct(array $typesConfig, ?DsnParser $dsnParser = null)
     {
         if (!$this::$testDsn) {
-            $psql = PostgresContainer::make('14.0', 'password');
-            $psql->withPostgresDatabase('database');
-            $psql->withPostgresUser('user');
-            $psql->run();
-            $this::$testDsn = sprintf('postgresql://user:password@%s:5432/database?serverVersion=14&charset=utf8', $psql->getAddress());
+            $psql = (new PostgresContainer())
+                ->withPostgresUser('user')
+                ->withPostgresPassword('password')
+                ->withPostgresDatabase('database')
+                ->start();
+            $this::$testDsn = sprintf('postgresql://user:password@%s:%d/database?serverVersion=14&charset=utf8', $psql->getAddress(), $psql->getFirstMappedPort());
         }
         parent::__construct($typesConfig, $dsnParser);
     }

composer.json

@@ -14,12 +14,16 @@
         }
     ],
     "require": {
+        "ext-curl": "*",
         "php": ">= 8.1",
-        "symfony/process": "^5.0|^6.0|^7.0"
+        "beluga-php/docker-php": "^1.45"
     },
     "require-dev": {
+        "ext-pdo": "*",
+        "ext-pdo_mysql": "*",
+        "ext-pdo_pgsql": "*",
         "phpunit/phpunit": "^9.5",
-        "brianium/paratest": "^6.6",
+        "brianium/paratest": "^6.11",
         "friendsofphp/php-cs-fixer": "^3.12",
         "phpstan/phpstan": "^1.8",
         "phpstan/phpstan-phpunit": "^1.1",
@@ -40,11 +44,12 @@
         "integration": "paratest tests/ --bootstrap vendor/autoload.php -f",
         "cs": "php-cs-fixer fix --dry-run",
         "cs:fix": "php-cs-fixer fix",
-        "phpstan": "phpstan analyse"
+        "phpstan": "phpstan analyse --memory-limit=256M"
     },
     "config": {
         "allow-plugins": {
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "php-http/discovery": false
         }
     }
 }