Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added laravel 9 support #1297

Merged
merged 6 commits into from
Jan 13, 2022
Merged

added laravel 9 support #1297

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
66bf1eb
added laravel 9 support
Jan 13, 2022
44b9e45
added exclude directives to matrix
Jan 13, 2022
75a1bbb
fixed matrix
Jan 13, 2022
98f8ea4
Update composer.json
barryvdh Jan 13, 2022
9270b44
Update run-integration-tests.yml
barryvdh Jan 13, 2022
46a54cb
Update CHANGELOG.md
barryvdh Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/fix-code-style.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.0
coverage: none

- name: Install dependencies
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/run-integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@ jobs:
strategy:
matrix:
php: [8.1, 8.0, 7.4, 7.3]
laravel: [8.*]
laravel: [8.*, 9.*]
rcerljenko marked this conversation as resolved.
Show resolved Hide resolved
exclude:
- php: [7.4, 7.3]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The matrix still generates jobs for PHP 7.4 and Laravel 9, see https://github.com/barryvdh/laravel-ide-helper/actions/runs/1692091626

Maybe the […, …] is not supported and you've to manually list each?

- php 7.3
  laravel: 9.*
- php 7.4
  laravel: 9.*

Just a guess though

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok i've updated matrix to suggested syntax.. sorry it's my first time with github actions syntax

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

np!

yeah it can be a PITA, also since you're first time contributor, we've to manually enabled running the workflows everytime 😅 (I just did, let's wait for the result)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're one step further, next problem: orchestra/benchmark also needs to have adapted version constraints, see https://github.com/barryvdh/laravel-ide-helper/runs/4803289512?check_suite_focus=true#step:5:20

I see they have not yet made a new 7.* release at https://github.com/orchestral/testbench-core but their branch is also updated. Maybe we can use dev-master there or we need to wait.

FTR: If you feel overwhelmed / frustrated, don't be: I can take it from here later if you want.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mfn if it's not a problem please take it from here because i don't wan't to break something... thx for the support! :)

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's wait for the 9.x release to run the ingration tests.

laravel: 9.*
name: P${{ matrix.php }} - Laravel${{ matrix.laravel }}
steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-static-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.0
coverage: none
extensions: pdo_sqlite

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
matrix:
os: [ubuntu-20.04, windows-2019]
php: [8.1, 8.0, 7.4, 7.3]
laravel: [8.*]
laravel: [8.*, 9.*]
rcerljenko marked this conversation as resolved.
Show resolved Hide resolved
dependency-version: [prefer-lowest, prefer-stable]
exclude:
- php: 8.0
Expand All @@ -30,6 +30,8 @@ jobs:
php: 7.4
- os: windows-2019
php: 7.3
- php: [7.4, 7.3]
laravel: 9.*
steps:
- name: Set git to use LF
if: ${{ matrix.os == 'windows-2019' }}
Expand Down
12 changes: 6 additions & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,25 @@
"barryvdh/reflection-docblock": "^2.0.6",
"composer/composer": "^1.10.23 || ^2.1.9",
"doctrine/dbal": "^2.6 || ^3",
"illuminate/console": "^8",
"illuminate/filesystem": "^8",
"illuminate/support": "^8",
"illuminate/console": "^8|^9",
"illuminate/filesystem": "^8|^9",
"illuminate/support": "^8|^9",
"nikic/php-parser": "^4.7",
"phpdocumentor/type-resolver": "^1.1.0"
},
"require-dev": {
"ext-pdo_sqlite": "*",
"friendsofphp/php-cs-fixer": "^2",
"illuminate/config": "^8",
"illuminate/view": "^8",
"illuminate/config": "^8|^9",
"illuminate/view": "^8|^9",
"mockery/mockery": "^1.4",
"orchestra/testbench": "^6",
"phpunit/phpunit": "^8.5 || ^9",
"spatie/phpunit-snapshot-assertions": "^3 || ^4",
"vimeo/psalm": "^3.12"
},
"suggest": {
"illuminate/events": "Required for automatic helper generation (^6|^7|^8)."
"illuminate/events": "Required for automatic helper generation (^6|^7|^8|^9)."
},
"config": {
"sort-packages": true
Expand Down