From fc75bdd6512d6d0ccdeb4b1562b15089a61b5d4f Mon Sep 17 00:00:00 2001 From: Maxim Babichev <maksim.babichev95@gmail.com> Date: Tue, 12 Mar 2024 19:12:48 +0300 Subject: [PATCH 1/6] update minimum-stability --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 23360fce2..27a3253ba 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,8 @@ "wallet", "payments" ], - "minimum-stability": "stable", + "minimum-stability": "dev", + "prefer-stable": true, "homepage": "https://bavix.github.io/laravel-wallet/", "license": "MIT", "authors": [ From b8f5a430b71a9456bfeac13eb6266ae3c31fbdff Mon Sep 17 00:00:00 2001 From: Maxim Babichev <maksim.babichev95@gmail.com> Date: Tue, 12 Mar 2024 19:29:01 +0300 Subject: [PATCH 2/6] fix mariadb --- tests/Infra/TestCase.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/Infra/TestCase.php b/tests/Infra/TestCase.php index b1c5f91d6..f7a1aa364 100644 --- a/tests/Infra/TestCase.php +++ b/tests/Infra/TestCase.php @@ -64,11 +64,13 @@ final protected function getEnvironmentSetUp($app): void $config->set('database.connections.pgsql.prefix', 'tests'); $config->set('database.connections.mysql.prefix', 'tests'); - /** @var array<string, mixed> $mysql */ - $mysql = $config->get('database.connections.mysql'); - $config->set('database.connections.mariadb', array_merge($mysql, [ - 'port' => 3307, - ])); + if (!$config->has('database.connections.mariadb')) { + /** @var array<string, mixed> $mysql */ + $mysql = $config->get('database.connections.mysql'); + $config->set('database.connections.mariadb', $mysql); + } + + $config->set('database.connections.mariadb.port', 3307); // new table name's $config->set('wallet.transaction.table', 'transaction'); From c5d473bcce4a6de3e282c729625fcdd75d98f105 Mon Sep 17 00:00:00 2001 From: Github bot <bot@babichev.net> Date: Tue, 12 Mar 2024 16:30:57 +0000 Subject: [PATCH 3/6] autofix --- tests/Infra/TestCase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Infra/TestCase.php b/tests/Infra/TestCase.php index f7a1aa364..cf74a8a63 100644 --- a/tests/Infra/TestCase.php +++ b/tests/Infra/TestCase.php @@ -64,7 +64,7 @@ final protected function getEnvironmentSetUp($app): void $config->set('database.connections.pgsql.prefix', 'tests'); $config->set('database.connections.mysql.prefix', 'tests'); - if (!$config->has('database.connections.mariadb')) { + if (! $config->has('database.connections.mariadb')) { /** @var array<string, mixed> $mysql */ $mysql = $config->get('database.connections.mysql'); $config->set('database.connections.mariadb', $mysql); From d961ec972837a1ff7ee27752f051b0c8d06970d1 Mon Sep 17 00:00:00 2001 From: Maxim Babichev <maksim.babichev95@gmail.com> Date: Tue, 12 Mar 2024 19:43:42 +0300 Subject: [PATCH 4/6] laravel/framework:* --- .github/workflows/phpunits.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/phpunits.yaml b/.github/workflows/phpunits.yaml index 175fc3025..46e6a3073 100644 --- a/.github/workflows/phpunits.yaml +++ b/.github/workflows/phpunits.yaml @@ -19,7 +19,7 @@ jobs: strategy: matrix: php-versions: [8.1, 8.2, 8.3] - stability: [prefer-lowest, prefer-stable] + laravel-versions: [^10.0, ^11.0] databases: [testing, pgsql, mysql, mariadb] caches: [array, redis, memcached, database] locks: [redis, memcached] @@ -115,8 +115,8 @@ jobs: ${{ runner.os }}-php- - name: Install dependencies - id: composer-dependencies - run: composer update --${{ matrix.stability }} --prefer-dist --no-progress + id: Install dependencies + run: composer req --dev laravel/framework:${{ matrix.laravel-versions }} -W - name: Check codeclimate id: codeclimate-check From 63863e3776708e6f3a41ab783aa25a12483214c4 Mon Sep 17 00:00:00 2001 From: Maxim Babichev <maksim.babichev95@gmail.com> Date: Tue, 12 Mar 2024 19:48:03 +0300 Subject: [PATCH 5/6] 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 46e6a3073..0bae0caad 100644 --- a/.github/workflows/phpunits.yaml +++ b/.github/workflows/phpunits.yaml @@ -115,7 +115,7 @@ jobs: ${{ runner.os }}-php- - name: Install dependencies - id: Install dependencies + id: composer-dependencies run: composer req --dev laravel/framework:${{ matrix.laravel-versions }} -W - name: Check codeclimate From bf4cebb6fdaeabff444beb7203cadd1e4ba785f5 Mon Sep 17 00:00:00 2001 From: Maxim Babichev <maksim.babichev95@gmail.com> Date: Tue, 12 Mar 2024 20:00:57 +0300 Subject: [PATCH 6/6] 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 0bae0caad..dc2ab672d 100644 --- a/.github/workflows/phpunits.yaml +++ b/.github/workflows/phpunits.yaml @@ -116,7 +116,7 @@ jobs: - name: Install dependencies id: composer-dependencies - run: composer req --dev laravel/framework:${{ matrix.laravel-versions }} -W + run: composer req --dev laravel/framework:${{ matrix.laravel-versions }} -W || composer install - name: Check codeclimate id: codeclimate-check