Skip to content

Commit 63e5bb8

Browse files
authored
Merge pull request #140 from laravel-shift/l12-compatibility
Laravel 12.x Compatibility
2 parents a6a2d6b + cf70a89 commit 63e5bb8

File tree

4 files changed

+24
-12
lines changed

4 files changed

+24
-12
lines changed

.github/workflows/duster-lint.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
14+
with:
15+
ref: ${{ github.event.pull_request.head.ref }}
16+
repository: ${{ github.event.pull_request.head.repo.full_name }}
1417
- name: "Duster Lint"
15-
uses: tighten/duster-action@v2
18+
uses: tighten/duster-action@v3
1619
with:
1720
args: lint

.github/workflows/tests.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
name: Tests
22

3-
on: [push, pull_request]
3+
on:
4+
- push
5+
- pull_request
46

57
jobs:
68
test:
79
runs-on: ubuntu-latest
10+
811
strategy:
912
fail-fast: true
1013
matrix:
1114
php: [8.0, 8.1, 8.2, 8.3]
12-
laravel: [9.*, 10.*, 11.*]
15+
laravel: ['9.*', '10.*', '11.*', '12.*']
1316
dependency-version: [prefer-stable]
1417
include:
1518
- laravel: 9.*
@@ -18,6 +21,8 @@ jobs:
1821
testbench: 8.*
1922
- laravel: 11.*
2023
testbench: 9.*
24+
- laravel: 12.*
25+
testbench: 10.*
2126
exclude:
2227
- laravel: 9.*
2328
php: 8.3
@@ -27,16 +32,19 @@ jobs:
2732
php: 8.0
2833
- laravel: 11.*
2934
php: 8.1
35+
- laravel: 12.*
36+
php: 8.0
37+
- laravel: 12.*
38+
php: 8.1
3039

3140
name: PHP ${{ matrix.php }} - LARAVEL ${{ matrix.laravel }} - ${{ matrix.dependency-version }}
3241

3342
steps:
34-
3543
- name: Checkout Code
3644
uses: actions/checkout@v2
3745

3846
- name: Cache Dependencies
39-
uses: actions/cache@v2
47+
uses: actions/cache@v3
4048
with:
4149
path: ~/.composer/cache/files
4250
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
@@ -53,5 +61,6 @@ jobs:
5361
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "symfony/console:>=4.3.4" --no-interaction --no-update
5462
composer remove "tightenco/duster" --dev --no-interaction --no-update
5563
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
64+
5665
- name: Execute Tests
5766
run: ./vendor/bin/phpunit --testdox

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
],
1919
"require": {
2020
"php": "^8.0",
21-
"illuminate/database": "^9.0||^10.0||^11.0",
22-
"illuminate/events": "^9.0||^10.0||^11.0"
21+
"illuminate/database": "^9.0||^10.0||^11.0||^12.0",
22+
"illuminate/events": "^9.0||^10.0||^11.0||^12.0"
2323
},
2424
"require-dev": {
25-
"orchestra/testbench": "^7.0||^8.0||^9.0",
26-
"phpunit/phpunit": "^9.5.10||^10.5",
27-
"tightenco/duster": "^2.7"
25+
"orchestra/testbench": "^7.0||^8.0||^9.0||^10.0",
26+
"phpunit/phpunit": "^9.5.10||^10.5||^11.5.3",
27+
"tightenco/duster": "^3.1"
2828
},
2929
"autoload": {
3030
"psr-4": {

tests/TestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
class TestCase extends BaseTestCase
1010
{
11-
public function setUp(): void
11+
protected function setUp(): void
1212
{
1313
parent::setUp();
1414

0 commit comments

Comments
 (0)