Apply fixes from StyleCI

Author: StyleCIBot

config/access-control.php

@@ -11,7 +11,7 @@
     */
 
     'perimeters' => [
-        'path' => app_path('Access/Perimeters')
+        'path' => app_path('Access/Perimeters'),
     ],
 
     /*
@@ -22,6 +22,6 @@
     |
     */
     'queries' => [
-        'enabled_by_default' => true
-    ]
+        'enabled_by_default' => true,
+    ],
 ];

src/AccessServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace Lomkit\Access;
 
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\ServiceProvider;
 use Lomkit\Access\Perimeters\Perimeters;
 

src/ControlScope.php

@@ -5,7 +5,6 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Scope;
-use Illuminate\Http\Client\Request;
 use Lomkit\Access\Controls\Control;
 
 class ControlScope implements Scope
@@ -30,7 +29,8 @@ public function apply(Builder $builder, Model $model): void
     /**
      * Extend the query builder with the needed functions.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $builder
+     * @param \Illuminate\Database\Eloquent\Builder $builder
+     *
      * @return void
      */
     public function extend(Builder $builder)
@@ -43,7 +43,8 @@ public function extend(Builder $builder)
     /**
      * Add the with-control extension to the builder.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $builder
+     * @param \Illuminate\Database\Eloquent\Builder $builder
+     *
      * @return void
      */
     protected function addWithControl(Builder $builder)
@@ -59,7 +60,8 @@ protected function addWithControl(Builder $builder)
     /**
      * Add the without-control extension to the builder.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $builder
+     * @param \Illuminate\Database\Eloquent\Builder $builder
+     *
      * @return void
      */
     protected function addWithoutControl(Builder $builder)
@@ -68,4 +70,4 @@ protected function addWithoutControl(Builder $builder)
             return $builder->withoutGlobalScope($this);
         });
     }
-}
+}

src/Controls/Concerns/HasPolicy.php

@@ -2,26 +2,24 @@
 
 namespace Lomkit\Access\Controls\Concerns;
 
-use http\Exception\RuntimeException;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Http\Request;
 use Illuminate\Support\Str;
-use Lomkit\Access\Exceptions\QueryNotImplemented;
 use Lomkit\Access\Perimeters\Perimeter;
 use Lomkit\Access\Queries\Query;
 
 trait HasPolicy
 {
-    public function runPolicy(string $method, Model $user, Model $model) {
+    public function runPolicy(string $method, Model $user, Model $model)
+    {
         $concernedPerimeters = $this->getConcernedPerimeters();
 
         return $concernedPerimeters->contains(function (Perimeter $concernedPerimeter) use ($method, $model, $user) {
             return $this->policy($concernedPerimeter, $method, $user, $model);
         });
     }
 
-    public function policy(Perimeter $perimeter, string $method, Model $user, Model $model) : bool {
+    public function policy(Perimeter $perimeter, string $method, Model $user, Model $model): bool
+    {
         // @TODO: for the "shared" example, implement the fact that for the query you can add multiple query
         $policyMethod = Str::camel($perimeter->name).'Policy';
 
@@ -31,4 +29,4 @@ public function policy(Perimeter $perimeter, string $method, Model $user, Model
 
         return false;
     }
-}
+}

src/Controls/Concerns/HasQuery.php

@@ -2,44 +2,46 @@
 
 namespace Lomkit\Access\Controls\Concerns;
 
-use http\Exception\RuntimeException;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Lomkit\Access\Exceptions\QueryNotImplemented;
 use Lomkit\Access\Perimeters\Perimeter;
-use Lomkit\Access\Queries\Query;
 
 trait HasQuery
 {
-    public function runQuery(Builder $query) {
+    public function runQuery(Builder $query)
+    {
         if (($concernedPerimeters = $this->getConcernedPerimeters())->isNotEmpty()) {
             return tap($query, function (Builder $query) use ($concernedPerimeters) {
-                 foreach ($concernedPerimeters as $concernedPerimeter) {
-                     $this->query($concernedPerimeter, $query);
-                     if ($concernedPerimeter->final()) {
-                         return;
-                     }
-                 }
+                foreach ($concernedPerimeters as $concernedPerimeter) {
+                    $this->query($concernedPerimeter, $query);
+                    if ($concernedPerimeter->final()) {
+                        return;
+                    }
+                }
             });
-            return ;
+
+            return;
         }
 
         return $this->fallbackQuery($query);
     }
 
-    public function query(Perimeter $perimeter, Builder $query) : Builder {
+    public function query(Perimeter $perimeter, Builder $query): Builder
+    {
         $queryMethod = Str::camel($perimeter->name).'Query';
 
         if (method_exists($this, $queryMethod)) {
             $this->$queryMethod($query);
+
             return $query;
         }
 
         throw new QueryNotImplemented(sprintf('The %s method is not implemented in the %s class', $queryMethod, get_class($this)));
     }
 
-    public function fallbackQuery(Builder $query) : Builder {
+    public function fallbackQuery(Builder $query): Builder
+    {
         return $query;
     }
-}
+}

src/Controls/Control.php

@@ -2,7 +2,6 @@
 
 namespace Lomkit\Access\Controls;
 
-use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Lomkit\Access\Controls\Concerns\HasPolicy;
@@ -12,7 +11,8 @@
 
 class Control
 {
-    use HasQuery, HasPolicy;
+    use HasQuery;
+    use HasPolicy;
 
     protected Perimeters $perimeters;
 
@@ -23,7 +23,8 @@ public function __construct(Perimeters $perimeters)
         $this->perimeters = $perimeters;
     }
 
-    public function should(Perimeter $perimeter): bool {
+    public function should(Perimeter $perimeter): bool
+    {
         $perimeterMethod = 'should'.Str::studly($perimeter->name);
 
         if (method_exists($this, $perimeterMethod)) {
@@ -33,7 +34,8 @@ public function should(Perimeter $perimeter): bool {
         return false;
     }
 
-    public function getConcernedPerimeters(): Collection {
+    public function getConcernedPerimeters(): Collection
+    {
         if (isset($this->concernedPerimeters)) {
             return $this->concernedPerimeters;
         }
@@ -48,4 +50,4 @@ public function getConcernedPerimeters(): Collection {
 
         return $this->concernedPerimeters = $perimeters;
     }
-}
+}

src/Exceptions/QueryNotImplemented.php

@@ -4,5 +4,4 @@
 
 class QueryNotImplemented extends \RuntimeException
 {
-
-}
+}

src/Perimeters/Perimeter.php

@@ -2,8 +2,6 @@
 
 namespace Lomkit\Access\Perimeters;
 
-use Illuminate\Http\Request;
-use Illuminate\Routing\Matching\MethodValidator;
 use Illuminate\Support\Str;
 
 class Perimeter
@@ -63,10 +61,11 @@ public function final(): int
      * Determine if the perimeter matches a given name.
      *
      * @param string $name
+     *
      * @return bool
      */
     public function matches(string $name)
     {
         return $name === $this->name();
     }
-}
+}

src/Perimeters/PerimeterCollection.php

@@ -23,7 +23,8 @@ class PerimeterCollection
     /**
      * Add a Perimeter instance to the collection.
      *
-     * @param  Perimeter  $perimeter
+     * @param Perimeter $perimeter
+     *
      * @return Perimeter
      */
     public function add(Perimeter $perimeter): PerimeterCollection
@@ -36,7 +37,8 @@ public function add(Perimeter $perimeter): PerimeterCollection
     /**
      * Add the given perimeter to the arrays of perimeters.
      *
-     * @param  Perimeter $perimeter
+     * @param Perimeter $perimeter
+     *
      * @return void
      */
     protected function addToCollections(Perimeter $perimeter)
@@ -52,10 +54,11 @@ protected function addToCollections(Perimeter $perimeter)
     /**
      * Find the first perimeter matching a given name.
      *
-     * @param  string $name
-     * @return Perimeter
+     * @param string $name
      *
      * @throws \RuntimeException
+     *
+     * @return Perimeter
      */
     public function match(string $name)
     {
@@ -69,8 +72,9 @@ public function match(string $name)
     /**
      * Determine if a perimeter in the array matches the name.
      *
-     * @param  Perimeter[]  $perimeters
-     * @param  \Illuminate\Http\Request  $request
+     * @param Perimeter[]              $perimeters
+     * @param \Illuminate\Http\Request $request
+     *
      * @return Perimeter|null
      */
     protected function matchAgainstPerimeters(array $perimeters, string $name)
@@ -83,15 +87,16 @@ protected function matchAgainstPerimeters(array $perimeters, string $name)
     /**
      * Handle the matched perimeter.
      *
-     * @param  string  $name
-     * @param  Perimeter|null  $perimeter
-     * @return Perimeter
+     * @param string         $name
+     * @param Perimeter|null $perimeter
      *
      * @throws \RuntimeException
+     *
+     * @return Perimeter
      */
     protected function handleMatchedPerimeter(string $name, $perimeter)
     {
-        if (! is_null($perimeter)) {
+        if (!is_null($perimeter)) {
             return $perimeter;
         }
 
@@ -105,6 +110,7 @@ protected function handleMatchedPerimeter(string $name, $perimeter)
      * Get perimeters from the collection by priority.
      *
      * @param int|null $priority
+     *
      * @return Perimeter[]
      */
     public function get(int $priority = null)
@@ -121,4 +127,4 @@ public function getPerimeters()
     {
         return array_values($this->allPerimeters);
     }
-}
+}

src/Perimeters/Perimeters.php

@@ -23,13 +23,14 @@ class Perimeters
      */
     public function __construct()
     {
-        $this->perimeters = new PerimeterCollection;
+        $this->perimeters = new PerimeterCollection();
     }
 
     /**
      * Add a route to the underlying route collection.
      *
      * @param Perimeter $perimeter
+     *
      * @return PerimeterCollection
      */
     public function addPerimeter(Perimeter $perimeter): PerimeterCollection
@@ -40,7 +41,8 @@ public function addPerimeter(Perimeter $perimeter): PerimeterCollection
     /**
      * Find the perimeter matching a given name.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return Perimeter
      */
     public function findPerimeter(string $name)
@@ -63,7 +65,8 @@ public function getPerimeters()
     /**
      * Register all the perimeter classes in the given directory.
      *
-     * @param  string  $directory
+     * @param string $directory
+     *
      * @return void
      */
     public function perimetersIn($directory)
@@ -72,17 +75,17 @@ public function perimetersIn($directory)
 
         foreach ((new Finder())->in($directory)->files() as $perimeter) {
             $perimeter = $namespace.str_replace(
-                    ['/', '.php'],
-                    ['\\', ''],
-                    Str::after($perimeter->getPathname(), app_path().DIRECTORY_SEPARATOR)
-                );
+                ['/', '.php'],
+                ['\\', ''],
+                Str::after($perimeter->getPathname(), app_path().DIRECTORY_SEPARATOR)
+            );
 
             if (
                 is_subclass_of($perimeter, \Lomkit\Access\Perimeters\Perimeter::class) &&
-                ! (new ReflectionClass($perimeter))->isAbstract()
+                !(new ReflectionClass($perimeter))->isAbstract()
             ) {
                 $this->addPerimeter($perimeter);
             }
         }
     }
-}
+}