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

Support PHP 8.4 in docker #312

Merged
merged 1 commit into from
Jan 24, 2025
Merged

Support PHP 8.4 in docker #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.3-fpm-alpine
FROM php:8.4-fpm-alpine

RUN apk --no-cache add nginx curl runit subversion \
git bash openssh-client zip unzip redis shadow && \
Expand Down
6 changes: 3 additions & 3 deletions docker/supervisor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ protected function writeln(string $msg): void
echo (new \DateTime('now'))->format('Y-m-d H:i:s.u') . " $msg\n";
}

protected function loadConfiguration(string $file = null): array
protected function loadConfiguration(?string $file = null): array
{
$file ??= $this->configPath;
if (!file_exists($file) || !is_readable($file)) {
Expand Down Expand Up @@ -293,7 +293,7 @@ protected function loadConfiguration(string $file = null): array
* @param array|null $configs
* @return Task[]
*/
protected function loadTasks(array $configs = null): array
protected function loadTasks(?array $configs = null): array
{
$tasks = [];
$configs ??= $this->loadConfiguration();
Expand Down Expand Up @@ -335,7 +335,7 @@ protected function loadTasks(array $configs = null): array
* @param array|null $tasks
* @return Task[]
*/
protected function prepareTasks(array $tasks = null): array
protected function prepareTasks(?array $tasks = null): array
{
$tasks ??= $this->loadTasks();

Expand Down