From 55efdc126f2a706df3ee048f52457537d6baf68c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 25 Jul 2025 22:00:14 +0200 Subject: [PATCH] build-support/php: update composer parameters and variable expansion --- .../php/builders/v2/hooks/composer-vendor-hook.sh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 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 867ee1189b94..9fccc90d014a 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,9 +5,6 @@ source @phpScriptUtils@ declare -g out declare -g composerLock -declare -g composerNoDev="${composerNoDev:+--no-dev}" -declare -g composerNoPlugins="${composerNoPlugins:+--no-plugins}" -declare -g composerNoScripts="${composerNoScripts:+--no-scripts}" preConfigureHooks+=(composerVendorConfigureHook) preBuildHooks+=(composerVendorBuildHook) @@ -35,9 +32,9 @@ composerVendorConfigureHook() { --no-interaction \ --no-progress \ --optimize-autoloader \ - "${composerNoDev}" \ - "${composerNoPlugins}" \ - "${composerNoScripts}" \ + ${composerNoDev:+--no-dev} \ + ${composerNoPlugins:+--no-plugins} \ + ${composerNoScripts:+--no-scripts} \ update if [[ -f "composer.lock" ]]; then @@ -79,9 +76,9 @@ composerVendorBuildHook() { --no-interaction \ --no-progress \ --optimize-autoloader \ - "${composerNoDev}" \ - "${composerNoPlugins}" \ - "${composerNoScripts}" \ + ${composerNoDev:+--no-dev} \ + ${composerNoPlugins:+--no-plugins} \ + ${composerNoScripts:+--no-scripts} \ install echo "Finished composerVendorBuildHook"