Skip to content

Commit a352fab

Browse files
authored
Merge pull request #7 from laravel-shift/l12-compatibility
Laravel 12.x Compatibility
2 parents de25e86 + c752b02 commit a352fab

File tree

2 files changed

+34
-33
lines changed

2 files changed

+34
-33
lines changed

.github/workflows/tests.yml

+31-30
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,46 @@
11
name: Tests
22

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

57
jobs:
68
ci:
79
runs-on: ${{ matrix.os }}
10+
811
strategy:
912
fail-fast: true
1013
matrix:
1114
os: [ubuntu-latest]
1215
php: [8.2, 8.3]
13-
laravel: [11.*, 10.*]
16+
laravel: ['10.*', '11.*', '12.*']
1417
dependency-version: [prefer-lowest, prefer-stable]
1518

1619
name: Tests P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
17-
steps:
1820

19-
- name: Checkout
20-
uses: actions/checkout@v2
21-
22-
- name: Cache dependencies
23-
uses: actions/cache@v1
24-
with:
25-
path: ~/.composer/cache/files
26-
key: dependencies-php-${{ matrix.php }}-L${{ matrix.laravel }}-${{ matrix.dependency-version }}-composer-${{ hashFiles('composer.json') }}
27-
28-
- name: Setup PHP
29-
uses: shivammathur/setup-php@v2
30-
with:
31-
php-version: ${{ matrix.php }}
32-
extensions: dom, mbstring, zip, pcntl
33-
coverage: none
34-
35-
- name: Require Laravel Version
36-
run: >
37-
composer require
38-
"laravel/framework:${{ matrix.laravel }}"
39-
--no-interaction --no-update
40-
41-
- name: Install Composer dependencies
42-
run: composer update --${{ matrix.dependency-version }} --no-interaction --prefer-dist
43-
44-
- name: Integration Tests
45-
run: php ./vendor/bin/pest
21+
steps:
22+
- name: Checkout
23+
uses: actions/checkout@v2
24+
25+
- name: Cache dependencies
26+
uses: actions/cache@v1
27+
with:
28+
path: ~/.composer/cache/files
29+
key: dependencies-php-${{ matrix.php }}-L${{ matrix.laravel }}-${{ matrix.dependency-version }}-composer-${{ hashFiles('composer.json') }}
30+
31+
- name: Setup PHP
32+
uses: shivammathur/setup-php@v2
33+
with:
34+
php-version: ${{ matrix.php }}
35+
extensions: dom, mbstring, zip, pcntl
36+
coverage: none
37+
38+
- name: Require Laravel Version
39+
run: |
40+
composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
41+
42+
- name: Install Composer dependencies
43+
run: composer update --${{ matrix.dependency-version }} --no-interaction --prefer-dist
44+
45+
- name: Integration Tests
46+
run: php ./vendor/bin/pest

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
"require": {
2323
"php": "^8.2.0",
2424
"ext-pcntl": "*",
25-
"laravel/framework": "^10.0|^11.0",
25+
"laravel/framework": "^10.0|^11.0|^12.0",
2626
"react/event-loop": "^1.5"
2727
},
2828
"require-dev": {
2929
"laravel/pint": "^1.15",
3030
"mockery/mockery": "^1.6",
31-
"pestphp/pest": "^2.34",
32-
"phpstan/phpstan": "^1.10"
31+
"pestphp/pest": "^2.34|^3.7",
32+
"phpstan/phpstan": "^1.10|^2.1"
3333
},
3434
"autoload": {
3535
"psr-4": {

0 commit comments

Comments
 (0)