Merge pull request #312 from vtsykun/php8.4-docker

Support PHP 8.4 in docker
vtsykun · Jan 24, 2025 · 8d1d922 · 8d1d922
2 parents a4b4c90 + 5cd1185
commit 8d1d922
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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();