🐛 auto control discovery

src/Console/ControlMakeCommand.php

@@ -116,7 +116,7 @@ protected function buildPerimetersReplacements(array $replace, array $perimeters
         $perimetersImplementation = '';
 
         foreach ($perimeters as $perimeter) {
-            $perimeterClass = $this->rootNamespace().'Access\\Perimeters\\'.$perimeter;
+            $perimeterClass = '\\'.$this->rootNamespace().'Access\\Perimeters\\'.$perimeter;
 
             $perimetersImplementation .= <<<PERIMETER
             $perimeterClass::new()
@@ -129,6 +129,7 @@ protected function buildPerimetersReplacements(array $replace, array $perimeters
                     ->query(function (Builder \$query, Model \$user) {
                         return \$query;
                     }),
+
             PERIMETER;
         }
 

src/Controls/Control.php

@@ -237,7 +237,7 @@ public static function resolveControlName(string $modelName): string
         // @TODO: The auto guess here is strange, we specify the models / controls everywhere, is there a better way of doing this ? (In policies guess the model as Laravel is doing ?)
         // @TODO: Discussed with Lucas G
 
-        if (method_exists($modelName, 'control')) {
+        if (property_exists($modelName, 'control')) {
             return $modelName::control()::class;
         }
 

src/Controls/HasControl.php

@@ -33,6 +33,6 @@ public static function control()
      */
     protected static function newControl(): ?Control
     {
-        return static::$control::new() ?? null;
+        return property_exists(static::class, 'control') ? static::$control::new() : null;
     }
 }

src/Controls/HasControlScope.php

@@ -54,7 +54,7 @@ protected function addControlled(Builder $builder): void
     {
         $builder->macro('controlled', function (Builder $builder) {
             /** @var Control $control */
-            $control = $builder->getModel()->newControl();
+            $control = $builder->getModel()::control();
 
             return $control->queried($builder, Auth::user());
         });