Upgrade to phpgt/daemon's new process model

Author: Greg Bowler

bin/gt

@@ -6,6 +6,7 @@ use Gt\Cli\Argument\ArgumentList;
 use Gt\Installer\Command\BuildCommand;
 use Gt\Installer\Command\CreateCommand;
 use Gt\Installer\Command\CronCommand;
+use Gt\Installer\Command\MigrateCommand;
 use Gt\Installer\Command\RunCommand;
 use Gt\Installer\Command\ServeCommand;
 

composer.json

@@ -6,7 +6,7 @@
 	],
 
 	"require": {
-		"php": ">=7.2",
+		"php": ">=7.4",
 		"phpgt/cli": "*",
 		"phpgt/daemon": "*",
 		"phpgt/cron": "*",

composer.lock

@@ -11,66 +11,37 @@
 abstract class AbstractWebEngineCommand extends Command {
 	public function executeScript(
 		ArgumentValueList $arguments = null,
-		string...$scriptsToRun
+		array...$scriptsToRun
 	):void {
-		$argString = "";
-
-		foreach($arguments as $arg) {
-			$key = $arg->getKey();
-
-			if($key !== Argument::USER_DATA) {
-				$argString .= " ";
-				$argString .= "--";
-				$argString .= $key;
-			}
-
-			$value = $arg->get();
-			if(!empty($value)) {
-				$argString .= " ";
-				$argString .= $value;
-			}
-		}
-
 		$processPool = new Pool();
 
-		foreach($scriptsToRun as $scriptName) {
+		foreach($scriptsToRun as $scriptParts) {
+			$scriptName = array_shift($scriptParts);
+
 			$gtCommand = implode(DIRECTORY_SEPARATOR, [
 				"vendor",
 				"bin",
 				$scriptName,
 			]);
 
-			$spacePos = strpos($gtCommand, " ");
-			$gtCommandWithoutArguments = $gtCommand;
-			if($spacePos > 0) {
-				$gtCommandWithoutArguments = substr(
-					$gtCommand,
-					0,
-					$spacePos
-				);
-			}
-			if(!file_exists($gtCommandWithoutArguments)) {
+			if(!file_exists($gtCommand)) {
 				$this->writeLine(
 					"The current directory is not a WebEngine application.",
 					Stream::ERROR
 				);
 				return;
 			}
 
-			if(!empty($argString)) {
-				$gtCommand .= $argString;
-			}
-
-			$friendlyScriptName = $gtCommandWithoutArguments;
-			$slashPos = strrpos($gtCommandWithoutArguments, "/");
+			$friendlyScriptName = $gtCommand;
+			$slashPos = strrpos($friendlyScriptName, "/");
 			if($slashPos > 0) {
 				$friendlyScriptName = substr(
-					$gtCommandWithoutArguments,
+					$friendlyScriptName,
 					$slashPos + 1
 				);
 			}
 
-			$process = new Process($gtCommand);
+			$process = new Process($gtCommand, ...$scriptParts);
 			$processPool->add($friendlyScriptName, $process);
 		}
 

src/Command/AbstractWebEngineCommand.php

@@ -7,7 +7,7 @@
 
 class BuildCommand extends AbstractWebEngineCommand {
 	public function run(ArgumentValueList $arguments = null):void {
-		$this->executeScript($arguments, "build");
+		$this->executeScript($arguments, ["build"]);
 	}
 
 	public function getName():string {

src/Command/BuildCommand.php

@@ -31,7 +31,7 @@ public function run(ArgumentValueList $arguments = null):void {
 			"Using blueprint: $blueprint"
 		);
 
-		$process = new Process("composer create-project --remove-vcs webengine-blueprints/$blueprint:dev-master $appDir");
+		$process = new Process("composer", "create-project", "--remove-vcs", "webengine-blueprints/$blueprint:dev-master", $appDir);
 		$process->exec();
 
 		$this->write("Installing");

src/Command/CreateCommand.php

@@ -9,7 +9,7 @@
 
 class CronCommand extends AbstractWebEngineCommand {
 	public function run(ArgumentValueList $arguments = null):void {
-		$this->executeScript($arguments, "cron");
+		$this->executeScript($arguments, ["cron"]);
 	}
 
 	public function getName():string {

src/Command/CronCommand.php

@@ -9,7 +9,7 @@ class MigrateCommand extends AbstractWebEngineCommand {
 	public function run(ArgumentValueList $arguments = null):void {
 		$this->executeScript(
 			$arguments,
-			"db-migrate"
+			["db-migrate"]
 		);
 	}