From f767ed7fee19c17742e9b2340367add452110def Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 26 Jul 2025 21:43:36 +0200 Subject: [PATCH] build-support/php: avoid code duplication in variables expansion --- .../builders/v2/hooks/composer-vendor-hook.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh index 9fccc90d014a..53503194cfa4 100644 --- a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh +++ b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh @@ -5,6 +5,14 @@ source @phpScriptUtils@ declare -g out declare -g composerLock +declare -g composerNoDev +declare -g composerNoPlugins +declare -g composerNoScripts + +declare -ga composerFlags=() +[[ -n "$composerNoDev" ]] && composerFlags+=(--no-dev) +[[ -n "$composerNoPlugins" ]] && composerFlags+=(--no-plugins) +[[ -n "$composerNoScripts" ]] && composerFlags+=(--no-scripts) preConfigureHooks+=(composerVendorConfigureHook) preBuildHooks+=(composerVendorBuildHook) @@ -32,9 +40,7 @@ composerVendorConfigureHook() { --no-interaction \ --no-progress \ --optimize-autoloader \ - ${composerNoDev:+--no-dev} \ - ${composerNoPlugins:+--no-plugins} \ - ${composerNoScripts:+--no-scripts} \ + "${composerFlags[@]}" \ update if [[ -f "composer.lock" ]]; then @@ -76,9 +82,7 @@ composerVendorBuildHook() { --no-interaction \ --no-progress \ --optimize-autoloader \ - ${composerNoDev:+--no-dev} \ - ${composerNoPlugins:+--no-plugins} \ - ${composerNoScripts:+--no-scripts} \ + "${composerFlags[@]}" \ install echo "Finished composerVendorBuildHook"