ControlMakeCommand - badly interpreted perimeter generation (#14)

* Fix make control

* 💄 small changes

* Update README.md

---------

Co-authored-by: Gautier DELEGLISE <gautier.deleglise@gmail.com>

Author: 15g-lucas

README.md

@@ -30,9 +30,6 @@ class PostControl extends Control
                 ->should(function (Model $user, Model $model) {
                     return true;
                 })
-                ->scoutQuery(function (\Laravel\Scout\Builder $query, Model $user) {
-                    return $query;
-                })
                 ->query(function (Builder $query, Model $user) {
                     return $query;
                 }),
@@ -43,19 +40,16 @@ class PostControl extends Control
                 ->should(function (Model $user, Model $model) {
                     return $model->client()->is($user->client);
                 })
-                ->scoutQuery(function (\Laravel\Scout\Builder $query, Model $user) {
-                    return $query->where('client_id', $user->client->getKey());
-                })
                 ->query(function (Builder $query, Model $user) {
-                    return $query->orWhere('client_id', $user->client->getKey());
+                    return $query->where('client_id', $user->client->getKey());
                 }),
         // ...
 ```
 
-Then setup your policy:
+Then set up your policy:
 
 ```php
-    class PostPolicy extends ControlledPolicy
+class PostPolicy extends ControlledPolicy
 {
     protected string $model = Post::class;
 }

src/Console/ControlMakeCommand.php

@@ -122,17 +122,16 @@ protected function buildPerimetersReplacements(array $replace, array $perimeters
             $perimeterClass = $this->rootNamespace().'Access\\Perimeters\\'.$perimeter;
 
             $perimetersImplementation .= <<<PERIMETER
-                \\n
-                $perimeterClass::new()
-                    ->should(function (Model \$user, string \$method, Model \$model) {
+            $perimeterClass::new()
+                    ->allowed(function (Model \$user, string \$method) {
                         return true;
                     })
-                    ->allowed(function (Model \$user) {
+                    ->should(function (Model \$user, Model \$model) {
                         return true;
                     })
                     ->query(function (Builder \$query, Model \$user) {
                         return \$query;
-                    }),\\n
+                    }),
             PERIMETER;
         }
 

src/Console/stubs/control.stub

@@ -17,6 +17,8 @@ class {{ class }} extends Control
      */
     protected function perimeters(): array
     {
-        return [{{ perimeters }}];
+        return [
+            {{ perimeters }}
+        ];
     }
 }