Merge branch 'develop'

Author: nomadicjosh

Console/Commands/ListCommand.php

@@ -7,6 +7,8 @@
 use Codefy\Framework\Application;
 use Codefy\Framework\Console\ConsoleCommand;
 use Codefy\Framework\Scheduler\Schedule;
+use Cron\CronExpression;
+use Exception;
 use Symfony\Component\Console\Helper\Table;
 
 class ListCommand extends ConsoleCommand
@@ -22,6 +24,9 @@ public function __construct(protected Schedule $schedule, protected Application
         parent::__construct(codefy: $codefy);
     }
 
+    /**
+     * @throws Exception
+     */
     public function handle(): int
     {
         $table = new Table($this->output);
@@ -35,10 +40,12 @@ public function handle(): int
         $jobs = $this->schedule->allProcessors();
 
         foreach ($jobs as $job) {
+            $nextRun = new CronExpression($job->getExpression());
+
             $table->addRow([
                 get_class($job),
-                $job->getExpression(),
-                $job->getExpression()->getNextRunDate(),
+                $nextRun->getExpression(),
+                $nextRun->getNextRunDate()->format(format: 'd F Y h:i A'),
                 $job->canRunOnlyOneInstance() ? 'yes' : 'no',
             ]);
         }

Console/Commands/ServeCommand.php

@@ -14,22 +14,22 @@ class ServeCommand extends ConsoleCommand
 
     protected array $options = [
         [
-            '--php',
-            '-pp',
+            'php',
+            null,
             'optional',
             'The PHP binary [default: "PHP_BINARY"].',
             false
         ],
         [
-            '--host',
-            '-h',
+            'host',
+            null,
             'optional',
             'Server HTTP host [default: "localhost"].',
             false
         ],
         [
-            '--port',
-            '-pt',
+            'port',
+            null,
             'optional',
             'The HTTP host port [default: "8080"].',
             false
@@ -52,9 +52,9 @@ protected function configure(): void
 
     public function handle(): int
     {
-        $php = escapeshellarg($this->getOptions(key: 'php') ?? PHP_BINARY);
-        $host = $this->getOptions(key: 'host') ?? 'localhost';
-        $port = $this->getOptions(key: 'port') ?? '8080';
+        $php = escapeshellarg(empty($this->getOptions(key: 'php')) ? PHP_BINARY : $this->getOptions(key: 'php'));
+        $host = empty($this->getOptions(key: 'host')) ? 'localhost' : $this->getOptions(key: 'host');
+        $port = empty($this->getOptions(key: 'port')) ? '8080' : $this->getOptions(key: 'port');
 
         $this->terminalComment(string: sprintf('CodefyPHP development server started on http://%s:%s', $host, $port));
         $this->terminalComment(string: 'Press control-C to stop.');