Fix: hestiacp#3352 Unable to install Drupal (hestiacp#3353)

Due to requirements for PHP8.1 we installing composer dependencies

Author: jaapmarcus

web/src/app/System/HestiaApp.php

@@ -117,23 +117,25 @@ public function updateComposer($version) {
 		$this->runUser("v-run-cli-cmd", ["composer", "selfupdate", "--$version"]);
 	}
 
-	public function runComposer($args, &$cmd_result = null, $version = 2): bool {
+	public function runComposer($args, &$cmd_result = null, $data = []): bool {
 		$composer =
 			$this->getUserHomeDir() .
 			DIRECTORY_SEPARATOR .
 			".composer" .
 			DIRECTORY_SEPARATOR .
 			"composer";
 		if (!is_file($composer)) {
-			$this->installComposer($version);
+			$this->installComposer($data["version"]);
 		} else {
-			$this->updateComposer($version);
+			$this->updateComposer($data["version"]);
+		}
+		if (empty($data["php_version"])) {
+			$data["php_version"] = "";
 		}
-
 		if (!empty($args) && is_array($args)) {
-			array_unshift($args, "composer");
+			array_unshift($args, "php" . $data["php_version"], $composer);
 		} else {
-			$args = ["composer", $args];
+			$args = ["php" . $data["php_version"], $composer, $args];
 		}
 
 		return $this->runUser("v-run-cli-cmd", $args, $cmd_result);

web/src/app/WebApp/Installers/BaseSetup.php

@@ -104,7 +104,13 @@ public function retrieveResources($options) {
 			}
 
 			if ($res_type === "composer") {
-				new ComposerResource($this->appcontext, $res_data, $resource_destination);
+				$res_data["php_version"] = $options["php_version"];
+				new ComposerResource(
+					$this->appcontext,
+					$res_data,
+					$resource_destination,
+					$options["php_version"],
+				);
 			} elseif ($res_type === "wp") {
 				new WpResource(
 					$this->appcontext,

web/src/app/WebApp/Installers/Drupal/DrupalSetup.php

@@ -38,8 +38,11 @@ class DrupalSetup extends BaseSetup {
 	public function install(array $options = null): bool {
 		parent::install($options);
 		parent::setup($options);
-
-		$this->appcontext->runComposer(["require", "-d " . $this->getDocRoot(), "drush/drush:^10"]);
+		$this->appcontext->runComposer(
+			["require", "-d " . $this->getDocRoot(), "drush/drush"],
+			$status2,
+			["version" => 2, "php_version" => $options["php_version"]],
+		);
 
 		$htaccess_rewrite = '
 <IfModule mod_rewrite.c>

web/src/app/WebApp/Installers/Resources/ComposerResource.php

@@ -27,7 +27,7 @@ public function __construct(HestiaApp $appcontext, $data, $destination) {
 				$this->project,
 			],
 			$status,
-			$data["version"],
+			$data,
 		);
 
 		if ($status->code !== 0) {