From 157deb419b9ea43015823081ab736356168fc931 Mon Sep 17 00:00:00 2001 From: krowinski Date: Tue, 14 May 2024 13:03:43 +0200 Subject: [PATCH 01/10] feat: added more versions to check --- .github/workflows/tests.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8d59e50..9107311 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,17 +1,17 @@ name: PHP Tests -on: [push, pull_request] +on: [ push, pull_request ] jobs: build: runs-on: ubuntu-latest strategy: - matrix: - php: [ '8.2' ] - mysql-version: [ '5.7', '8.0', '8.4' ] + matrix: + php: [ '8.2', '8.3' ] + mysql-version: [ 'mysql:5.5', 'mysql:5.6', 'mysql:5.7', 'mysql:8.0', 'mysql:8.4', 'mariadb:5.5', 'mariadb:10.0', 'mariadb:10.1', 'percona:5.7', 'percona:8.0' ] services: mysql: - image: "mysql:${{ matrix.mysql-version }}" + image: "${{ matrix.mysql-version }}" env: MYSQL_ROOT_PASSWORD: root MYSQL_DATABASE: mysqlreplication_test From 84c67699c04b386a49989a0766de67977aadd779 Mon Sep 17 00:00:00 2001 From: krowinski Date: Wed, 12 Jun 2024 12:24:25 +0200 Subject: [PATCH 02/10] add old maria --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9107311..40f3308 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: php: [ '8.2', '8.3' ] - mysql-version: [ 'mysql:5.5', 'mysql:5.6', 'mysql:5.7', 'mysql:8.0', 'mysql:8.4', 'mariadb:5.5', 'mariadb:10.0', 'mariadb:10.1', 'percona:5.7', 'percona:8.0' ] + mysql-version: [ 'mysql:5.5', 'mysql:5.6', 'mysql:5.7', 'mysql:8.0', 'mysql:8.4', 'mariadb:5.5', 'mariadb:5.6', 'mariadb:5.7', 'mariadb:10.0', 'mariadb:10.1', 'percona:5.7', 'percona:8.0' ] services: mysql: From dd8140b9fd7e379d44c6668ec50ac917ec8ce1a3 Mon Sep 17 00:00:00 2001 From: krowinski Date: Wed, 12 Jun 2024 12:29:05 +0200 Subject: [PATCH 03/10] up --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 40f3308..e2e7e6d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: php: [ '8.2', '8.3' ] - mysql-version: [ 'mysql:5.5', 'mysql:5.6', 'mysql:5.7', 'mysql:8.0', 'mysql:8.4', 'mariadb:5.5', 'mariadb:5.6', 'mariadb:5.7', 'mariadb:10.0', 'mariadb:10.1', 'percona:5.7', 'percona:8.0' ] + mysql-version: [ 'mysql:5.5', 'mysql:5.6', 'mysql:5.7', 'mysql:8.0', 'mysql:8.4', 'mariadb:5.5' 'mariadb:10.0', 'mariadb:10.1', 'percona:5.7', 'percona:8.0' ] services: mysql: From eebb18e8bb3fb5b7c3451a0cc799aaade3fced5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Rowi=C5=84ski?= Date: Wed, 12 Jun 2024 12:30:00 +0200 Subject: [PATCH 04/10] Update tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e2e7e6d..9107311 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: php: [ '8.2', '8.3' ] - mysql-version: [ 'mysql:5.5', 'mysql:5.6', 'mysql:5.7', 'mysql:8.0', 'mysql:8.4', 'mariadb:5.5' 'mariadb:10.0', 'mariadb:10.1', 'percona:5.7', 'percona:8.0' ] + mysql-version: [ 'mysql:5.5', 'mysql:5.6', 'mysql:5.7', 'mysql:8.0', 'mysql:8.4', 'mariadb:5.5', 'mariadb:10.0', 'mariadb:10.1', 'percona:5.7', 'percona:8.0' ] services: mysql: From fbb7278e97cd9a5b045499cafd792682488c96a6 Mon Sep 17 00:00:00 2001 From: krowinski Date: Mon, 23 Dec 2024 14:00:03 +0100 Subject: [PATCH 05/10] debug --- .github/workflows/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e2e7e6d..2dab2ab 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -28,6 +28,9 @@ jobs: sudo /etc/init.d/mysql start mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql -proot + - name: Debug matrix values + run: echo "Using PHP ${{ matrix.php }} and MySQL ${{ matrix.mysql-version }}" + - name: Setup PHP, with composer and extensions uses: shivammathur/setup-php@v2 with: From 637f469dc8d7045a1dbc44ded5dd2d4acb104065 Mon Sep 17 00:00:00 2001 From: krowinski Date: Mon, 23 Dec 2024 14:02:15 +0100 Subject: [PATCH 06/10] debug --- tests/Integration/BaseCase.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/Integration/BaseCase.php b/tests/Integration/BaseCase.php index 05edeb3..c7e08df 100644 --- a/tests/Integration/BaseCase.php +++ b/tests/Integration/BaseCase.php @@ -45,6 +45,8 @@ protected function setUp(): void $this->connect(); + var_dump($this->mySQLReplicationFactory?->getServerInfo()); + if ($this->mySQLReplicationFactory?->getServerInfo()->versionRevision >= 8 && $this->mySQLReplicationFactory?->getServerInfo()->isGeneric()) { self::assertInstanceOf(RotateDTO::class, $this->getEvent()); } From a10e9f8c300c8ecd52110f5b3cd06aa76f6eb9f6 Mon Sep 17 00:00:00 2001 From: krowinski Date: Mon, 23 Dec 2024 14:11:39 +0100 Subject: [PATCH 07/10] debug --- .github/workflows/tests.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5a90c01..1d27028 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -6,8 +6,8 @@ jobs: strategy: matrix: - php: [ '8.2', '8.3' ] - mysql-version: [ 'mysql:5.5', 'mysql:5.6', 'mysql:5.7', 'mysql:8.0', 'mysql:8.4', 'mariadb:5.5', 'mariadb:10.0', 'mariadb:10.1', 'percona:5.7', 'percona:8.0' ] + php: [ '8.2', '8.3', '8.4' ] + mysql-version: [ 'mysql:5.5' ] services: mysql: @@ -28,9 +28,6 @@ jobs: sudo /etc/init.d/mysql start mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql -proot - - name: Debug matrix values - run: echo "Using PHP ${{ matrix.php }} and MySQL ${{ matrix.mysql-version }}" - - name: Setup PHP, with composer and extensions uses: shivammathur/setup-php@v2 with: From cba342c656eaa548d8ff5d5ad6712229285c99e0 Mon Sep 17 00:00:00 2001 From: krowinski Date: Mon, 23 Dec 2024 14:31:25 +0100 Subject: [PATCH 08/10] debug --- .github/workflows/tests.yml | 4 ++-- src/MySQLReplication/Tools.php | 14 ++++++++++++++ tests/Integration/BaseCase.php | 3 ++- 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 src/MySQLReplication/Tools.php diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1d27028..8babc1e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,7 +16,7 @@ jobs: MYSQL_ROOT_PASSWORD: root MYSQL_DATABASE: mysqlreplication_test ports: - - 3306/tcp + - 3310:3306 steps: - name: Checkout @@ -51,4 +51,4 @@ jobs: run: composer install --prefer-dist --no-progress --no-suggest - name: Run tests - run: vendor/bin/phpunit --coverage-text + run: MYSQL_PORT=3310 vendor/bin/phpunit --coverage-text diff --git a/src/MySQLReplication/Tools.php b/src/MySQLReplication/Tools.php new file mode 100644 index 0000000..19425f1 --- /dev/null +++ b/src/MySQLReplication/Tools.php @@ -0,0 +1,14 @@ +withUser('root') ->withHost('0.0.0.0') ->withPassword('root') - ->withPort(3306) + ->withPort((int)Tools::getFromEnv('MYSQL_PORT', 3306)) ->withEventsIgnore($this->getIgnoredEvents()); $this->connect(); From 697e4d76e42b7087199064ca32973b512eea40f9 Mon Sep 17 00:00:00 2001 From: krowinski Date: Mon, 23 Dec 2024 14:32:38 +0100 Subject: [PATCH 09/10] debug --- tests/Integration/BaseCase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Integration/BaseCase.php b/tests/Integration/BaseCase.php index a1586da..4b56f06 100644 --- a/tests/Integration/BaseCase.php +++ b/tests/Integration/BaseCase.php @@ -46,7 +46,7 @@ protected function setUp(): void $this->connect(); - var_dump($this->mySQLReplicationFactory?->getServerInfo()); + var_dump($this->mySQLReplicationFactory?->getServerInfo(), $this->configBuilder->build()); if ($this->mySQLReplicationFactory?->getServerInfo()->versionRevision >= 8 && $this->mySQLReplicationFactory?->getServerInfo()->isGeneric()) { self::assertInstanceOf(RotateDTO::class, $this->getEvent()); From 1f3561693225691f977b30610183d03dcf661c7d Mon Sep 17 00:00:00 2001 From: krowinski Date: Mon, 23 Dec 2024 14:34:09 +0100 Subject: [PATCH 10/10] debug --- src/MySQLReplication/Tools.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MySQLReplication/Tools.php b/src/MySQLReplication/Tools.php index 19425f1..f64db8e 100644 --- a/src/MySQLReplication/Tools.php +++ b/src/MySQLReplication/Tools.php @@ -8,7 +8,7 @@ class Tools { public static function getFromEnv(string $name, null|int|string $default = null): null|int|string { - $value = $_ENV[$name] ?: null; + $value = getenv($name) ?: null; return $value ?? $default; } }