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

PHP 8.4 Support #41

Merged
merged 12 commits into from
Nov 29, 2024
Merged

PHP 8.4 Support #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
550117a
wip
duncanmcclean Nov 21, 2024
d1d5169
wip
duncanmcclean Nov 21, 2024
f835c15
wip
duncanmcclean Nov 21, 2024
468dac0
wip
duncanmcclean Nov 21, 2024
c975ec4
wip
duncanmcclean Nov 21, 2024
f0565c1
Revert "wip"
duncanmcclean Nov 21, 2024
a321cfe
wip
duncanmcclean Nov 21, 2024
47928aa
wip
duncanmcclean Nov 21, 2024
3ba7931
wip
duncanmcclean Nov 21, 2024
4ae186d
Merge branch 'main' into php84
duncanmcclean Nov 28, 2024
345ab91
We can do without this.
duncanmcclean Nov 28, 2024
226a03e
Require Statamic 5.41
duncanmcclean Nov 28, 2024
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
15 changes: 9 additions & 6 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@ jobs:

strategy:
matrix:
php: [8.3, 8.2]
php: [8.2, 8.3, 8.4]
laravel: [10.*, 11.*]
statamic: [^5.0]
stability: [prefer-lowest, prefer-stable]
os: [ubuntu-latest]
exclude:
- php: 8.4
laravel: 10.*

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

steps:
- name: Checkout code
Expand All @@ -31,8 +34,8 @@ jobs:

- name: Install dependencies
run: |
composer require "laravel/framework:${{ matrix.laravel }}" "statamic/cms:${{ matrix.statamic }}" --no-interaction --no-update
composer install --no-interaction
composer require "illuminate/contracts:${{ matrix.laravel }}" --no-interaction --no-update
composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest

- name: Run PHPUnit
run: vendor/bin/phpunit
run: vendor/bin/phpunit
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
}
},
"require": {
"statamic/cms": "^5.38",
"statamic/cms": "^5.41",
"spatie/simple-excel": "^3.7",
"symfony/dom-crawler": "^7.1",
"pixelfear/composer-dist-plugin": "^0.1.5",
"laravel/framework": "11.*"
Copy link
Member Author

@duncanmcclean duncanmcclean Nov 21, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

In #21, whilst fixing some Testbench-related things, I accidentally added a requirement for Laravel 11.

This PR reverts that so you can use Laravel 10 & 11.

"symfony/css-selector": "^7.1"
},
"require-dev": {
"laravel/pint": "^1.18",
"orchestra/testbench": "^8.0 || ^9.5.6",
"phpunit/phpunit": "^10.0"
"orchestra/testbench": "^8.28 || ^9.6.1",
"phpunit/phpunit": "^10.5.35"
},
"config": {
"allow-plugins": {
Expand Down
Loading