Skip to content

Commit d6df786

Browse files
Merge pull request #40 from duncanmcclean/laravel-12
Supports Laravel 12
2 parents cc0c377 + c32393d commit d6df786

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

.github/workflows/tests.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
php: [8.1, 8.2, 8.3]
17-
laravel: [9.*, 10.*, 11.*]
16+
php: [8.2, 8.3, 8.4]
17+
laravel: [10.*, 11.*, 12.*]
1818
stability: [prefer-lowest, prefer-stable]
1919
os: [ubuntu-latest]
2020
exclude:
21-
- laravel: 11.*
22-
php: 8.1
21+
- laravel: 10.*
22+
php: 8.4
23+
- laravel: 12.*
24+
php: 8.2
2325

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

@@ -40,14 +42,6 @@ jobs:
4042
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
4143
coverage: none
4244

43-
- name: Set PHP 8 Mockery
44-
uses: nick-invision/retry@v3
45-
with:
46-
timeout_minutes: 5
47-
max_attempts: 5
48-
command: composer require "mockery/mockery >=1.3.3" --no-interaction --no-update
49-
if: matrix.php >= 8.0
50-
5145
- name: Install dependencies
5246
uses: nick-invision/retry@v3
5347
with:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ Thumbs.db
66
/phpunit.xml
77
/.idea
88
/.vscode
9-
.phpunit.result.cache
9+
.phpunit.cache
1010
phpunit.xml

composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@
1212
}
1313
},
1414
"require": {
15-
"php": "^8.1.0",
16-
"laravel/framework": "^9.36 || ^10.0 || ^11.0"
15+
"php": "^8.2.0",
16+
"laravel/framework": "^10.0 || ^11.0 || ^12.0"
1717
},
1818
"require-dev": {
19-
"orchestra/testbench": "*",
19+
"orchestra/testbench": "^8.14 || ^9.2 || ^10.0",
2020
"laravel/pint": "^1.4",
2121
"brianium/paratest": "*",
22-
"pestphp/pest": "^2"
22+
"pestphp/pest": "^3.7.3",
23+
"mockery/mockery": ">=1.3.3"
2324
},
2425
"minimum-stability": "dev",
2526
"prefer-stable": true,

0 commit comments

Comments
 (0)