From c2668cbbba0b14fe11982c187856be9c5f2e85a0 Mon Sep 17 00:00:00 2001 From: Pascal Baljet Date: Tue, 2 Jan 2024 12:06:24 +0100 Subject: [PATCH] Support for PHP 8.3. Dropped support for Laravel 9 --- .github/workflows/run-tests.yml | 6 ++---- README.md | 4 ++-- composer.json | 15 +++++++-------- phpunit.xml.dist | 20 +------------------- tests/UsesMinIOServerTest.php | 3 ++- 5 files changed, 14 insertions(+), 34 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index cba9cc5..a331041 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,14 +13,12 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest] - php: [8.1, 8.2] - laravel: [9.*, 10.*] + php: [8.1, 8.2, 8.3] + laravel: [10.*] stability: [prefer-lowest, prefer-stable] include: - laravel: 10.* testbench: 8.* - - laravel: 9.* - testbench: 7.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/README.md b/README.md index 7c17450..2b78e7b 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,8 @@ It's the *magic* of Inertia.js with the *simplicity* of Blade. [Splade](https:// * Updates and restores the `.env` file. * Works with [Laravel Dusk](https://laravel.com/docs/9.x/dusk). * Works on [GitHub Actions](#github-actions) -* Compatible with Laravel 9.0. -* PHP 8.0 or higher is required. +* Compatible with Laravel 10. +* PHP 8.1 or higher is required. ## Installation diff --git a/composer.json b/composer.json index 7003900..0f2e954 100644 --- a/composer.json +++ b/composer.json @@ -16,19 +16,18 @@ } ], "require": { - "php": "^8.1|^8.2", + "php": "^8.1|^8.2|^8.3", "guzzlehttp/guzzle": "^7.4", - "illuminate/contracts": "^9.0|^10.0", + "illuminate/contracts": "^10.0", "spatie/laravel-package-tools": "^1.9.2", "spatie/temporary-directory": "^2.1" }, "require-dev": { - "nesbot/carbon": "^2.66", - "nunomaduro/collision": "^6.0", - "orchestra/testbench": "^7.0|^8.0", - "pestphp/pest": "^1.21", - "pestphp/pest-plugin-laravel": "^1.1", - "phpunit/phpunit": "^9.5" + "nunomaduro/collision": "^7.0", + "orchestra/testbench": "^8.0", + "pestphp/pest": "^2.0", + "pestphp/pest-plugin-laravel": "^2.0", + "phpunit/phpunit": "^10.4" }, "autoload": { "psr-4": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index f0117d9..6f72a1d 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -3,12 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd" backupGlobals="false" - backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" - convertErrorsToExceptions="true" - convertNoticesToExceptions="true" - convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" executionOrder="random" @@ -16,24 +12,10 @@ failOnRisky="true" failOnEmptyTestSuite="true" beStrictAboutOutputDuringTests="true" - verbose="true" > tests - - - ./src - - - - - - - - - - - + \ No newline at end of file diff --git a/tests/UsesMinIOServerTest.php b/tests/UsesMinIOServerTest.php index 41252ac..d4f9aa7 100644 --- a/tests/UsesMinIOServerTest.php +++ b/tests/UsesMinIOServerTest.php @@ -3,6 +3,7 @@ use Illuminate\Foundation\Testing\TestCase; use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Http; +use Illuminate\Support\Str; use Orchestra\Testbench\Concerns\CreatesApplication; use ProtoneMedia\LaravelMinioTestingTools\UsesMinIOServer; @@ -19,7 +20,7 @@ class DummyTestCase extends TestCase Artisan::call('config:clear'); - $this->testCase = new DummyTestCase; + $this->testCase = new DummyTestCase(Str::random()); }); it('returns the configured port', function () {