Merge pull request #68 from lion-packages/refactoring

Component refactoring

Author: Santiago1010

composer.json

@@ -57,7 +57,8 @@
         "monolog/monolog": "^3.3",
         "nesbot/carbon": "^2.66",
         "predis/predis": "^2.2",
-        "symfony/console": "^6.3"
+        "symfony/console": "^6.3",
+        "symfony/process": "^7.0"
     },
     "require-dev": {
         "lion/test": "^2.0",

composer.lock

@@ -39,7 +39,7 @@
         <bootstrap class="RobinIngelbrecht\PHPUnitPrettyPrint\PhpUnitExtension">
             <parameter name="enableByDefault" value="true" />
             <parameter name="displayProfiling" value="true" />
-            <parameter name="useCompactMode" value="false" />
+            <parameter name="useCompactMode" value="true" />
         </bootstrap>
     </extensions>
 

phpunit.xml

@@ -35,7 +35,7 @@ class CommandsCommand extends Command
      */
     private Store $store;
 
-	/**
+    /**
      * @required
      * */
     public function setClassFactory(ClassFactory $classFactory): CommandsCommand
@@ -60,13 +60,13 @@ public function setStore(Store $store): CommandsCommand
      *
      * @return void
      */
-	protected function configure(): void
+    protected function configure(): void
     {
-		$this
+        $this
             ->setName('new:command')
             ->setDescription('Command required for the creation of new Commands')
             ->addArgument('new-command', InputArgument::OPTIONAL, 'Command name', 'ExampleCommand');
-	}
+    }
 
     /**
      * Executes the current command
@@ -87,7 +87,7 @@ protected function configure(): void
      *
      * @see setCode()
      */
-	protected function execute(InputInterface $input, OutputInterface $output): int
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $command = $input->getArgument('new-command');
 
@@ -176,12 +176,12 @@ protected function interact(InputInterface \$input, OutputInterface \$output): v
                     }
 
                     /**
-                     * Executes the current command.
+                     * Executes the current command
                      *
                      * This method is not abstract because you can use this class
                      * as a concrete class. In this case, instead of defining the
                      * execute() method, you set the code to execute by passing
-                     * a Closure to the setCode() method.
+                     * a Closure to the setCode() method
                      *
                      * @param InputInterface \$input [InputInterface is the interface implemented
                      * by all input classes]
@@ -211,5 +211,5 @@ protected function execute(InputInterface \$input, OutputInterface \$output): in
         $output->writeln($this->successOutput("\t>>  COMMAND: the '{$namespace}\\{$class}' command has been generated"));
 
         return Command::SUCCESS;
-	}
+    }
 }

src/LionBundle/Commands/Lion/New/CommandsCommand.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Lion\Bundle\Commands\Lion\Npm;
+
+use Lion\Bundle\Helpers\Commands\ProcessCommand;
+use Lion\Bundle\Helpers\Commands\Selection\MenuCommand;
+use Lion\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Run the local vite environment for development
+ *
+ * @package Lion\Bundle\Commands\Lion\Npm
+ */
+class NpmRunDevCommand extends MenuCommand
+{
+    /**
+     * Configures the current command
+     *
+     * @return void
+     */
+    protected function configure(): void
+    {
+        $this
+            ->setName('npm:dev')
+            ->setDescription('Starts the Vite development server');
+    }
+
+    /**
+     * Executes the current command
+     *
+     * This method is not abstract because you can use this class
+     * as a concrete class. In this case, instead of defining the
+     * execute() method, you set the code to execute by passing
+     * a Closure to the setCode() method
+     *
+     * @param InputInterface $input [InputInterface is the interface implemented
+     * by all input classes]
+     * @param OutputInterface $output [OutputInterface is the interface
+     * implemented by all Output classes]
+     *
+     * @return int 0 if everything went fine, or an exit code
+     *
+     * @throws LogicException When this abstract method is not implemented
+     *
+     * @see setCode()
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $project = $this->selectedProject($input, $output);
+
+        ProcessCommand::run("cd ./vite/{$project} && npm run dev");
+
+        return Command::SUCCESS;
+    }
+}

src/LionBundle/Commands/Lion/Npm/NpmRunDevCommand.php

@@ -5,56 +5,21 @@
 namespace Lion\Bundle\Commands\Lion;
 
 use Lion\Command\Command;
-use Lion\Command\Kernel;
-use Lion\Helpers\Arr;
+use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Process\Exception\ProcessFailedException;
+use Symfony\Component\Process\PhpExecutableFinder;
+use Symfony\Component\Process\Process;
 
 /**
  * Run the tests defined with PHPunit
  *
- * @property Kernel $kernel [Kernel class object]
- * @property Arr $arr [Arr class object]
- *
  * @package Lion\Bundle\Commands\Lion
  */
 class RunTestCommand extends Command
 {
-    /**
-     * [Kernel class object]
-     *
-     * @var Kernel $kernel
-     */
-    private Kernel $kernel;
-
-    /**
-     * [Arr class object]
-     *
-     * @var Arr $arr
-     */
-    private Arr $arr;
-
-    /**
-     * @required
-     * */
-    public function setKernel(Kernel $kernel): RunTestCommand
-    {
-        $this->kernel = $kernel;
-
-        return $this;
-    }
-
-    /**
-     * @required
-     * */
-    public function setArr(Arr $arr): RunTestCommand
-    {
-        $this->arr = $arr;
-
-        return $this;
-    }
-
     /**
      * Configures the current command
      *
@@ -64,10 +29,12 @@ protected function configure(): void
     {
         $this
             ->setName('test')
-            ->setDescription('Command to create run unit tests')
-            ->addOption('class', 'c', InputOption::VALUE_OPTIONAL, 'Do you want to run a specific class?', false)
-            ->addOption('method', 'm', InputOption::VALUE_OPTIONAL, 'Do you want to filter a specific method?', false)
-            ->addOption('suite', 's', InputOption::VALUE_OPTIONAL, 'Do you want to run a specific suite?', 'All-Test');
+            ->setDescription('Runs the PHPUnit tests')
+            ->setHelp('This command allows you to run PHPUnit tests via the Symfony Console command')
+            ->addOption('class', 'c', InputOption::VALUE_OPTIONAL, 'The class to test')
+            ->addOption('method', 'm', InputOption::VALUE_OPTIONAL, 'The method to test')
+            ->addOption('suite', 's', InputOption::VALUE_OPTIONAL, 'The test suite to run')
+            ->addOption('report', 'r', InputOption::VALUE_OPTIONAL, 'The test suite with coverage report', 'none');
     }
 
     /**
@@ -91,34 +58,45 @@ protected function configure(): void
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $result = '';
+        $application = new Application();
 
-        $class = $input->getOption('class');
+        $application->setAutoExit(false);
 
-        $method = $input->getOption('method');
+        $phpBinaryPath = (new PhpExecutableFinder())->find();
 
-        $suite = $input->getOption('suite');
+        $commandString = "{$phpBinaryPath} ./vendor/bin/phpunit";
 
-        $output->writeln($this->successOutput("\t>>  Running unit tests...\n\t>>  "));
+        if ($input->getOption('suite')) {
+            $commandString .= ' --testsuite ' . $input->getOption('suite');
+        }
 
-        $path = 'php vendor/bin/phpunit';
+        if ($input->getOption('class')) {
+            $commandString .= ' ./tests/' . $input->getOption('class') . '.php';
+        }
 
-        if (!$class && !$method) {
-            $result = $this->kernel->execute("{$path} --testsuite {$suite}", false);
+        if ($input->getOption('method')) {
+            $commandString .= ' --filter ' . $input->getOption('method');
         }
 
-        if ($class && !$method) {
-            $result = $this->kernel->execute("{$path} tests/{$class}.php --testsuite {$suite}", false);
+        if ('none' != $input->getOption('report')) {
+            $commandString .= ' --coverage-clover tests/build/logs/clover.xml --coverage-html tests/build/coverage';
         }
 
-        if ($class && $method) {
-            $result = $this->kernel->execute(
-                "{$path} tests/{$class}.php --filter {$method} --testsuite {$suite}",
-                false
-            );
+        $process = new Process(explode(' ', $commandString));
+
+        $process->setTimeout(null);
+
+        if (Process::isTtySupported()) {
+            $process->setTty(true);
         }
 
-        $output->writeln($this->warningOutput("\t>>  " . $this->arr->of($result)->join("\n\t>>  ")));
+        $process->run(function ($type, $buffer): void {
+            echo $buffer;
+        });
+
+        if (!$process->isSuccessful()) {
+            throw new ProcessFailedException($process);
+        }
 
         return Command::SUCCESS;
     }

src/LionBundle/Commands/Lion/RunTestCommand.php

@@ -175,14 +175,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         (new Table($output))
             ->setHeaderTitle('<info> SCHEDULED TASKS </info>')
             ->setHeaders(['CRON', 'COMMAND', 'OPTIONS', 'LOG'])
-            ->setFooterTitle(
-                $size > 1
-                    ? "<info> Showing [{$size}] available scheduled tasks </info>"
-                    : ($size === 1
-                        ? '<info> Showing a scheduled task </info>'
-                        : '<info> No scheduled tasks available </info>'
-                    )
-            )
+            ->setFooterTitle("<info> Showing [{$size}] available scheduled tasks </info>")
             ->setRows($rows)
             ->render();