From 3dd4d2525a554ad72fb9971b640cbcb152c47e54 Mon Sep 17 00:00:00 2001
From: Sergei Shitikov <rw4lll@gmail.com>
Date: Sun, 1 Sep 2024 17:05:31 +0200
Subject: [PATCH] Remove WaitForNothing. WaitForContainerRunning can be used as
 a basic implementation instead.

---
 src/Container/MariaDBContainer.php         |  3 +++
 src/Container/MySQLContainer.php           |  4 +++-
 src/Wait/WaitForNothing.php                | 13 -------------
 tests/Integration/MariaDBContainerTest.php |  2 +-
 4 files changed, 7 insertions(+), 15 deletions(-)
 delete mode 100644 src/Wait/WaitForNothing.php

diff --git a/src/Container/MariaDBContainer.php b/src/Container/MariaDBContainer.php
index 60205f9..33a4cc2 100644
--- a/src/Container/MariaDBContainer.php
+++ b/src/Container/MariaDBContainer.php
@@ -4,12 +4,15 @@ declare(strict_types=1);
 
 namespace Testcontainers\Container;
 
+use Testcontainers\Wait\WaitForLog;
+
 class MariaDBContainer extends GenericContainer
 {
     public function __construct(string $version = 'latest', string $mysqlRootPassword = 'root')
     {
         parent::__construct('mariadb:' . $version);
         $this->withExposedPorts(3306);
+        $this->withWait(new WaitForLog('ready for connections'));
         $this->withEnvironment('MARIADB_ROOT_PASSWORD', $mysqlRootPassword);
     }
 
diff --git a/src/Container/MySQLContainer.php b/src/Container/MySQLContainer.php
index d1dfdeb..cdf6577 100644
--- a/src/Container/MySQLContainer.php
+++ b/src/Container/MySQLContainer.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Testcontainers\Container;
 
-use Testcontainers\Wait\WaitForExec;
+use Testcontainers\Wait\WaitForLog;
 
 class MySQLContainer extends GenericContainer
 {
@@ -12,6 +12,8 @@ class MySQLContainer extends GenericContainer
     {
         parent::__construct('mysql:' . $version);
         $this->withExposedPorts(3306);
+
+        $this->withWait(new WaitForLog('ready for connections'));
         $this->withEnvironment('MYSQL_ROOT_PASSWORD', $mysqlRootPassword);
     }
 
diff --git a/src/Wait/WaitForNothing.php b/src/Wait/WaitForNothing.php
deleted file mode 100644
index 741df17..0000000
--- a/src/Wait/WaitForNothing.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Testcontainers\Wait;
-
-class WaitForNothing implements WaitInterface
-{
-    public function wait(string $id): void
-    {
-        // does nothing
-    }
-}
diff --git a/tests/Integration/MariaDBContainerTest.php b/tests/Integration/MariaDBContainerTest.php
index f0629a7..f1da8c8 100644
--- a/tests/Integration/MariaDBContainerTest.php
+++ b/tests/Integration/MariaDBContainerTest.php
@@ -16,7 +16,7 @@ class MariaDBContainerTest extends ContainerTestCase
             ->start();
     }
 
-    public function testMySQLContainer(): void
+    public function testMariaDBContainer(): void
     {
         $pdo = new \PDO(
             sprintf('mysql:host=%s;port=3306', self::$container->getAddress()),