Symfony console application after bug fix

muhammetsafak · muhammetsafak · commit 9b43d02f2e2a · 2023-12-23T07:11:31.000+03:00
diff --git a/system/Console/Commands/MakeCommandCommand.php b/system/Console/Commands/MakeCommandCommand.php
@@ -52,9 +52,8 @@ public function execute(InputInterface $input, OutputInterface $output): int
     protected function configure(): void
     {
         $this->setDescription('Creates a command.')
-            ->setHelp('--name=CommandName')
             ->addArgument('name', InputArgument::REQUIRED, 'The name of the command class.')
-            ->addOption('system', 's', InputOption::VALUE_OPTIONAL, 'Creates a system command.');
+            ->addOption('system', 's', InputOption::VALUE_NONE, 'Creates a system command.');
     }
 
 }
diff --git a/system/Console/Commands/MakeControllerCommand.php b/system/Console/Commands/MakeControllerCommand.php
@@ -48,7 +48,6 @@ public function execute(InputInterface $input, OutputInterface $output): int
     protected function configure(): void
     {
         $this->setDescription('Creates a controller.')
-            ->setHelp('--name=ControllerName')
             ->addArgument('name', InputArgument::REQUIRED, 'The name of the controller class.');
     }
 
diff --git a/system/Console/Commands/MakeEntityCommand.php b/system/Console/Commands/MakeEntityCommand.php
@@ -35,7 +35,6 @@ public function execute(InputInterface $input, OutputInterface $output): int
     protected function configure(): void
     {
         $this->setDescription('Creates a entity.')
-            ->setHelp('--name=EntityName')
             ->addArgument('name', InputArgument::REQUIRED, 'The name of the entity class.');
     }
 
diff --git a/system/Console/Commands/MakeModelCommand.php b/system/Console/Commands/MakeModelCommand.php
@@ -30,15 +30,14 @@ protected function configure(): void
     {
         $this->setDescription('Creates a model.')
             ->addArgument('name', InputArgument::REQUIRED, 'Model class name')
-            ->addOption('entity', 'e', InputOption::VALUE_OPTIONAL, 'Create Entity Class.');
+            ->addOption('entity', 'e', InputOption::VALUE_NONE, 'Create Entity Class.');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $name = trim($input->getArgument('name'), "/");
-
         $entity = null;
-        if ($input->hasOption('entity')) {
+        if ($input->getOption('entity')) {
             $entity = MakeEntityCommand::makeEntity($name);
         }
         empty($entity) && $entity = "\\InitPHP\\Framework\\Database\\Entity::class";
diff --git a/system/Console/Commands/MakeProviderCommand.php b/system/Console/Commands/MakeProviderCommand.php
@@ -30,15 +30,15 @@ protected function configure(): void
     {
         $this->setDescription('Creates a service provider.')
             ->addArgument('name', InputArgument::REQUIRED, 'Provider Name')
-            ->addOption('system', 's', InputOption::VALUE_OPTIONAL, 'System Provider');
+            ->addOption('system', 's', InputOption::VALUE_NONE, 'System Provider');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $name = $input->getArgument('name');
         $path = APP_DIR . "Providers/";
         $namespace = "App\\Providers";
-        if ($input->hasOption('system')) {
+        if ($input->getOption('system')) {
             $path = SYS_DIR . "Providers/";
             $namespace = "InitPHP\\Framework\\Providers";
         }
@@ -49,7 +49,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $path .= implode("/", $split) . "/";
         }
         $path .= $name . ".php";
-        $make = new MakeFile(SYS_DIR . "Console/Templates/Providers.txt");
+        $make = new MakeFile(SYS_DIR . "Console/Templates/Provider.txt");
 
         return $make->to($path, ["name" => $name, "namespace" => $namespace]) ? Command::SUCCESS : Command::FAILURE;
     }
diff --git a/system/Console/Commands/MakeRequestCommand.php b/system/Console/Commands/MakeRequestCommand.php
@@ -28,8 +28,7 @@ class MakeRequestCommand extends Command
     protected function configure(): void
     {
         $this->setDescription('Creates a request.')
-            ->addArgument('name', InputArgument::REQUIRED, 'Request class name')
-            ->setHelp('--name=RequestName');
+            ->addArgument('name', InputArgument::REQUIRED, 'Request class name');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
@@ -46,9 +45,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $path .= implode("/", $split) . "/";
         }
         $path .= $name . ".php";
-        $make = new MakeFile(SYS_DIR . "Console/Templates/Requests.txt");
 
-        return $make->to($path, ["name" => $name, "namespace" => $namespace]) ? Command::SUCCESS : Command::FAILURE;
+        $write = (new MakeFile(SYS_DIR . 'Console/Templates/Request.txt'))
+            ->to($path, ['name' => $name, 'namespace' => $namespace]);
+
+        return $write ? Command::SUCCESS : Command::FAILURE;
     }
 
 }
diff --git a/system/Console/Commands/RouteListCommand.php b/system/Console/Commands/RouteListCommand.php
@@ -16,6 +16,7 @@
 
 use InitPHP\Framework\Base;
 use \InitPHP\Framework\Console\Command;
+use InitPHP\Framework\Console\Utils\Table;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -35,7 +36,7 @@ protected function configure(): void
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        if ($input->hasArgument('method')) {
+        if (!empty($input->getArgument('method'))) {
             $routes = [
                 strtoupper($input->getArgument('method')) => Base::getProperty('router')->getRoutes($input->getArgument('method'))
             ];
@@ -44,7 +45,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         $i = 0;
-        $table = new \InitPHP\Console\Utils\Table();
+        $table = new Table();
         foreach ($routes as $method => $route) {
             foreach ($route as $path => $row) {
                 $execute = $row['execute'];
@@ -63,7 +64,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             }
         }
 
-        $output->write(PHP_EOL . $table->getContent() . PHP_EOL);
+        $output->writeln(PHP_EOL . $table->getContent() . PHP_EOL);
 
         return Command::SUCCESS;
     }
diff --git a/system/Console/Commands/ServeCommand.php b/system/Console/Commands/ServeCommand.php
@@ -17,30 +17,30 @@
 use \InitPHP\Framework\Console\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ServeCommand extends Command
 {
 
     protected static $defaultName = 'serve';
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $host = $input->hasArgument("host") ? $input->getArgument("host") : "127.0.0.1";
-        $port = $input->hasArgument("port") ? $input->getArgument("port") : 8000;
-        !is_int($port) && $port = 8000;
+        $host = $input->getOption("host");
+        $port = intval($input->getOption("port"));
 
         $shell = "php -S " . $host . ":" . $port . " -t \"" . PUBLIC_DIR . "\"";
         exec($shell);
 
         return Command::SUCCESS;
     }
 
-    protected function configure(): void
+    protected function configure()
     {
         $this->setDescription('It runs a PHP Web server.')
-            ->addArgument('host', InputArgument::OPTIONAL, 'The host name or IP', '127.0.0.1')
-            ->addArgument('port', InputArgument::OPTIONAL, 'The port', '8000');
+            ->addOption('host', 'host', InputOption::VALUE_OPTIONAL, 'The host name or IP', '127.0.0.1')
+            ->addOption('port', 'p', InputOption::VALUE_OPTIONAL, 'The port', '8000');
     }
 
 }
diff --git a/system/Console/Commands/StorageLinkCommand.php b/system/Console/Commands/StorageLinkCommand.php
@@ -30,8 +30,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
 
     protected function configure(): void
     {
-        $this->setDescription('Creates a shortcut to the storage/public directory in public_html.')
-            ->setHelp('');
+        $this->setDescription('Creates a shortcut to the storage/public directory in public_html.');
     }
 
 }
diff --git a/system/Console/Commands/ViewCacheClearCommand.php b/system/Console/Commands/ViewCacheClearCommand.php
@@ -39,8 +39,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
 
     protected function configure(): void
     {
-        $this->setDescription('View cache clear')
-            ->setHelp('');
+        $this->setDescription('View cache clear');
     }
 
 }
diff --git a/system/Console/Templates/Model.txt b/system/Console/Templates/Model.txt
@@ -7,7 +7,7 @@ use \InitPHP\Framework\Database\Model;
 class {name} extends Model
 {
 
-    protected string $schema = {schema};
+    protected string $schema = "{schema}";
 
     protected string $schemaId = 'id';
 
diff --git a/system/Console/Utils/Table.php b/system/Console/Utils/Table.php
diff --git a/system/Helpers/str_helper.php b/system/Helpers/str_helper.php

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,8 @@ public function execute(InputInterface $input, OutputInterface $output): int`
`52`	`52`	`protected function configure(): void`
`53`	`53`	`{`
`54`	`54`	`$this->setDescription('Creates a command.')`
`55`		`- ->setHelp('--name=CommandName')`
`56`	`55`	`->addArgument('name', InputArgument::REQUIRED, 'The name of the command class.')`
`57`		`- ->addOption('system', 's', InputOption::VALUE_OPTIONAL, 'Creates a system command.');`
	`56`	`+ ->addOption('system', 's', InputOption::VALUE_NONE, 'Creates a system command.');`
`58`	`57`	`}`
`59`	`58`
`60`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ public function execute(InputInterface $input, OutputInterface $output): int`
`48`	`48`	`protected function configure(): void`
`49`	`49`	`{`
`50`	`50`	`$this->setDescription('Creates a controller.')`
`51`		`- ->setHelp('--name=ControllerName')`
`52`	`51`	`->addArgument('name', InputArgument::REQUIRED, 'The name of the controller class.');`
`53`	`52`	`}`
`54`	`53`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ public function execute(InputInterface $input, OutputInterface $output): int`
`35`	`35`	`protected function configure(): void`
`36`	`36`	`{`
`37`	`37`	`$this->setDescription('Creates a entity.')`
`38`		`- ->setHelp('--name=EntityName')`
`39`	`38`	`->addArgument('name', InputArgument::REQUIRED, 'The name of the entity class.');`
`40`	`39`	`}`
`41`	`40`
Original file line number	Diff line number	Diff line change
`@@ -30,15 +30,14 @@ protected function configure(): void`
`30`	`30`	`{`
`31`	`31`	`$this->setDescription('Creates a model.')`
`32`	`32`	`->addArgument('name', InputArgument::REQUIRED, 'Model class name')`
`33`		`- ->addOption('entity', 'e', InputOption::VALUE_OPTIONAL, 'Create Entity Class.');`
	`33`	`+ ->addOption('entity', 'e', InputOption::VALUE_NONE, 'Create Entity Class.');`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`protected function execute(InputInterface $input, OutputInterface $output): int`
`37`	`37`	`{`
`38`	`38`	`$name = trim($input->getArgument('name'), "/");`
`39`		`-`
`40`	`39`	`$entity = null;`
`41`		`- if ($input->hasOption('entity')) {`
	`40`	`+ if ($input->getOption('entity')) {`
`42`	`41`	`$entity = MakeEntityCommand::makeEntity($name);`
`43`	`42`	`}`
`44`	`43`	`empty($entity) && $entity = "\\InitPHP\\Framework\\Database\\Entity::class";`
Original file line number	Diff line number	Diff line change
`@@ -30,15 +30,15 @@ protected function configure(): void`
`30`	`30`	`{`
`31`	`31`	`$this->setDescription('Creates a service provider.')`
`32`	`32`	`->addArgument('name', InputArgument::REQUIRED, 'Provider Name')`
`33`		`- ->addOption('system', 's', InputOption::VALUE_OPTIONAL, 'System Provider');`
	`33`	`+ ->addOption('system', 's', InputOption::VALUE_NONE, 'System Provider');`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`protected function execute(InputInterface $input, OutputInterface $output): int`
`37`	`37`	`{`
`38`	`38`	`$name = $input->getArgument('name');`
`39`	`39`	`$path = APP_DIR . "Providers/";`
`40`	`40`	`$namespace = "App\\Providers";`
`41`		`- if ($input->hasOption('system')) {`
	`41`	`+ if ($input->getOption('system')) {`
`42`	`42`	`$path = SYS_DIR . "Providers/";`
`43`	`43`	`$namespace = "InitPHP\\Framework\\Providers";`
`44`	`44`	`}`
`@@ -49,7 +49,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`49`	`49`	`$path .= implode("/", $split) . "/";`
`50`	`50`	`}`
`51`	`51`	`$path .= $name . ".php";`
`52`		`- $make = new MakeFile(SYS_DIR . "Console/Templates/Providers.txt");`
	`52`	`+ $make = new MakeFile(SYS_DIR . "Console/Templates/Provider.txt");`
`53`	`53`
`54`	`54`	`return $make->to($path, ["name" => $name, "namespace" => $namespace]) ? Command::SUCCESS : Command::FAILURE;`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,7 @@ class MakeRequestCommand extends Command`
`28`	`28`	`protected function configure(): void`
`29`	`29`	`{`
`30`	`30`	`$this->setDescription('Creates a request.')`
`31`		`- ->addArgument('name', InputArgument::REQUIRED, 'Request class name')`
`32`		`- ->setHelp('--name=RequestName');`
	`31`	`+ ->addArgument('name', InputArgument::REQUIRED, 'Request class name');`
`33`	`32`	`}`
`34`	`33`
`35`	`34`	`protected function execute(InputInterface $input, OutputInterface $output): int`
`@@ -46,9 +45,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`46`	`45`	`$path .= implode("/", $split) . "/";`
`47`	`46`	`}`
`48`	`47`	`$path .= $name . ".php";`
`49`		`- $make = new MakeFile(SYS_DIR . "Console/Templates/Requests.txt");`
`50`	`48`
`51`		`- return $make->to($path, ["name" => $name, "namespace" => $namespace]) ? Command::SUCCESS : Command::FAILURE;`
	`49`	`+ $write = (new MakeFile(SYS_DIR . 'Console/Templates/Request.txt'))`
	`50`	`+ ->to($path, ['name' => $name, 'namespace' => $namespace]);`
	`51`	`+`
	`52`	`+ return $write ? Command::SUCCESS : Command::FAILURE;`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`
`17`	`17`	`use InitPHP\Framework\Base;`
`18`	`18`	`use \InitPHP\Framework\Console\Command;`
	`19`	`+use InitPHP\Framework\Console\Utils\Table;`
`19`	`20`	`use Symfony\Component\Console\Input\InputArgument;`
`20`	`21`	`use Symfony\Component\Console\Input\InputInterface;`
`21`	`22`	`use Symfony\Component\Console\Output\OutputInterface;`
`@@ -35,7 +36,7 @@ protected function configure(): void`
`35`	`36`
`36`	`37`	`protected function execute(InputInterface $input, OutputInterface $output): int`
`37`	`38`	`{`
`38`		`- if ($input->hasArgument('method')) {`
	`39`	`+ if (!empty($input->getArgument('method'))) {`
`39`	`40`	`$routes = [`
`40`	`41`	`strtoupper($input->getArgument('method')) => Base::getProperty('router')->getRoutes($input->getArgument('method'))`
`41`	`42`	`];`
`@@ -44,7 +45,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`$i = 0;`
`47`		`- $table = new \InitPHP\Console\Utils\Table();`
	`48`	`+ $table = new Table();`
`48`	`49`	`foreach ($routes as $method => $route) {`
`49`	`50`	`foreach ($route as $path => $row) {`
`50`	`51`	`$execute = $row['execute'];`
`@@ -63,7 +64,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`63`	`64`	`}`
`64`	`65`	`}`
`65`	`66`
`66`		`- $output->write(PHP_EOL . $table->getContent() . PHP_EOL);`
	`67`	`+ $output->writeln(PHP_EOL . $table->getContent() . PHP_EOL);`
`67`	`68`
`68`	`69`	`return Command::SUCCESS;`
`69`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,30 +17,30 @@`
`17`	`17`	`use \InitPHP\Framework\Console\Command;`
`18`	`18`	`use Symfony\Component\Console\Input\InputArgument;`
`19`	`19`	`use Symfony\Component\Console\Input\InputInterface;`
	`20`	`+use Symfony\Component\Console\Input\InputOption;`
`20`	`21`	`use Symfony\Component\Console\Output\OutputInterface;`
`21`	`22`
`22`	`23`	`class ServeCommand extends Command`
`23`	`24`	`{`
`24`	`25`
`25`	`26`	`protected static $defaultName = 'serve';`
`26`	`27`
`27`		`- protected function execute(InputInterface $input, OutputInterface $output): int`
	`28`	`+ protected function execute(InputInterface $input, OutputInterface $output)`
`28`	`29`	`{`
`29`		`- $host = $input->hasArgument("host") ? $input->getArgument("host") : "127.0.0.1";`
`30`		`- $port = $input->hasArgument("port") ? $input->getArgument("port") : 8000;`
`31`		`- !is_int($port) && $port = 8000;`
	`30`	`+ $host = $input->getOption("host");`
	`31`	`+ $port = intval($input->getOption("port"));`
`32`	`32`
`33`	`33`	`$shell = "php -S " . $host . ":" . $port . " -t \"" . PUBLIC_DIR . "\"";`
`34`	`34`	`exec($shell);`
`35`	`35`
`36`	`36`	`return Command::SUCCESS;`
`37`	`37`	`}`
`38`	`38`
`39`		`- protected function configure(): void`
	`39`	`+ protected function configure()`
`40`	`40`	`{`
`41`	`41`	`$this->setDescription('It runs a PHP Web server.')`
`42`		`- ->addArgument('host', InputArgument::OPTIONAL, 'The host name or IP', '127.0.0.1')`
`43`		`- ->addArgument('port', InputArgument::OPTIONAL, 'The port', '8000');`
	`42`	`+ ->addOption('host', 'host', InputOption::VALUE_OPTIONAL, 'The host name or IP', '127.0.0.1')`
	`43`	`+ ->addOption('port', 'p', InputOption::VALUE_OPTIONAL, 'The port', '8000');`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,7 @@ public function execute(InputInterface $input, OutputInterface $output): int`
`30`	`30`
`31`	`31`	`protected function configure(): void`
`32`	`32`	`{`
`33`		`- $this->setDescription('Creates a shortcut to the storage/public directory in public_html.')`
`34`		`- ->setHelp('');`
	`33`	`+ $this->setDescription('Creates a shortcut to the storage/public directory in public_html.');`
`35`	`34`	`}`
`36`	`35`
`37`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,7 @@ public function execute(InputInterface $input, OutputInterface $output): int`
`39`	`39`
`40`	`40`	`protected function configure(): void`
`41`	`41`	`{`
`42`		`- $this->setDescription('View cache clear')`
`43`		`- ->setHelp('');`
	`42`	`+ $this->setDescription('View cache clear');`
`44`	`43`	`}`
`45`	`44`
`46`	`45`	`}`