diff --git a/Dockerfile b/Dockerfile index e9c9ec30..c5482066 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 && \ diff --git a/docker/supervisor.php b/docker/supervisor.php index ff8fd507..010b2292 100755 --- a/docker/supervisor.php +++ b/docker/supervisor.php @@ -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)) { @@ -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(); @@ -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();