From 1b1efef421366df8e163718e20c4f936cee15b1b Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Wed, 13 Mar 2024 12:00:41 +0300 Subject: [PATCH 1/2] Added Laravel 11 support --- .github/workflows/phpunit.yml | 10 ++++++++-- composer.json | 16 ++++++++-------- package.json | 4 ++-- phpunit.xml | 4 ++-- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 039cb69f..5f280af5 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -10,7 +10,7 @@ jobs: fail-fast: true matrix: php: [ "8.0", "8.1", "8.2", "8.3" ] - laravel: [ "7.0", "8.0", "9.0", "10.0" ] + laravel: [ "7.0", "8.0", "9.0", "10.0", "11.0" ] exclude: - laravel: "7.0" php: "8.1" @@ -30,6 +30,12 @@ jobs: - laravel: "10.0" php: "8.0" + - laravel: "11.0" + php: "8.0" + + - laravel: "11.0" + php: "8.1" + name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }} steps: @@ -41,7 +47,7 @@ jobs: with: php-version: ${{ matrix.php }} extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv - coverage: none + coverage: xdebug - name: Install dependencies run: composer require --dev laravel/framework:^${{ matrix.laravel }} diff --git a/composer.json b/composer.json index b1ab7741..0f052814 100644 --- a/composer.json +++ b/composer.json @@ -45,17 +45,17 @@ "dragon-code/laravel-support": "^3.5", "dragon-code/simple-dto": "^2.5.1", "dragon-code/support": "^6.6", - "illuminate/console": "^7.30.6 || ^8.75 || ^9.0 || ^10.0", - "illuminate/container": "^7.30.6 || ^8.75 || ^9.0 || ^10.0", - "illuminate/database": "^7.30.6 || ^8.75 || ^9.0 || ^10.0", - "illuminate/support": "^7.30.6 || ^8.75 || ^9.0 || ^10.0", - "symfony/console": "^5.3 || ^6.0" + "illuminate/console": "^7.30.6 || ^8.75 || ^9.0 || ^10.0 || ^11.0", + "illuminate/container": "^7.30.6 || ^8.75 || ^9.0 || ^10.0 || ^11.0", + "illuminate/database": "^7.30.6 || ^8.75 || ^9.0 || ^10.0 || ^11.0", + "illuminate/support": "^7.30.6 || ^8.75 || ^9.0 || ^10.0 || ^11.0", + "symfony/console": "^5.3 || ^6.0 || ^7.0" }, "require-dev": { "mockery/mockery": "^1.3.1", - "nesbot/carbon": "^2.62.1", - "orchestra/testbench": "^5.20 || ^6.25 || ^7.9 || ^8.0", - "phpunit/phpunit": "^9.6", + "nesbot/carbon": "^2.62.1 || ^3.0", + "orchestra/testbench": "^5.20 || ^6.25 || ^7.9 || ^8.0 || ^9.0", + "phpunit/phpunit": "^9.6 || ^10.0", "ramsey/uuid": "^3.7 || ^4.0" }, "conflict": { diff --git a/package.json b/package.json index fcaffb55..8bb7a47a 100644 --- a/package.json +++ b/package.json @@ -17,10 +17,10 @@ "url": "git+ssh://git@github.com/TheDragonCode/laravel-actions.git" }, "devDependencies": { - "@vuepress/plugin-theme-data": "2.0.0-beta.54", + "@vuepress/plugin-theme-data": "2.0.0-rc.8", "@vueuse/core": "^7.5.5", "dotenv": "^15.0.0", - "vuepress": "2.0.0-beta.54" + "vuepress": "2.0.0-rc.8" }, "engines": { "node": ">=16.16" diff --git a/phpunit.xml b/phpunit.xml index 52a592d2..18a89d0e 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -7,8 +7,8 @@ bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" - convertNoticesToExceptions="true" - convertWarningsToExceptions="true" + convertNoticesToExceptions="false" + convertWarningsToExceptions="false" processIsolation="false" stopOnError="false" stopOnFailure="false" From f33675defa7997c133f7c68d6201df4000e41860 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Fri, 15 Mar 2024 02:04:12 +0300 Subject: [PATCH 2/2] Fixed tests initialization --- tests/Concerns/Database.php | 1 - tests/TestCase.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/Concerns/Database.php b/tests/Concerns/Database.php index 24de59fb..84441f89 100644 --- a/tests/Concerns/Database.php +++ b/tests/Concerns/Database.php @@ -24,7 +24,6 @@ protected function setDatabase($app): void protected function freshDatabase(): void { - $this->refreshDatabase(); $this->loadMigrations(); $this->artisan('migrate')->run(); diff --git a/tests/TestCase.php b/tests/TestCase.php index a2a6a242..a2c44469 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -35,7 +35,7 @@ protected function getPackageProviders($app): array return [ServiceProvider::class]; } - protected function getEnvironmentSetUp($app) + protected function getEnvironmentSetUp($app): void { parent::getEnvironmentSetUp($app);