♻️ fixes

Author: GautierDele

src/Console/ControlMakeCommand.php

@@ -119,7 +119,7 @@ protected function buildPerimetersReplacements(array $replace, array $perimeters
         $perimetersImplementation = '';
 
         foreach ($perimeters as $perimeter) {
-            $perimeterClass = app_path('Access/Perimeters/'.$perimeter.'.php');
+            $perimeterClass = $this->rootNamespace().'Access\\Perimeters\\'.$perimeter.'.php';
 
             $perimetersImplementation .= <<<PERIMETER
                 \\n

src/Console/PerimeterMakeCommand.php

@@ -7,6 +7,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use function Laravel\Prompts\confirm;
 
 #[AsCommand(name: 'make:perimeter')]
 class PerimeterMakeCommand extends GeneratorCommand
@@ -118,6 +119,12 @@ protected function getOptions()
      */
     protected function afterPromptingForMissingArguments(InputInterface $input, OutputInterface $output)
     {
-        //
+       if ($this->didReceiveOptions($input)) {
+           return;
+       }
+
+       if (confirm('Should this perimeter be an overlay?', false)) {
+           $input->setOption('overlay', true);
+       }
     }
 }

src/Console/stubs/control.stub

@@ -4,6 +4,7 @@ namespace {{ namespace }};
 
 use {{ rootNamespace }}Http\Controllers\Controller;
 use Illuminate\Http\Request;
+use Lomkit\Access\Controls\Control;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Builder;
 
@@ -12,7 +13,7 @@ class {{ class }} extends Control
     /**
      * Retrieve the list of perimeter definitions for the current control.
      *
-     * @return array<Perimeter> An array of Perimeter objects.
+     * @return array<\Lomkit\Access\Perimeters\Perimeter> An array of Perimeter objects.
      */
     protected function perimeters(): array
     {

src/Controls/Control.php

@@ -30,7 +30,7 @@ class Control
     /**
      * Retrieve the list of perimeter definitions for the current control.
      *
-     * @return array<Perimeter> An array of Perimeter objects.
+     * @return array<\Lomkit\Access\Perimeters\Perimeter> An array of Perimeter objects.
      */
     protected function perimeters(): array
     {

src/Policies/ControlledPolicy.php

@@ -105,7 +105,7 @@ public function delete(Model $user, Model $model)
      * @param Model $user  The user attempting the restoration.
      * @param Model $model The model instance to be restored.
      *
-     * @return bool True if deletion is permitted, false otherwise.
+     * @return bool True if restoration is permitted, false otherwise.
      */
     public function restore(Model $user, Model $model)
     {
@@ -118,7 +118,7 @@ public function restore(Model $user, Model $model)
      * @param Model $user  The user attempting the force deletion.
      * @param Model $model The model instance to be force deleted.
      *
-     * @return bool True if deletion is permitted, false otherwise.
+     * @return bool True if force deletion is permitted, false otherwise.
      */
     public function forceDelete(Model $user, Model $model)
     {

tests/Feature/ControlsShouldTest.php

@@ -140,7 +140,7 @@ public function test_control_should_delete_global_using_shared_overlayed_perimet
         $this->assertTrue((new \Lomkit\Access\Tests\Support\Access\Controls\ModelControl())->applies(Auth::user(), 'delete', $model));
     }
 
-    public function test_control_should_not_delete_global_using_shared_overlayed_perimeter(): void
+    public function test_control_should_delete_using_shared_overlayed_perimeter(): void
     {
         Auth::user()->update(['should_shared' => true]);
         Auth::user()->update(['should_global' => true]);

tests/Unit/Console/MakeCommandsTest.php

@@ -8,32 +8,32 @@ class MakeCommandsTest extends TestCase
 {
     public function test_make_plain_perimeter_command()
     {
-        @unlink(app_path('Access/Perimeters/Perimeter.php'));
+        @unlink(app_path('Access/Perimeters/TestPerimeter.php'));
 
         $this
-            ->artisan('make:perimeter', ['name' => 'Perimeter'])
+            ->artisan('make:perimeter', ['name' => 'TestPerimeter'])
             ->assertOk()
             ->run();
 
-        $this->assertFileExists(app_path('Access/Perimeters/Perimeter.php'));
-        $this->assertStringContainsString('class Perimeter extends Perimeter', file_get_contents(app_path('Access/Perimeters/Perimeter.php')));
+        $this->assertFileExists(app_path('Access/Perimeters/TestPerimeter.php'));
+        $this->assertStringContainsString('class TestPerimeter extends Perimeter', file_get_contents(app_path('Access/Perimeters/TestPerimeter.php')));
 
-        unlink(app_path('Access/Perimeters/Perimeter.php'));
+        unlink(app_path('Access/Perimeters/TestPerimeter.php'));
     }
 
     public function test_make_overlay_perimeter_command()
     {
-        @unlink(app_path('Access/Perimeters/Perimeter.php'));
+        @unlink(app_path('Access/Perimeters/TestPerimeter.php'));
 
         $this
-            ->artisan('make:perimeter', ['name' => 'Perimeter', '--overlay' => true])
+            ->artisan('make:perimeter', ['name' => 'TestPerimeter', '--overlay' => true])
             ->assertOk()
             ->run();
 
-        $this->assertFileExists(app_path('Access/Perimeters/Perimeter.php'));
-        $this->assertStringContainsString('class Perimeter extends OverlayPerimeter', file_get_contents(app_path('Access/Perimeters/Perimeter.php')));
+        $this->assertFileExists(app_path('Access/Perimeters/TestPerimeter.php'));
+        $this->assertStringContainsString('class TestPerimeter extends OverlayPerimeter', file_get_contents(app_path('Access/Perimeters/TestPerimeter.php')));
 
-        unlink(app_path('Access/Perimeters/Perimeter.php'));
+        unlink(app_path('Access/Perimeters/TestPerimeter.php'));
     }
 
     public function test_make_control_command()
@@ -88,7 +88,7 @@ public function test_make_control_with_perimeters_command()
 
         $this->assertFileExists(app_path('Access/Controls/TestControl.php'));
         $this->assertStringContainsString('class TestControl', file_get_contents(app_path('Access/Controls/TestControl.php')));
-        $this->assertStringContainsString(app_path('Access/Perimeters/TestPerimeter.php').'::new()', file_get_contents(app_path('Access/Controls/TestControl.php')));
+        $this->assertStringContainsString('App\\Access\\Perimeters\\TestPerimeter.php::new()', file_get_contents(app_path('Access/Controls/TestControl.php')));
 
         unlink(app_path('Access/Perimeters/TestPerimeter.php'));
         unlink(app_path('Access/Perimeters/SecondTestPerimeter.php'));