PHP 8 update

PhpGt · Feb 7, 2021 · 8c7347d · 8c7347d
1 parent 759137d
commit 8c7347d
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 66 deletions.
diff --git a/bin/gt b/bin/gt
@@ -2,6 +2,7 @@
 <?php
 namespace Gt\Installer;
 
+use Gt\Cli\Application;
 use Gt\Cli\Argument\ArgumentList;
 use Gt\Installer\Command\BuildCommand;
 use Gt\Installer\Command\CreateCommand;
@@ -18,7 +19,7 @@ foreach([ __DIR__ . "/../../..", __DIR__ . "/../vendor" ] as $vendor) {
 	}
 }
 
-$app = new \Gt\Cli\Application(
+$app = new Application(
 	"PHP.Gt Command Line Interface",
 	new ArgumentList(...$argv),
 	new CreateCommand(),
@@ -28,4 +29,4 @@ $app = new \Gt\Cli\Application(
 	new ServeCommand(),
 	new MigrateCommand()
 );
-$app->run();
+$app->run();
diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
 	],
 
 	"require": {
-		"php": ">=7.4",
+		"php": ">=8.0",
 		"phpgt/cli": "*",
 		"phpgt/daemon": "*",
 		"phpgt/cron": "*",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Command/AbstractWebEngineCommand.php b/src/Command/AbstractWebEngineCommand.php
@@ -1,7 +1,6 @@
 <?php
 namespace Gt\Installer\Command;
 
-use Gt\Cli\Argument\Argument;
 use Gt\Cli\Argument\ArgumentValueList;
 use Gt\Cli\Command\Command;
 use Gt\Cli\Stream;
@@ -13,25 +12,6 @@ public function executeScript(
 		ArgumentValueList $arguments = null,
 		array...$scriptsToRun
 	):void {
-		$stringArgumentArray = [];
-//
-//		foreach($arguments as $arg) {
-//			$key = $arg->getKey();
-//
-//			if($key !== Argument::USER_DATA) {
-//				$stringArgumentArray .= "--";
-//				$stringArgumentArray .= $key;
-//			}
-//
-//			$value = $arg->get();
-//			if(!empty($value)) {
-//				$stringArgumentArray .= " ";
-//				$stringArgumentArray .= $value;
-//			}
-//		}
-
-//		var_dump($arguments);die();
-
 		$processPool = new Pool();
 
 		foreach($scriptsToRun as $scriptParts) {
@@ -74,4 +54,4 @@ public function executeScript(
 		}
 		while($processPool->numRunning() > 0);
 	}
-}
+}
diff --git a/src/Command/CreateCommand.php b/src/Command/CreateCommand.php
@@ -8,7 +8,7 @@
 use Gt\Cli\Stream;
 use Gt\Daemon\Process;
 
-class CreateCommand extends Command {
+class CreateCommand extends AbstractWebEngineCommand {
 	public function run(ArgumentValueList $arguments = null):void {
 		$cwd = getcwd();
 		$appDir = implode(DIRECTORY_SEPARATOR, [
@@ -84,4 +84,4 @@ public function getOptionalParameterList():array {
 	public function getRequiredParameterList():array {
 		return [];
 	}
-}
+}
diff --git a/src/Command/CronCommand.php b/src/Command/CronCommand.php
@@ -2,10 +2,8 @@
 namespace Gt\Installer\Command;
 
 use Gt\Cli\Argument\ArgumentValueList;
-use Gt\Cli\Command\Command;
 use Gt\Cli\Parameter\NamedParameter;
 use Gt\Cli\Parameter\Parameter;
-use Gt\Cli\Stream;
 
 class CronCommand extends AbstractWebEngineCommand {
 	public function run(ArgumentValueList $arguments = null):void {
@@ -44,4 +42,4 @@ public function getOptionalParameterList():array {
 		$baseCommand = new \Gt\Cron\Command\RunCommand();
 		return $baseCommand->getOptionalParameterList();
 	}
-}
+}
diff --git a/src/Command/ServeCommand.php b/src/Command/ServeCommand.php
@@ -1,13 +1,10 @@
 <?php
-
 namespace Gt\Installer\Command;
 
 use Gt\Cli\Argument\ArgumentValueList;
-use Gt\Cli\Command\Command;
 use Gt\Cli\Parameter\NamedParameter;
 use Gt\Cli\Parameter\Parameter;
-use Gt\Cli\Stream;
-use Gt\Daemon\Process;
+use Gt\Server\Command\StartCommand;
 
 class ServeCommand extends AbstractWebEngineCommand {
 	public function run(ArgumentValueList $arguments = null):void {
@@ -19,31 +16,31 @@ public function getName():string {
 	}
 
 	public function getDescription():string {
-		$baseCommand = new \Gt\Server\Command\StartCommand();
+		$baseCommand = new StartCommand();
 		return $baseCommand->getDescription();
 	}
 
 	/** @return  NamedParameter[] */
 	public function getRequiredNamedParameterList():array {
-		$baseCommand = new \Gt\Server\Command\StartCommand();
+		$baseCommand = new StartCommand();
 		return $baseCommand->getRequiredNamedParameterList();
 	}
 
 	/** @return  NamedParameter[] */
 	public function getOptionalNamedParameterList():array {
-		$baseCommand = new \Gt\Server\Command\StartCommand();
+		$baseCommand = new StartCommand();
 		return $baseCommand->getOptionalNamedParameterList();
 	}
 
 	/** @return  Parameter[] */
 	public function getRequiredParameterList():array {
-		$baseCommand = new \Gt\Server\Command\StartCommand();
+		$baseCommand = new StartCommand();
 		return $baseCommand->getRequiredParameterList();
 	}
 
 	/** @return  Parameter[] */
 	public function getOptionalParameterList():array {
-		$baseCommand = new \Gt\Server\Command\StartCommand();
+		$baseCommand = new StartCommand();
 		return $baseCommand->getOptionalParameterList();
 	}
-}
+}