port and version check

krowinski · Jan 29, 2024 · 334e04f · 334e04f
1 parent cd35e17
commit 334e04f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ services:
   replication-test-mysql-percona:
     container_name: replication-test-mysql-percona
     hostname: replication-test-mysql-percona
-    image: mysql:8.2
+    image: mysql:8.0
     platform: linux/amd64
     command: [
       '--character-set-server=utf8mb4',
@@ -18,5 +18,5 @@ services:
       - MYSQL_ROOT_PASSWORD=root
       - MYSQL_DATABASE=mysqlreplication_test
     ports:
-      - "3322:3306/tcp"
+      - "3306:3306/tcp"
     restart: unless-stopped
diff --git a/example/benchmark.php b/example/benchmark.php
@@ -25,7 +25,7 @@ class benchmark
     private const DB_USER = 'root';
     private const DB_PASS = 'root';
     private const DB_HOST = '127.0.0.1';
-    private const DB_PORT = 3322;
+    private const DB_PORT = 3306;
 
     private MySQLReplicationFactory $binLogStream;
 

diff --git a/example/dump_events.php b/example/dump_events.php
@@ -24,7 +24,7 @@
         ->withUser('root')
         ->withHost('0.0.0.0')
         ->withPassword('root')
-        ->withPort(3322)
+        ->withPort(3306)
         ->withHeartbeatPeriod(60)
         ->withEventsIgnore([ConstEventType::HEARTBEAT_LOG_EVENT->value])
         ->build(),

diff --git a/tests/Integration/BaseCase.php b/tests/Integration/BaseCase.php
@@ -40,12 +40,12 @@ protected function setUp(): void
             ->withUser('root')
             ->withHost('0.0.0.0')
             ->withPassword('root')
-            ->withPort(3322)
+            ->withPort(3306)
             ->withEventsIgnore([ConstEventType::GTID_LOG_EVENT->value]);
 
         $this->connect();
 
-        if ($this->checkForVersion(8.4) && $this->mySQLReplicationFactory?->getServerInfo()->isGeneric()) {
+        if ($this->mySQLReplicationFactory?->getServerInfo()->versionRevision >= 8 && $this->mySQLReplicationFactory?->getServerInfo()->isGeneric()) {
             self::assertInstanceOf(RotateDTO::class, $this->getEvent());
         }
         self::assertInstanceOf(FormatDescriptionEventDTO::class, $this->getEvent());

diff --git a/tests/Integration/BasicTest.php b/tests/Integration/BasicTest.php
@@ -366,7 +366,7 @@ private function connectWithProvidedEventDispatcher(EventDispatcherInterface $ev
         $this->connection->executeStatement('USE ' . $this->database);
         $this->connection->executeStatement('SET SESSION sql_mode = \'\';');
 
-        if ($this->checkForVersion(8.4) && $this->mySQLReplicationFactory->getServerInfo()->isGeneric()) {
+        if ($this->mySQLReplicationFactory->getServerInfo()->versionRevision >= 8 && $this->mySQLReplicationFactory->getServerInfo()->isGeneric()) {
             self::assertInstanceOf(RotateDTO::class, $this->getEvent());
         }