Merge branch 'krowinski-master'

Author: hetao29

.github/workflows/tests.yml

@@ -6,27 +6,25 @@ jobs:
 
     strategy:
         matrix:
-            php: [ '8.2' ]
+            php: [ '8.2', '8.3', '8.4' ]
             mysql-version: [ '5.7', '8.0', '8.4' ]
 
-    services:
-      mysql:
-        image: "mysql:${{ matrix.mysql-version }}"
-        env:
-          MYSQL_ROOT_PASSWORD: root
-          MYSQL_DATABASE: mysqlreplication_test
-        ports:
-          - 3306/tcp
-
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Start mysql service
-        run: |
-          echo -e "\n[mysqld]\nserver-id=1\nbinlog_format=row\nlog_bin=/var/log/mysql/mysql-bin.log\nbinlog_rows_query_log_events=ON" | sudo tee -a /etc/mysql/my.cnf
-          sudo /etc/init.d/mysql start
-          mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql -proot
+      - uses: shogo82148/actions-setup-mysql@v1
+        with:
+          mysql-version: "${{ matrix.mysql-version }}"
+          my-cnf: |
+            server-id=1
+            binlog_format=row
+            binlog_rows_query_log_events=ON
+            log_bin=binlog
+          root-password: root
+
+      - name: set up timezones
+        run: mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql -proot
 
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
@@ -39,7 +37,7 @@ jobs:
 
       - name: Cache Composer packages
         id: composer-cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: vendor
           key: ${{ runner.os }}-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}

src/MySQLReplication/Event/RowsQueryEvent.php

@@ -16,10 +16,10 @@ class RowsQueryEvent extends EventCommon
 {
     public function makeRowsQueryDTO(): RowsQueryDTO
     {
-        // $this->binaryDataReader->advance(1);
+        $this->binaryDataReader->advance(1);
         return new RowsQueryDTO(
             $this->eventInfo,
-            $this->binaryDataReader->read($this->binaryDataReader->readInt8()),
+            $this->binaryDataReader->read($this->eventInfo->getSizeNoHeader() - 1),
         );
     }
 }

src/MySQLReplication/MySQLReplicationFactory.php

@@ -33,11 +33,11 @@ class MySQLReplicationFactory
 
     public function __construct(
         Config $config,
-        RepositoryInterface|null $repository = null,
-        CacheInterface|null $cache = null,
-        EventDispatcherInterface|null $eventDispatcher = null,
-        SocketInterface|null $socket = null,
-        LoggerInterface|null $logger = null
+        ?RepositoryInterface $repository = null,
+        ?CacheInterface $cache = null,
+        ?EventDispatcherInterface $eventDispatcher = null,
+        ?SocketInterface $socket = null,
+        ?LoggerInterface $logger = null
     ) {
         $config->validate();
 

src/MySQLReplication/Repository/MySQLRepository.php

@@ -65,13 +65,14 @@ public function getVersion(): string
 
     public function getMasterStatus(): MasterStatusDTO
     {
-		if(version_compare($this->getVersion(),"8.4.0")>=0){
-			$data = $this->getConnection()
-				->fetchAssociative('SHOW BINARY LOG STATUS');
-		}else{
-			$data = $this->getConnection()
-				->fetchAssociative('SHOW MASTER STATUS');
-		}
+        $query = 'SHOW MASTER STATUS';
+
+        if (str_starts_with($this->getVersion(), '8.4')) {
+            $query = 'SHOW BINARY LOG STATUS';
+        }
+
+        $data = $this->getConnection()
+            ->fetchAssociative($query);
         if (empty($data)) {
             throw new BinLogException(
                 MySQLReplicationException::BINLOG_NOT_ENABLED,

tests/Integration/RowsQueryTest.php

@@ -4,20 +4,22 @@
 
 namespace MySQLReplication\Tests\Integration;
 
+use Generator;
 use MySQLReplication\Definitions\ConstEventType;
 use MySQLReplication\Event\DTO\QueryDTO;
 use MySQLReplication\Event\DTO\RowsQueryDTO;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 final class RowsQueryTest extends BaseCase
 {
-    public function testThatTheEditingQueryIsReadFromBinLog(): void
+    #[DataProvider('provideQueries')]
+    public function testThatTheEditingQueryIsReadFromBinLog(string $query): void
     {
         $this->connection->executeStatement(
             'CREATE TABLE test (id INT NOT NULL AUTO_INCREMENT, data VARCHAR (50) NOT NULL, PRIMARY KEY (id))'
         );
 
-        $insertQuery = 'INSERT INTO test (data) VALUES(\'Hello\') /* Foo:Bar; */';
-        $this->connection->executeStatement($insertQuery);
+        $this->connection->executeStatement($query);
 
         // The Create Table Query ... irrelevant content for this test
         self::assertInstanceOf(QueryDTO::class, $this->getEvent());
@@ -26,7 +28,15 @@ public function testThatTheEditingQueryIsReadFromBinLog(): void
 
         $rowsQueryEvent = $this->getEvent();
         self::assertInstanceOf(RowsQueryDTO::class, $rowsQueryEvent);
-        self::assertSame($insertQuery, $rowsQueryEvent->query);
+        self::assertSame($query, $rowsQueryEvent->query);
+    }
+
+    public static function provideQueries(): Generator
+    {
+        yield 'Short Query' => ['INSERT INTO test (data) VALUES(\'Hello\') /* Foo:Bar; */'];
+
+        $comment = '/* Foo:Bar; Bar:Baz; Baz:Quo; Quo:Foo; Quo:Foo; Quo:Foo; Quo:Foo; Foo:Baz; */';
+        yield 'Extra Long Query' => [$comment . ' INSERT INTO test (data) VALUES(\'Hello\') ' . $comment];
     }
 
     protected function getIgnoredEvents(): array