build-support/php: fix regression in buildComposerProject2 (#475201)

pkgs/build-support/php/builders/v2/build-composer-project.nix

@@ -9,14 +9,14 @@ let
   buildComposerProjectOverride =
     finalAttrs:
     {
-      php ? finalAttrs.php or toplevel.php,
-      composer ? finalAttrs.php.packages.composer or toplevel.php.packages.composer,
-      composerLock ? finalAttrs.composerLock or null,
-      vendorHash ? finalAttrs.vendorHash or "",
-      composerNoDev ? finalAttrs.composerNoDev or true,
-      composerNoPlugins ? finalAttrs.composerNoPlugins or true,
-      composerNoScripts ? finalAttrs.composerNoScripts or true,
-      composerStrictValidation ? finalAttrs.composerStrictValidation or true,
+      php ? toplevel.php,
+      composer ? php.packages.composer,
+      composerLock ? null,
+      vendorHash ? "",
+      composerNoDev ? true,
+      composerNoPlugins ? true,
+      composerNoScripts ? true,
+      composerStrictValidation ? true,
       buildInputs ? [ ],
       nativeBuildInputs ? [ ],
       strictDeps ? true,
@@ -35,6 +35,9 @@ let
         doCheck
         doInstallCheck
         dontCheckForBrokenSymlinks
+        composerNoDev
+        composerNoPlugins
+        composerNoScripts
         ;
 
       nativeBuildInputs = nativeBuildInputs ++ [

pkgs/build-support/php/builders/v2/build-composer-vendor.nix

@@ -8,14 +8,14 @@ let
   mkComposerVendorOverride =
     finalAttrs:
     {
-      php ? finalAttrs.php or toplevel.php,
-      composer ? finalAttrs.php.packages.composer or toplevel.php.packages.composer,
-      composerLock ? finalAttrs.composerLock or null,
-      vendorHash ? finalAttrs.vendorHash or "",
-      composerNoDev ? finalAttrs.composerNoDev or true,
-      composerNoPlugins ? finalAttrs.composerNoPlugins or true,
-      composerNoScripts ? finalAttrs.composerNoScripts or true,
-      composerStrictValidation ? finalAttrs.composerStrictValidation or true,
+      php ? toplevel.php,
+      composer ? php.packages.composer,
+      composerLock ? null,
+      vendorHash ? "",
+      composerNoDev ? true,
+      composerNoPlugins ? true,
+      composerNoScripts ? true,
+      composerStrictValidation ? true,
       buildInputs ? [ ],
       nativeBuildInputs ? [ ],
       dontPatchShebangs ? true,

pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh

@@ -11,9 +11,9 @@ declare -g composerNoScripts
 
 declare -ga composerFlags=()
 
-[[ 1 == "${composerNoDev:-1}" ]] && composerFlags+=(--no-dev)
-[[ 1 == "${composerNoPlugins:-1}" ]] && composerFlags+=(--no-plugins)
-[[ 1 == "${composerNoScripts:-1}" ]] && composerFlags+=(--no-scripts)
+[[ -n "${composerNoDev-1}" ]] && composerFlags+=(--no-dev)
+[[ -n "${composerNoPlugins-1}" ]] && composerFlags+=(--no-plugins)
+[[ -n "${composerNoScripts-1}" ]] && composerFlags+=(--no-scripts)
 
 preConfigureHooks+=(composerInstallConfigureHook)
 preBuildHooks+=(composerInstallBuildHook)
@@ -57,13 +57,31 @@ composerInstallBuildHook() {
   cp -r "${composerVendor}/${COMPOSER_VENDOR_DIR}" .
   chmod -R +w "${COMPOSER_VENDOR_DIR}"
 
-  echo -e "\e[32mGenerating optimized autoloader and restoring 'bin' directory...\e[0m"
-  COMPOSER_DISABLE_NETWORK=1 composer \
-    "${composerFlags[@]}" \
-    --no-interaction \
-    --no-progress \
-    --optimize-autoloader \
-    install
+  mapfile -t installer_paths < <(jq -r -c 'try((.extra."installer-paths") | keys[])' composer.json)
+  for installer_path in "${installer_paths[@]}"; do
+    # Remove everything after {$name} placeholder
+    installer_path="${installer_path/\{\$name\}*/}"
+    if [[ -e "${composerVendor}/${installer_path}" ]]; then
+      echo -e "\e[32mRestoring custom installer path: ${installer_path}\e[0m"
+      mkdir -p "$(dirname "${installer_path}")"
+      cp -ar "${composerVendor}/${installer_path}" "${installer_path}"
+      # Strip out the git repositories
+      find "${installer_path}" -name .git -type d -prune -print -exec rm -rf {} ";" || true
+      chmod -R +w "${installer_path}"
+    fi
+  done
+
+  # Run this only if composer.lock is available.
+  # e.g., php-codesniffer doesn't need a composer.lock file.
+  if [[ -f "composer.lock" ]]; then
+    echo -e "\e[32mEnsuring Composer dependencies are locked to 'composer.lock'...\e[0m"
+    composer \
+      --no-cache \
+      --no-interaction \
+      --no-progress \
+      "${composerFlags[@]}" \
+      install
+  fi
 
   echo "Finished phase: composerInstallBuildHook"
 }

pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh

@@ -10,9 +10,10 @@ declare -g composerNoPlugins
 declare -g composerNoScripts
 
 declare -ga composerFlags=()
-[[ 1 == "${composerNoDev:-1}" ]] && composerFlags+=(--no-dev)
-[[ 1 == "${composerNoPlugins:-1}" ]] && composerFlags+=(--no-plugins)
-[[ 1 == "${composerNoScripts:-1}" ]] && composerFlags+=(--no-scripts)
+
+[[ -n "${composerNoDev-1}" ]] && composerFlags+=(--no-dev)
+[[ -n "${composerNoPlugins-1}" ]] && composerFlags+=(--no-plugins)
+[[ -n "${composerNoScripts-1}" ]] && composerFlags+=(--no-scripts)
 
 preConfigureHooks+=(composerVendorConfigureHook)
 preBuildHooks+=(composerVendorBuildHook)

pkgs/by-name/dr/drupal/package.nix

@@ -19,7 +19,7 @@ php.buildComposerProject2 (finalAttrs: {
   };
 
   composerNoPlugins = false;
-  vendorHash = "sha256-CAntERLTmR9Gf/e+qBLJqqebdXZ0E9k8ifDh75ASoRo=";
+  vendorHash = "sha256-7FwwkPTKc/miStdHv1wfLoZhV4Gku1KwNgSlWdpPG8g=";
 
   passthru = {
     tests = {