fix filter namespace, register command

axyr · Aug 14, 2024 · 9e96cf6 · 9e96cf6
1 parent 3091348
commit 9e96cf6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/resources/stubs/Filter.stub b/resources/stubs/Filter.stub
@@ -1,5 +1,7 @@
 <?php
 
+namespace {{namespace}};
+
 use Axyr\CrudGenerator\Filters\ArrayFilters;
 use Axyr\CrudGenerator\Filters\Contracts\SortableInterface;
 

diff --git a/src/Commands/GenerateCrud.php b/src/Commands/GenerateCrud.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Commands;
+namespace Axyr\CrudGenerator\Commands;
 
 use Axyr\CrudGenerator\Generators\CombinedGenerator;
 use Illuminate\Console\Command;

diff --git a/src/CrudGeneratorServiceProvider.php b/src/CrudGeneratorServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace Axyr\CrudGenerator;
 
+use Axyr\CrudGenerator\Commands\GenerateCrud;
 use Illuminate\Support\ServiceProvider;
 
 class CrudGeneratorServiceProvider extends ServiceProvider
@@ -28,7 +29,7 @@ protected function bootCommands(): void
     {
         if ($this->app->runningInConsole()) {
             $this->commands([
-
+                GenerateCrud::class,
             ]);
         }
     }

diff --git a/tests/Generators/FilterGeneratorTest.php b/tests/Generators/FilterGeneratorTest.php
@@ -37,6 +37,7 @@ public static function dataModelWriteTest(): array
                 'module' => 'Posts',
                 'expectedPath' => 'app/Modules/Posts/Filters/CommentFilter.php',
                 'expectedStrings' => [
+                    'namespace App\Modules\Posts\Filters;',
                     'class CommentFilter',
                 ],
             ],

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -4,6 +4,7 @@
 
 use Axyr\CrudGenerator\CrudGeneratorServiceProvider;
 use Carbon\Carbon;
+use Illuminate\Support\Facades\File;
 use Orchestra\Testbench\Concerns\WithWorkbench;
 
 class TestCase extends \Orchestra\Testbench\TestCase
@@ -18,7 +19,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        //File::deleteDirectory(base_path(config('crudgenerator.base_path')));
+        File::deleteDirectory(base_path(config('crudgenerator.base_path')));
 
         Carbon::setTestNow($this->now = now());
     }