Apply fixes from StyleCI

database/migrations/2017_08_04_141149_create_restrictions_table.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use DtKt\Restrictions\Enum\RestrictionType;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 /**
  * Class CreateRestrictionsTable.
@@ -21,15 +21,15 @@ public function up()
     {
         Schema::create('restrictions', function (Blueprint $table) {
             $table->increments('id');
-            $table->string("entity_type")->charset('latin1');
-            $table->unsignedBigInteger("entity_id");
+            $table->string('entity_type')->charset('latin1');
+            $table->unsignedBigInteger('entity_id');
             $table->string('restriction')->charset('latin1');
             $table->unsignedTinyInteger('type')->default(RestrictionType::DENY);
             $table->boolean('enabled');
             $table->timestamps();
 
             $table->index(['restriction', 'enabled', 'type']);
-            $table->index(["entity_type", "entity_id"]);
+            $table->index(['entity_type', 'entity_id']);
         });
     }
 

database/migrations/2017_08_04_141647_create_restrictions_rules_table.php.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 /**
  * Class CreateRestrictionsRulesTable.

src/Entities/Restriction.php

@@ -5,11 +5,11 @@
 namespace DKulyk\Restrictions\Entities;
 
 use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Relations\Relation;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 /**
  * Class Restriction.

src/Restrictions.php

@@ -8,7 +8,7 @@
 
 /**
  * Class Restrictions.
- * 
+ *
  * @method static array pushRestrictions(array $restrictions, bool $merge = true) Push restrictions to scope and returns new restrictions.
  * @method static array popRestrictions() Pop restrictions from scope and returns them.
  * @method static void where(array $restrictions, $merge = true, callable $callback = null)

src/RestrictionsFactory.php

@@ -70,4 +70,4 @@ public function getRestrictions(): array
     {
         return end($this->restrictions) ?: [];
     }
-}
+}

src/RestrictionsScope.php

@@ -4,12 +4,15 @@
 
 namespace DKulyk\Restrictions;
 
-use ReflectionMethod;
-use Illuminate\Contracts\Support\Arrayable;
 use DKulyk\Restrictions\Entities\Restriction;
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
-use Illuminate\Database\Eloquent\{Model, Scope, Builder, Collection};
+use Illuminate\Database\Eloquent\Scope;
 use Illuminate\Database\Query\Builder as Query;
+use ReflectionMethod;
 
 /**
  * Class RestrictionsScope.
@@ -77,7 +80,6 @@ private function applyRestrictions(Builder $builder, Model $model, array $restri
 
         $builder->where(function (Builder $builder) use ($model, $restrictions, $morphMap, $addHasWhere) {
             foreach ($restrictions as $restriction => $keys) {
-
                 $restrictionModel = Relation::getMorphedModel($restriction) ?? $restriction;
                 if (! in_array($restrictionModel, $this->allowedRestrictions)) {
                     continue;
@@ -104,7 +106,6 @@ private function applyRestrictions(Builder $builder, Model $model, array $restri
                     Relation::getMorphedModel($restriction),
                 ]);
 
-
                 //Deny query
                 $hasQuery = $relation->getRelationExistenceQuery($relation->getRelated()->newQuery(), $builder);
 
@@ -115,10 +116,10 @@ private function applyRestrictions(Builder $builder, Model $model, array $restri
                     ->where('restriction', $restrictionModel)
                     ->where('type', Restriction::DENY)
                     ->where('enabled', true)
-                    ->whereExists(function(Query $query) use ($rules,$keys){
+                    ->whereExists(function (Query $query) use ($rules,$keys) {
                         $query->from($rules->getTable())
                             ->whereColumn($rules->getQualifiedParentKeyName(), '=', $rules->getQualifiedForeignPivotKeyName())
-                            ->wherein($rules->getQualifiedRelatedPivotKeyName(), (array)$keys);
+                            ->wherein($rules->getQualifiedRelatedPivotKeyName(), (array) $keys);
                     });
 
                 $addHasWhere->invoke($builder, $hasQuery, $relation, '<', 1, 'and');
@@ -132,10 +133,10 @@ private function applyRestrictions(Builder $builder, Model $model, array $restri
                     ->where('restriction', $restrictionModel)
                     ->where('type', Restriction::ALLOW)
                     ->where('enabled', true)
-                    ->whereNotExists(function(Query $query) use ($rules,$keys){
+                    ->whereNotExists(function (Query $query) use ($rules,$keys) {
                         $query->from($rules->getTable())
                             ->whereColumn($rules->getQualifiedParentKeyName(), '=', $rules->getQualifiedForeignPivotKeyName())
-                            ->wherein($rules->getQualifiedRelatedPivotKeyName(), (array)$keys);
+                            ->wherein($rules->getQualifiedRelatedPivotKeyName(), (array) $keys);
                     });
 
                 $addHasWhere->invoke($builder, $hasQuery, $relation, '<', 1, 'and');

src/RestrictionsServiceProvider.php

@@ -4,15 +4,14 @@
 
 namespace DKulyk\Restrictions;
 
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\ServiceProvider;
 
 /**
  * Class RestrictionsServiceProvider.
  */
 final class RestrictionsServiceProvider extends ServiceProvider
 {
-
     public function register()
     {
         $this->app->singleton('eloquent-restrictions', function () {
@@ -45,7 +44,7 @@ public function boot()
     private function registerMigrations()
     {
         if ($this->app->runningInConsole()) {
-            $this->loadMigrationsFrom(dirname(__DIR__) . '/database/migrations');
+            $this->loadMigrationsFrom(dirname(__DIR__).'/database/migrations');
         }
     }
 }