From 768d7e6026fce57d6f3f3feea4b3e333e334ed1f Mon Sep 17 00:00:00 2001 From: Nik Date: Sun, 23 Apr 2023 13:06:19 +0200 Subject: [PATCH 1/3] Laravel 10 support --- .github/workflows/run-tests.yml | 7 ++++- .gitignore | 1 + composer.json | 8 +++--- phpunit.xml.dist | 50 ++++++++++++++------------------- phpunit.xml.dist.bak | 31 ++++++++++++++++++++ 5 files changed, 63 insertions(+), 34 deletions(-) create mode 100644 phpunit.xml.dist.bak diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index fc39a5d..e9ec2f8 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -11,13 +11,18 @@ jobs: matrix: os: [ubuntu-latest] php: [8.1, 8.0] - laravel: [9.*, 8.*] + laravel: [10.*, 9.*, 8.*] dependency-version: [prefer-stable] include: + - laravel: 10.* + testbench: 8.* - laravel: 9.* testbench: 7.* - laravel: 8.* testbench: 6.* + exclude: + - laravel: 10.* + php: 8.0 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} diff --git a/.gitignore b/.gitignore index 531e03f..f2be032 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .php_cs .php_cs.cache .phpunit.result.cache +.phpunit.cache .php-cs-fixer.cache build composer.lock diff --git a/composer.json b/composer.json index 511e37c..55d2175 100644 --- a/composer.json +++ b/composer.json @@ -12,13 +12,13 @@ "require": { "php": "^8.0", "guzzlehttp/guzzle": "^7.0.1", - "illuminate/contracts": "^8.0|^9.0", + "illuminate/contracts": "^8.0|^9.0|^10.0", "ext-json": "*", "ext-openssl": "*" }, "require-dev": { - "orchestra/testbench": "^6.0", - "phpunit/phpunit": "^9.3" + "orchestra/testbench": "^6.0|^8.0", + "phpunit/phpunit": "^9.3|^10.0" }, "autoload": { "psr-4": { @@ -47,6 +47,6 @@ } } }, - "minimum-stability": "dev", + "minimum-stability": "stable", "prefer-stable": true } diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 73dd7dc..1396279 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,31 +1,23 @@ - - - - tests - - - - - ./src - - - - - - - - - - + + + + tests + + + + + + + + + + + + + + + ./src + + diff --git a/phpunit.xml.dist.bak b/phpunit.xml.dist.bak new file mode 100644 index 0000000..73dd7dc --- /dev/null +++ b/phpunit.xml.dist.bak @@ -0,0 +1,31 @@ + + + + + tests + + + + + ./src + + + + + + + + + + + From a4f994077292d72f43ec5ffeadd31bcbb32d316a Mon Sep 17 00:00:00 2001 From: Nik Date: Sun, 23 Apr 2023 13:16:04 +0200 Subject: [PATCH 2/3] PHP 8.2 test exclusions --- .github/workflows/run-tests.yml | 8 +++++++- phpunit.xml.dist | 11 ++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index e9ec2f8..6582aba 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -10,7 +10,7 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest] - php: [8.1, 8.0] + php: [8.2, 8.1, 8.0] laravel: [10.*, 9.*, 8.*] dependency-version: [prefer-stable] include: @@ -23,6 +23,12 @@ jobs: exclude: - laravel: 10.* php: 8.0 + exclude: + - laravel: 9.* + php: 8.2 + exclude: + - laravel: 8.* + php: 8.2 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 1396279..b0ed98a 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,5 +1,14 @@ - + tests From 43ec068f04e83ff9494cc78ee484807d68ed43a2 Mon Sep 17 00:00:00 2001 From: Nik Date: Sun, 23 Apr 2023 13:17:39 +0200 Subject: [PATCH 3/3] Job exclude syntax --- .github/workflows/run-tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 6582aba..a5c4b3d 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -23,10 +23,8 @@ jobs: exclude: - laravel: 10.* php: 8.0 - exclude: - laravel: 9.* php: 8.2 - exclude: - laravel: 8.* php: 8.2