From cf9f9b82364e315b1ab6147476c92f1c0be99de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Tue, 27 Feb 2024 12:35:51 +0100 Subject: [PATCH 1/4] Fix laravel workflow --- .github/workflows/laravel.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml index 384a04f..66f03b8 100644 --- a/.github/workflows/laravel.yml +++ b/.github/workflows/laravel.yml @@ -8,17 +8,21 @@ on: jobs: laravel: - + strategy: + fail-fast: false + matrix: + php-version: + - "8.0" + - "8.1" runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Install Dependencies - run: composer install --no-ansi --no-interaction --no-scripts --prefer-dist + - uses: actions/checkout@v4 - name: Setup PHP, with composer and extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: ${{ matrix.php-version }} extensions: mbstring, dom, fileinfo + - name: Install Dependencies + run: composer update --no-ansi --no-interaction --no-scripts --prefer-dist - name: Run Test run: vendor/bin/phpunit From e261bd3e03a7b5b4a9ed4ff13461eb4886214825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Tue, 27 Feb 2024 12:40:16 +0100 Subject: [PATCH 2/4] Allow laravel/laravel v9 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0445d0f..0ba6a00 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "illuminate/filesystem": "^9.0 || ^10.0" }, "require-dev": { - "laravel/laravel": "^10.0", + "laravel/laravel": "^9.0 || ^10.0", "phpunit/phpunit": "^10.0" }, "scripts": { From 6af871a172669b20565b2bfaddaec5d153536202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Tue, 27 Feb 2024 12:42:57 +0100 Subject: [PATCH 3/4] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 0ba6a00..d2a68c9 100644 --- a/composer.json +++ b/composer.json @@ -28,8 +28,8 @@ "illuminate/filesystem": "^9.0 || ^10.0" }, "require-dev": { - "laravel/laravel": "^9.0 || ^10.0", - "phpunit/phpunit": "^10.0" + "laravel/laravel": "^9.5 || ^10.0", + "phpunit/phpunit": "^9.6 || ^10.0" }, "scripts": { "test": "vendor/bin/phpunit" From e5d0486107bd42bd5fd7a6adf2601fb32c208451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Tue, 27 Feb 2024 12:50:50 +0100 Subject: [PATCH 4/4] Update TestCase.php --- tests/TestCase.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/TestCase.php b/tests/TestCase.php index 0ef6fd4..057f4df 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -27,7 +27,8 @@ public function setUp(): void Artisan::call('cache:clear'); Artisan::call('view:clear'); - Artisan::call('lang:publish'); + // app()->version(); Artisan::call('lang:publish'); + Artisan::call('vendor:publish --tag=lang'); View::addNamespace('i18n', __DIR__.'/views');