Skip to content

Commit a9ee3c1

Browse files
authored
Merge pull request #882 from bavix/collation-revert
[11.x] revert collation
2 parents df4913c + 5365fcd commit a9ee3c1

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

.github/workflows/phpunits.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
- 3306:3306
7474

7575
mariadb:
76-
image: mariadb:10.5
76+
image: mariadb:10.10 # https://github.com/laravel/framework/pull/48455
7777
env:
7878
MYSQL_ROOT_PASSWORD: wallet
7979
MYSQL_DATABASE: wallet

tests/Infra/TestCase.php

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ final protected function getPackageProviders($app): array
4848
$app['config']->set('wallet.transfer.model', Transfer::class);
4949
$app['config']->set('wallet.wallet.model', Wallet::class);
5050

51-
//infra
52-
$app['config']->set('database.mysql.collation', 'utf8mb4_unicode_ci');
53-
5451
return [WalletServiceProvider::class, TestServiceProvider::class];
5552
}
5653

@@ -66,13 +63,8 @@ final protected function getEnvironmentSetUp($app): void
6663
$config->set('database.connections.testing.prefix', 'tests');
6764
$config->set('database.connections.pgsql.prefix', 'tests');
6865
$config->set('database.connections.mysql.prefix', 'tests');
69-
70-
/** @var array<string, mixed> $mysql */
71-
$mysql = $config->get('database.connections.mysql');
72-
$config->set('database.connections.mariadb', array_merge($mysql, [
73-
'collation' => 'utf8mb4_unicode_ci',
74-
'port' => 3307,
75-
]));
66+
$config->set('database.connections.mariadb.prefix', 'tests');
67+
$config->set('database.connections.mariadb.port', 3307);
7668

7769
// new table name's
7870
$config->set('wallet.transaction.table', 'transaction');

0 commit comments

Comments
 (0)