Skip to content

add php8.5 and fix deprecation #2419

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

Open
tacman wants to merge 4 commits into
base: develop
Choose a base branch
from
+5 −4
Open

add php8.5 and fix deprecation #2419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85f63a8
Add PHP 8.5 to workflow matrix
tacman Jan 26, 2026
c85d7aa
see if actions work
tacman Jan 26, 2026
4dea555
check that format exists and not null before array_key_exists
tacman Jan 26, 2026
66065e4
remove tacman branch, trigger manually
tacman Jan 26, 2026
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/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-24.04
strategy:
matrix:
php-versions: ['8.1', '8.2', '8.3', '8.4']
php-versions: ['8.1', '8.2', '8.3', '8.4', '8.5']
fail-fast: false
steps:
- name: Checkout
Expand Down
7 changes: 4 additions & 3 deletions application/src/View/Strategy/ApiJsonStrategy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,10 @@ protected function getFormat(ApiJsonModel $model)
$this->formats = $args['formats'];

// Prioritize the "format" query parameter.
$format = $model->getOption('format');
if (array_key_exists($format, $this->formats)) {
return $format;
if ($format = $model->getOption('format')) {
if (array_key_exists($format, $this->formats)) {
return $format;
}
}
// Respect the Accept header for content negotiation.
$acceptHeader = $model->getOption('accept_header');
Expand Down