Skip to content

Commit

Permalink
Merge pull request #39 from worksome/feature/laravel-11
Browse files Browse the repository at this point in the history
feat: add support for Laravel 11
  • Loading branch information
owenvoke committed Feb 8, 2024
2 parents 640b465 + baf0561 commit 2468219
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: phpstan
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -22,7 +22,7 @@ jobs:

- name: Install composer dependencies
run: |
composer require "nunomaduro/larastan:^2.0"
composer require "larastan/larastan:^2.6"
composer update --prefer-dist --no-interaction
- name: Run PHPStan
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,20 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest, windows-latest]
php: [8.2]
laravel: [10.*]
php: [8.2, 8.3]
laravel: [10.*, 11.*]
stability: [prefer-stable]
include:
- laravel: 10.*
testbench: 8.*
- laravel: 11.*
testbench: 9.*

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

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@
],
"require": {
"php": "^8.2",
"illuminate/contracts": "^10.0",
"illuminate/contracts": "^10.0 || ^11.0",
"nikic/php-parser": "^4.15",
"nunomaduro/termwind": "^1.15",
"spatie/laravel-package-tools": "^1.14.1",
"nunomaduro/termwind": "^1.15 || ^2.0",
"spatie/laravel-package-tools": "^1.16",
"thecodingmachine/safe": "^2.4"
},
"require-dev": {
"nunomaduro/collision": "^7.0",
"nunomaduro/larastan": "^2.4.0",
"orchestra/testbench": "^8.0",
"pestphp/pest": "^2.0",
"pestphp/pest-plugin-laravel": "^2.0",
"worksome/coding-style": "^2.3.2"
"nunomaduro/collision": "^7.0 || ^8.1",
"larastan/larastan": "^2.6",
"orchestra/testbench": "^8.0 || ^9.0",
"pestphp/pest": "^2.33",
"pestphp/pest-plugin-laravel": "^2.2",
"worksome/coding-style": "^2.8"
},
"autoload": {
"psr-4": {
Expand Down
16 changes: 16 additions & 0 deletions phpstan-baseline.neon
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
parameters:
ignoreErrors:
-
message: "#^Parameter \\#1 \\$value of function strval expects bool\\|float\\|int\\|resource\\|string\\|null, array\\|string given\\.$#"
count: 1
path: src/Commands/PruneCommand.php

-
message: "#^Parameter \\#1 \\$value of function strval expects bool\\|float\\|int\\|resource\\|string\\|null, array\\|string given\\.$#"
count: 1
path: src/Commands/SyncCommand.php

-
message: "#^Parameter \\#1 \\$value of function strval expects bool\\|float\\|int\\|resource\\|string\\|null, mixed given\\.$#"
count: 1
path: src/Support/PhpParser/EnvCallNodeVisitor.php
4 changes: 2 additions & 2 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<directory>tests</directory>
</testsuite>
</testsuites>
<coverage>
<source>
<include>
<directory suffix=".php">src</directory>
</include>
</coverage>
</source>
</phpunit>
9 changes: 0 additions & 9 deletions renovate.json

This file was deleted.

0 comments on commit 2468219

Please sign in to comment.