From 039281ffd56a85c8ae62cca102119b26a271691a Mon Sep 17 00:00:00 2001 From: Maxim Babichev Date: Fri, 2 Feb 2024 23:47:58 +0300 Subject: [PATCH 01/10] revert collation --- tests/Infra/TestCase.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/Infra/TestCase.php b/tests/Infra/TestCase.php index 0155f1d95..b1c5f91d6 100644 --- a/tests/Infra/TestCase.php +++ b/tests/Infra/TestCase.php @@ -48,9 +48,6 @@ final protected function getPackageProviders($app): array $app['config']->set('wallet.transfer.model', Transfer::class); $app['config']->set('wallet.wallet.model', Wallet::class); - //infra - $app['config']->set('database.mysql.collation', 'utf8mb4_unicode_ci'); - return [WalletServiceProvider::class, TestServiceProvider::class]; } @@ -70,7 +67,6 @@ final protected function getEnvironmentSetUp($app): void /** @var array $mysql */ $mysql = $config->get('database.connections.mysql'); $config->set('database.connections.mariadb', array_merge($mysql, [ - 'collation' => 'utf8mb4_unicode_ci', 'port' => 3307, ])); From e2cab71545525ba4ea08a26d069350319ef74f28 Mon Sep 17 00:00:00 2001 From: Maxim Babichev Date: Sat, 3 Feb 2024 00:59:16 +0300 Subject: [PATCH 02/10] fix port mariadb --- tests/Infra/TestCase.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/Infra/TestCase.php b/tests/Infra/TestCase.php index b1c5f91d6..6ecc4ad17 100644 --- a/tests/Infra/TestCase.php +++ b/tests/Infra/TestCase.php @@ -63,12 +63,8 @@ final protected function getEnvironmentSetUp($app): void $config->set('database.connections.testing.prefix', 'tests'); $config->set('database.connections.pgsql.prefix', 'tests'); $config->set('database.connections.mysql.prefix', 'tests'); - - /** @var array $mysql */ - $mysql = $config->get('database.connections.mysql'); - $config->set('database.connections.mariadb', array_merge($mysql, [ - 'port' => 3307, - ])); + $config->set('database.connections.mariadb.prefix', 'tests'); + $config->set('database.connections.mariadb.port', 3307); // new table name's $config->set('wallet.transaction.table', 'transaction'); From cfcbe29633cb8b01262e8831568d9feec6596c0c Mon Sep 17 00:00:00 2001 From: Maxim Babichev Date: Sat, 3 Feb 2024 10:19:46 +0300 Subject: [PATCH 03/10] fix --- .github/workflows/phpunits.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunits.yaml b/.github/workflows/phpunits.yaml index 13c30159a..22bb79460 100644 --- a/.github/workflows/phpunits.yaml +++ b/.github/workflows/phpunits.yaml @@ -73,7 +73,7 @@ jobs: - 3306:3306 mariadb: - image: mariadb:10.5 + image: mariadb:10.11 # https://github.com/laravel/framework/pull/48455 env: MYSQL_ROOT_PASSWORD: wallet MYSQL_DATABASE: wallet From 444264170c15995c13eb9915e733cec12f93e086 Mon Sep 17 00:00:00 2001 From: Maxim Babichev Date: Sat, 3 Feb 2024 10:21:43 +0300 Subject: [PATCH 04/10] downgrade --- .github/workflows/phpunits.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunits.yaml b/.github/workflows/phpunits.yaml index 22bb79460..adcf73a38 100644 --- a/.github/workflows/phpunits.yaml +++ b/.github/workflows/phpunits.yaml @@ -73,7 +73,7 @@ jobs: - 3306:3306 mariadb: - image: mariadb:10.11 # https://github.com/laravel/framework/pull/48455 + image: mariadb:10.10 # https://github.com/laravel/framework/pull/48455 env: MYSQL_ROOT_PASSWORD: wallet MYSQL_DATABASE: wallet From ac7083b7775ca01b6b364df51bdf56e05a3046df Mon Sep 17 00:00:00 2001 From: Maxim Babichev Date: Sat, 3 Feb 2024 10:22:24 +0300 Subject: [PATCH 05/10] Revert "downgrade" This reverts commit 444264170c15995c13eb9915e733cec12f93e086. --- .github/workflows/phpunits.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunits.yaml b/.github/workflows/phpunits.yaml index adcf73a38..22bb79460 100644 --- a/.github/workflows/phpunits.yaml +++ b/.github/workflows/phpunits.yaml @@ -73,7 +73,7 @@ jobs: - 3306:3306 mariadb: - image: mariadb:10.10 # https://github.com/laravel/framework/pull/48455 + image: mariadb:10.11 # https://github.com/laravel/framework/pull/48455 env: MYSQL_ROOT_PASSWORD: wallet MYSQL_DATABASE: wallet From ede2d3dcb585c10550b4715093630d4386613f26 Mon Sep 17 00:00:00 2001 From: Maxim Babichev Date: Sat, 3 Feb 2024 10:35:01 +0300 Subject: [PATCH 06/10] 10.6 test --- .github/workflows/phpunits.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunits.yaml b/.github/workflows/phpunits.yaml index 22bb79460..eb43b15ca 100644 --- a/.github/workflows/phpunits.yaml +++ b/.github/workflows/phpunits.yaml @@ -73,7 +73,7 @@ jobs: - 3306:3306 mariadb: - image: mariadb:10.11 # https://github.com/laravel/framework/pull/48455 + image: mariadb:10.6 # https://github.com/laravel/framework/pull/48455 env: MYSQL_ROOT_PASSWORD: wallet MYSQL_DATABASE: wallet From c50172976e7498923008182c2d8bdef348ceafe0 Mon Sep 17 00:00:00 2001 From: Maxim Babichev Date: Sat, 3 Feb 2024 10:35:12 +0300 Subject: [PATCH 07/10] 10.7 test --- .github/workflows/phpunits.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunits.yaml b/.github/workflows/phpunits.yaml index eb43b15ca..2eb2219ea 100644 --- a/.github/workflows/phpunits.yaml +++ b/.github/workflows/phpunits.yaml @@ -73,7 +73,7 @@ jobs: - 3306:3306 mariadb: - image: mariadb:10.6 # https://github.com/laravel/framework/pull/48455 + image: mariadb:10.7 # https://github.com/laravel/framework/pull/48455 env: MYSQL_ROOT_PASSWORD: wallet MYSQL_DATABASE: wallet From db9aa1f9272a29ebe7d4fb8bd803bb90f65c6191 Mon Sep 17 00:00:00 2001 From: Maxim Babichev Date: Sat, 3 Feb 2024 10:35:22 +0300 Subject: [PATCH 08/10] 10.8 test --- .github/workflows/phpunits.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunits.yaml b/.github/workflows/phpunits.yaml index 2eb2219ea..2d6ab557f 100644 --- a/.github/workflows/phpunits.yaml +++ b/.github/workflows/phpunits.yaml @@ -73,7 +73,7 @@ jobs: - 3306:3306 mariadb: - image: mariadb:10.7 # https://github.com/laravel/framework/pull/48455 + image: mariadb:10.8 # https://github.com/laravel/framework/pull/48455 env: MYSQL_ROOT_PASSWORD: wallet MYSQL_DATABASE: wallet From 8c77a87d1451b742cca8274fc2644927c44e1155 Mon Sep 17 00:00:00 2001 From: Maxim Babichev Date: Sat, 3 Feb 2024 10:35:32 +0300 Subject: [PATCH 09/10] 10.9 test --- .github/workflows/phpunits.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunits.yaml b/.github/workflows/phpunits.yaml index 2d6ab557f..12ac12285 100644 --- a/.github/workflows/phpunits.yaml +++ b/.github/workflows/phpunits.yaml @@ -73,7 +73,7 @@ jobs: - 3306:3306 mariadb: - image: mariadb:10.8 # https://github.com/laravel/framework/pull/48455 + image: mariadb:10.9 # https://github.com/laravel/framework/pull/48455 env: MYSQL_ROOT_PASSWORD: wallet MYSQL_DATABASE: wallet From 5365fcd1f794765ba70c6d83ca2b99046a465baf Mon Sep 17 00:00:00 2001 From: Maxim Babichev Date: Sat, 3 Feb 2024 10:35:56 +0300 Subject: [PATCH 10/10] 10.10 test --- .github/workflows/phpunits.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunits.yaml b/.github/workflows/phpunits.yaml index 12ac12285..adcf73a38 100644 --- a/.github/workflows/phpunits.yaml +++ b/.github/workflows/phpunits.yaml @@ -73,7 +73,7 @@ jobs: - 3306:3306 mariadb: - image: mariadb:10.9 # https://github.com/laravel/framework/pull/48455 + image: mariadb:10.10 # https://github.com/laravel/framework/pull/48455 env: MYSQL_ROOT_PASSWORD: wallet MYSQL_DATABASE: wallet