feat: Lion-Files v7.1.0 is integrated

lion-packages · Nov 18, 2024 · d8a09fb · d8a09fb
1 parent c204d37
commit d8a09fb
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 46 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/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/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);
-    }
-}