Skip to content

Commit 70e2bce

Browse files
authored
Merge pull request #50 from worksome/feature/laravel-11
chore(deps): add support for Laravel 11
2 parents 108ac6a + 137d986 commit 70e2bce

File tree

4 files changed

+24
-23
lines changed

4 files changed

+24
-23
lines changed
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: dependabot-auto-merge
1+
name: Dependabot Auto-Merge
22
on: pull_request_target
33

44
permissions:
@@ -10,23 +10,23 @@ jobs:
1010
runs-on: ubuntu-latest
1111
if: ${{ github.actor == 'dependabot[bot]' }}
1212
steps:
13-
13+
1414
- name: Dependabot metadata
1515
id: metadata
16-
uses: dependabot/fetch-metadata@v1.3.4
16+
uses: dependabot/fetch-metadata@v1
1717
with:
1818
github-token: "${{ secrets.GITHUB_TOKEN }}"
19-
19+
2020
- name: Auto-merge Dependabot PRs for semver-minor updates
21-
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
21+
if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-minor' }}
2222
run: gh pr merge --auto --merge "$PR_URL"
2323
env:
24-
PR_URL: ${{github.event.pull_request.html_url}}
25-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
26-
24+
PR_URL: ${{ github.event.pull_request.html_url }}
25+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26+
2727
- name: Auto-merge Dependabot PRs for semver-patch updates
28-
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
28+
if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' }}
2929
run: gh pr merge --auto --merge "$PR_URL"
3030
env:
31-
PR_URL: ${{github.event.pull_request.html_url}}
32-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
31+
PR_URL: ${{ github.event.pull_request.html_url }}
32+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/phpstan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: phpstan
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515

1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2

.github/workflows/run-tests.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: run-tests
1+
name: Tests
22

33
on:
44
push:
@@ -13,21 +13,22 @@ jobs:
1313
PREVENT_OUTPUT: true
1414
strategy:
1515
fail-fast: true
16-
max-parallel: 1
1716
matrix:
1817
os: [ubuntu-latest, windows-latest]
1918
php: [8.2, 8.3]
20-
laravel: [10.*]
19+
laravel: [10.*, 11.*]
2120
stability: [prefer-lowest, prefer-stable]
2221
include:
2322
- laravel: 10.*
2423
testbench: 8.*
24+
- laravel: 11.*
25+
testbench: 9.*
2526

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

2829
steps:
2930
- name: Checkout code
30-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3132

3233
- name: Setup PHP
3334
uses: shivammathur/setup-php@v2
@@ -43,8 +44,8 @@ jobs:
4344
4445
- name: Install dependencies
4546
run: |
46-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
47-
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
47+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --ansi
48+
composer update --${{ matrix.stability }} --prefer-dist --no-interaction --ansi
4849
4950
- name: Execute tests
5051
run: composer test:unit

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
],
1818
"require": {
1919
"php": "^8.2",
20-
"illuminate/contracts": "^10.0"
20+
"illuminate/contracts": "^10.0 || ^11.0"
2121
},
2222
"require-dev": {
2323
"larastan/larastan": "^2.8",
24-
"nunomaduro/collision": "^7.0",
25-
"orchestra/testbench": "^8.0",
26-
"pestphp/pest": "^2.0",
27-
"pestphp/pest-plugin-laravel": "^2.0",
24+
"nunomaduro/collision": "^7.0 || ^8.0",
25+
"orchestra/testbench": "^8.20 || ^9.0",
26+
"pestphp/pest": "^2.30",
27+
"pestphp/pest-plugin-laravel": "^2.2",
2828
"worksome/coding-style": "^2.7"
2929
},
3030
"autoload": {

0 commit comments

Comments
 (0)