Skip to content

Commit

Permalink
feat: Laravel 11.x Compatibility (#67)
Browse files Browse the repository at this point in the history
* Allow Laravel 11

* Allow Carbon v3

* Skip PHP 8.1 for Laravel 11

* Use testbench 9.x for Laravel 11

* Allow phpunit ^10.5

* Allow pest v2

* Allow pest v2

* Use stable tag for testbench

* Skip test requiring doctrine/dbal on laravel versions less than 10

* Don't rely on container for Framework version

* Update composer.json

* Update composer.json

---------

Co-authored-by: Ralph J. Smit <[email protected]>
  • Loading branch information
PascaleBeier and ralphjsmit authored Mar 14, 2024
1 parent 3a25c87 commit 382bebd
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 14 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,19 @@ jobs:
fail-fast: true
matrix:
os: [ ubuntu-latest ]
php: [ 8.1, 8.2 ]
laravel: [ 9.*, 10.* ]
php: [ 8.1, 8.2, 8.3 ]
laravel: [ 9.*, 10.*, 11.* ]
stability: [ prefer-lowest, prefer-stable ]
include:
- laravel: 9.*
testbench: ^7.0
- laravel: 10.*
testbench: ^8.0
- laravel: 11.*
testbench: ^9.0
exclude:
- php: 8.1
laravel: 11.*

name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}

Expand Down
22 changes: 11 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@
}
],
"require" : {
"php" : "^8.0",
"illuminate/contracts" : "^9.0|^10.0",
"ralphjsmit/laravel-helpers" : "^1.5",
"spatie/laravel-package-tools" : "^1.9.2"
"php": "^8.0",
"illuminate/contracts": "^9.0|^10.0|^11.0",
"ralphjsmit/laravel-helpers": "^1.9",
"spatie/laravel-package-tools": "^1.9.2"
},
"require-dev" : {
"nesbot/carbon" : "^2.66",
"nunomaduro/collision" : "^5.10|^6.0",
"orchestra/testbench" : "^7.0|^8.0",
"pestphp/pest" : "^1.21",
"pestphp/pest-plugin-laravel" : "^1.1",
"phpunit/phpunit" : "^9.5",
"nesbot/carbon" : "^2.66|^3.0",
"nunomaduro/collision" : "^5.10|^6.0|^7.0|^8.0",
"orchestra/testbench" : "^7.0|^8.0|^9.0",
"pestphp/pest" : "^1.21|^2.0",
"pestphp/pest-plugin-laravel" : "^1.1|^2.0",
"phpunit/phpunit" : "^9.5|^10.5",
"spatie/laravel-ray" : "^1.26",
"spatie/pest-plugin-test-time" : "^1.0"
"spatie/pest-plugin-test-time" : "^1.0|^2.0"
},
"autoload" : {
"psr-4" : {
Expand Down
2 changes: 1 addition & 1 deletion tests/Feature/Tags/CanonicalTagTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@

get(route('seo.test-page', ['page' => $page]))
->assertOk();
});
})->skip(version_compare(Illuminate\Foundation\Application::VERSION, '10', 'lt'));

0 comments on commit 382bebd

Please sign in to comment.