build-support/php: avoid code duplication in variables expansion

+10 -6
+10 -6
pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh
··· 5 6 declare -g out 7 declare -g composerLock 8 9 preConfigureHooks+=(composerVendorConfigureHook) 10 preBuildHooks+=(composerVendorBuildHook) ··· 32 --no-interaction \ 33 --no-progress \ 34 --optimize-autoloader \ 35 - ${composerNoDev:+--no-dev} \ 36 - ${composerNoPlugins:+--no-plugins} \ 37 - ${composerNoScripts:+--no-scripts} \ 38 update 39 40 if [[ -f "composer.lock" ]]; then ··· 76 --no-interaction \ 77 --no-progress \ 78 --optimize-autoloader \ 79 - ${composerNoDev:+--no-dev} \ 80 - ${composerNoPlugins:+--no-plugins} \ 81 - ${composerNoScripts:+--no-scripts} \ 82 install 83 84 echo "Finished composerVendorBuildHook"
··· 5 6 declare -g out 7 declare -g composerLock 8 + declare -g composerNoDev 9 + declare -g composerNoPlugins 10 + declare -g composerNoScripts 11 + 12 + declare -ga composerFlags=() 13 + [[ -n "$composerNoDev" ]] && composerFlags+=(--no-dev) 14 + [[ -n "$composerNoPlugins" ]] && composerFlags+=(--no-plugins) 15 + [[ -n "$composerNoScripts" ]] && composerFlags+=(--no-scripts) 16 17 preConfigureHooks+=(composerVendorConfigureHook) 18 preBuildHooks+=(composerVendorBuildHook) ··· 40 --no-interaction \ 41 --no-progress \ 42 --optimize-autoloader \ 43 + "${composerFlags[@]}" \ 44 update 45 46 if [[ -f "composer.lock" ]]; then ··· 82 --no-interaction \ 83 --no-progress \ 84 --optimize-autoloader \ 85 + "${composerFlags[@]}" \ 86 install 87 88 echo "Finished composerVendorBuildHook"