Merge pull request #98 from lion-packages/new

The body of generated classes (Controllers) is validated
lion-packages · Nov 18, 2024 · 2eeed82 · 2eeed82
2 parents 7acb806 + daf3457
commit 2eeed82
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 51 deletions.
diff --git a/composer.json b/composer.json
@@ -53,7 +53,7 @@
         "lion/database": "^10.3",
         "lion/dependency-injection": "^3.0",
         "lion/exceptions": "^1.3",
-        "lion/files": "^7.0",
+        "lion/files": "^7.1",
         "lion/helpers": "^4.0",
         "lion/mailer": "^6.3",
         "lion/request": "^6.9",

diff --git a/composer.lock b/composer.lock
diff --git a/src/LionBundle/Commands/CommandHandler.php b/src/LionBundle/Commands/CommandHandler.php
@@ -84,9 +84,9 @@ private function getCommands(string $pathCommands, string $namespace, string $pa
         /** @var array<int, Command> $commands */
         $commands = [];
 
-        foreach ($this->store->view($pathCommands) as $file) {
+        foreach ($this->store->getFiles($pathCommands) as $file) {
             if (isSuccess($this->store->validate([$file], ['php']))) {
-                $class = getNamespaceFromFile($file, $namespace, $pathSplit);
+                $class = $this->store->getNamespaceFromFile($file, $namespace, $pathSplit);
 
                 $commands[] = $this->container->resolve($class);
             }

diff --git a/src/LionBundle/Commands/Lion/DB/CrudCommand.php b/src/LionBundle/Commands/Lion/DB/CrudCommand.php
@@ -12,6 +12,8 @@
 use Lion\Command\Command;
 use Lion\Database\Connection;
 use Lion\Database\Driver;
+use LogicException;
+use Symfony\Component\Console\Exception\ExceptionInterface;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -113,9 +115,10 @@ protected function configure(): void
      * @param OutputInterface $output [OutputInterface is the interface
      * implemented by all Output classes]
      *
-     * @return int [0 if everything went fine, or an exit code]
+     * @return int
      *
-     * @throws LogicException [When this abstract method is not implemented]
+     * @throws LogicException|ExceptionInterface [When this abstract method is
+     * not implemented]
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
@@ -171,6 +174,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
      * implemented by all Output classes]
      *
      * @return void
+     *
+     * @throws ExceptionInterface
      */
     private function addDBRules(string $entity, OutputInterface $output): void
     {
@@ -197,6 +202,8 @@ private function addDBRules(string $entity, OutputInterface $output): void
      * implemented by all Output classes]
      *
      * @return void
+     *
+     * @throws ExceptionInterface
      */
     private function addControllerAndModel(
         string $driver,

diff --git a/src/LionBundle/Commands/Lion/DB/DBSeedCommand.php b/src/LionBundle/Commands/Lion/DB/DBSeedCommand.php
@@ -80,9 +80,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         /** @var array<int, SeedInterface> $files */
         $files = [];
 
-        foreach ($this->store->view('./database/Seed/') as $seed) {
+        foreach ($this->store->getFiles('./database/Seed/') as $seed) {
             if (isSuccess($this->store->validate([$seed], ['php']))) {
-                $class = getNamespaceFromFile($seed, 'Database\\Seed\\', 'Seed/');
+                $class = $this->store->getNamespaceFromFile($seed, 'Database\\Seed\\', 'Seed/');
 
                 /** @var SeedInterface $seedInterface */
                 $seedInterface = new $class();

diff --git a/src/LionBundle/Commands/Lion/Migrations/FreshMigrationsCommand.php b/src/LionBundle/Commands/Lion/Migrations/FreshMigrationsCommand.php
@@ -146,9 +146,9 @@ private function getMigrations(): array
             StoreProcedureInterface::class => [],
         ];
 
-        foreach ($this->store->view('./database/Migrations/') as $migration) {
+        foreach ($this->store->getFiles('./database/Migrations/') as $migration) {
             if (isSuccess($this->store->validate([$migration], ['php']))) {
-                $namespace = getNamespaceFromFile($migration, 'Database\\Migrations\\', 'Migrations/');
+                $namespace = $this->store->getNamespaceFromFile($migration, 'Database\\Migrations\\', 'Migrations/');
 
                 $tableMigration = include_once($migration);
 

diff --git a/src/LionBundle/Commands/Lion/New/ControllerCommand.php b/src/LionBundle/Commands/Lion/New/ControllerCommand.php
@@ -10,6 +10,8 @@
 use Lion\Command\Command;
 use Lion\Files\Store;
 use Lion\Helpers\Str;
+use LogicException;
+use Symfony\Component\Console\Exception\ExceptionInterface;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -110,9 +112,10 @@ protected function configure(): void
      * @param OutputInterface $output [OutputInterface is the interface
      * implemented by all Output classes]
      *
-     * @return int 0 if everything went fine, or an exit code
+     * @return int
      *
-     * @throws LogicException When this abstract method is not implemented
+     * @throws LogicException [When this abstract method is not implemented]
+     * @throws ExceptionInterface
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
@@ -165,12 +168,13 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                     );
 
                 if ('none' != $model) {
-                    $factoryController->add("\nuse {$dataModel->namespace}\\{$dataModel->class};\n");
+                    $factoryController->add("\nuse {$dataModel->namespace}\\{$dataModel->class};");
                 }
 
                 $factoryController
                     ->add(
                         <<<EOT
+
                         use Lion\Database\Interface\DatabaseCapsuleInterface;
                         use stdClass;
 

diff --git a/src/LionBundle/Commands/Lion/New/TestCommand.php b/src/LionBundle/Commands/Lion/New/TestCommand.php
@@ -108,6 +108,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 namespace {$namespace};
 
                 use Lion\Test\Test;
+                use PHPUnit\Framework\Attributes\Test as Testing;
 
                 class {$class} extends Test
                 {
@@ -118,6 +119,11 @@ protected function setUp(): void
                     protected function tearDown(): void
                     {
                     }
+
+                    #[Testing]
+                    public function example(): void
+                    {
+                    }
                 }
 
                 PHP

diff --git a/src/LionBundle/Commands/Lion/Schedule/ListScheduleCommand.php b/src/LionBundle/Commands/Lion/Schedule/ListScheduleCommand.php
@@ -98,9 +98,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $size = 0;
 
-        foreach ($this->store->view('app/Console/Cron/') as $file) {
+        foreach ($this->store->getFiles('app/Console/Cron/') as $file) {
             if (isSuccess($this->store->validate([$file], ['php']))) {
-                $namespace = getNamespaceFromFile(
+                $namespace = $this->store->getNamespaceFromFile(
                     (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' ? str_replace('\\', '/', $file) : $file),
                     'App\\Console\\Cron\\',
                     $this->store->normalizePath('Cron/')

diff --git a/src/LionBundle/Commands/Lion/Schedule/UpScheduleCommand.php b/src/LionBundle/Commands/Lion/Schedule/UpScheduleCommand.php
@@ -115,9 +115,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         /** @var array<int, ScheduleInterface> $files */
         $files = [];
 
-        foreach ($this->store->view('app/Console/Cron/') as $file) {
+        foreach ($this->store->getFiles('app/Console/Cron/') as $file) {
             if (isSuccess($this->store->validate([$file], ['php']))) {
-                $namespace = getNamespaceFromFile(
+                $namespace = $this->store->getNamespaceFromFile(
                     $this->store->normalizePath($file),
                     'App\\Console\\Cron\\',
                     $this->store->normalizePath('Cron/')

diff --git a/src/LionBundle/Commands/Lion/Sockets/ServerSocketCommand.php b/src/LionBundle/Commands/Lion/Sockets/ServerSocketCommand.php
@@ -134,9 +134,9 @@ private function selectSocket(InputInterface $input, OutputInterface $output): s
     {
         $classList = [];
 
-        foreach ($this->store->view('./app/Sockets/') as $file) {
+        foreach ($this->store->getFiles('./app/Sockets/') as $file) {
             if (isSuccess($this->store->validate([$file], [ClassFactory::PHP_EXTENSION]))) {
-                $classList[] = getNamespaceFromFile($file, 'App\\Sockets\\', 'Sockets/');
+                $classList[] = $this->store->getNamespaceFromFile($file, 'App\\Sockets\\', 'Sockets/');
             }
         }
 

diff --git a/src/LionBundle/Helpers/Bundle/helpers.php b/src/LionBundle/Helpers/Bundle/helpers.php
@@ -355,27 +355,3 @@ function env(string $key, mixed $default = null): mixed
         return Env::get($key, $default);
     }
 }
-
-if (!function_exists('getNamespaceFromFile')) {
-    /**
-     * Gets the namespace of a class through a defined path
-     *
-     * @param string $file [File path]
-     * @param string $namespace [Namespace for the file]
-     * @param string $split [Separator to obtain the namespace]
-     *
-     * @return string
-     *
-     * @internal
-     */
-    function getNamespaceFromFile(string $file, string $namespace, string $split = '/'): string
-    {
-        $splitFile = explode($split, $file);
-
-        $namespace = str_replace("/", "\\", "{$namespace}{$splitFile[1]}");
-
-        $namespace = str_replace('.php', '',  $namespace);
-
-        return trim($namespace);
-    }
-}