Skip to content

Commit 9557596

Browse files
authored
Merge pull request #910 from bavix/test-10x
[10.x] Add support laravel ^11.0
2 parents d6f5b57 + bf4cebb commit 9557596

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

.github/workflows/phpunits.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
matrix:
2121
php-versions: [8.1, 8.2, 8.3]
22-
stability: [prefer-lowest, prefer-stable]
22+
laravel-versions: [^10.0, ^11.0]
2323
databases: [testing, pgsql, mysql, mariadb]
2424
caches: [array, redis, memcached, database]
2525
locks: [redis, memcached]
@@ -116,7 +116,7 @@ jobs:
116116
117117
- name: Install dependencies
118118
id: composer-dependencies
119-
run: composer update --${{ matrix.stability }} --prefer-dist --no-progress
119+
run: composer req --dev laravel/framework:${{ matrix.laravel-versions }} -W || composer install
120120

121121
- name: Check codeclimate
122122
id: codeclimate-check

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"wallet",
1313
"payments"
1414
],
15-
"minimum-stability": "stable",
15+
"minimum-stability": "dev",
16+
"prefer-stable": true,
1617
"homepage": "https://bavix.github.io/laravel-wallet/",
1718
"license": "MIT",
1819
"authors": [

tests/Infra/TestCase.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,13 @@ final protected function getEnvironmentSetUp($app): void
6464
$config->set('database.connections.pgsql.prefix', 'tests');
6565
$config->set('database.connections.mysql.prefix', 'tests');
6666

67-
/** @var array<string, mixed> $mysql */
68-
$mysql = $config->get('database.connections.mysql');
69-
$config->set('database.connections.mariadb', array_merge($mysql, [
70-
'port' => 3307,
71-
]));
67+
if (! $config->has('database.connections.mariadb')) {
68+
/** @var array<string, mixed> $mysql */
69+
$mysql = $config->get('database.connections.mysql');
70+
$config->set('database.connections.mariadb', $mysql);
71+
}
72+
73+
$config->set('database.connections.mariadb.port', 3307);
7274

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

0 commit comments

Comments
 (0)