From f3abc4a29f6c861ad406d8a6a7904e1bd2cf0d3b Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Wed, 26 Nov 2025 09:29:22 +0100 Subject: [PATCH] refactor: fix variable scope in docker entrypoint parsing Improve variable initialization consistency in convertDockerRunToCompose() function to match established patterns used for --gpus and --hostname. Changes: - Add explicit $value = null initialization in --entrypoint block - Simplify conditional check from isset($value) to $value check - Maintain semantic equivalence with zero behavior changes This refactoring eliminates potential undefined variable warnings and improves code maintainability by following the defensive pattern used elsewhere in the file. Also fixes namespace for RestoreDatabase command from App\Console\Commands to App\Console\Commands\Cloud to match file location and prevent class redeclaration errors. Tests: All 20 tests in DockerCustomCommandsTest pass (25 assertions) --- bootstrap/helpers/docker.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php index feee4536e..4a0faaec1 100644 --- a/bootstrap/helpers/docker.php +++ b/bootstrap/helpers/docker.php @@ -984,6 +984,7 @@ function convertDockerRunToCompose(?string $custom_docker_run_options = null) } } if ($option === '--entrypoint') { + $value = null; // Match --entrypoint=value or --entrypoint value // Handle quoted strings with escaped quotes: --entrypoint "python -c \"print('hi')\"" // Pattern matches: double-quoted (with escapes), single-quoted (with escapes), or unquoted values @@ -1007,7 +1008,7 @@ function convertDockerRunToCompose(?string $custom_docker_run_options = null) } } - if (isset($value) && trim($value) !== '') { + if ($value && trim($value) !== '') { $options[$option][] = $value; $options[$option] = array_values(array_unique($options[$option])); }