Apply fixes from StyleCI (#72)

Tucker-Eric · Jul 4, 2018 · 693bba9 · 693bba9
1 parent 5583402
commit 693bba9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/ModelFilter.php b/src/ModelFilter.php
@@ -2,8 +2,8 @@
 
 namespace EloquentFilter;
 
-use Illuminate\Database\Eloquent\Builder as QueryBuilder;
 use Illuminate\Database\Eloquent\Relations\Relation;
+use Illuminate\Database\Eloquent\Builder as QueryBuilder;
 
 /**
  * @mixin QueryBuilder
@@ -259,7 +259,7 @@ public function getRelationConstraints($relation)
 
     public function callRelatedLocalSetup($related, $query)
     {
-        if (method_exists($this, $method = camel_case($related) . 'Setup')) {
+        if (method_exists($this, $method = camel_case($related).'Setup')) {
             $this->{$method}($query);
         }
     }
@@ -557,27 +557,28 @@ public function methodIsBlacklisted($method)
      */
     public function methodIsCallable($method)
     {
-        return !$this->methodIsBlacklisted($method) &&
+        return ! $this->methodIsBlacklisted($method) &&
             method_exists($this, $method) &&
-            !method_exists(ModelFilter::class, $method);
+            ! method_exists(ModelFilter::class, $method);
     }
 
-
     /**
      * Register paginate and simplePaginate macros on relations
-     * BelongsToMany overrides the QueryBuilder's paginate to append the pivot
+     * BelongsToMany overrides the QueryBuilder's paginate to append the pivot.
      */
     private function registerMacros()
     {
-        if (!Relation::hasMacro('paginateFilter') && !Relation::hasMacro('simplePaginateFilter')) {
+        if (! Relation::hasMacro('paginateFilter') && ! Relation::hasMacro('simplePaginateFilter')) {
             Relation::macro('paginateFilter', function () {
                 $paginator = call_user_func_array([$this, 'paginate'], func_get_args());
                 $paginator->appends($this->getRelated()->filtered);
+
                 return $paginator;
             });
             Relation::macro('simplePaginateFilter', function () {
                 $paginator = call_user_func_array([$this, 'simplePaginate'], func_get_args());
                 $paginator->appends($this->getRelated()->filtered);
+
                 return $paginator;
             });
         }

diff --git a/tests/ModelFilterChildTest.php b/tests/ModelFilterChildTest.php
@@ -87,8 +87,8 @@ protected function dbSetup()
                     'driver'   => 'sqlite',
                     'database' => ':memory:',
                     'prefix'   => '',
-                ]
-            ]
+                ],
+            ],
         ];
         $container = m::mock(\Illuminate\Container\Container::class);
         $container->shouldReceive('bound')->andReturn(false);
@@ -122,10 +122,10 @@ protected function dbSetup()
         $clients = [['name' => 'one'], ['name' => 'two'], ['name' => 'three'], ['name' => 'four']];
         foreach ($clients as $index => $data) {
             $client = Client::create($data);
-            $user = User::create(['name' => 'Client' . $index]);
+            $user = User::create(['name' => 'Client'.$index]);
             $user->clients()->save($client);
             $client->managers()->save($user);
-            $otherUser = User::create(['name' => 'Client' . ++$index]);
+            $otherUser = User::create(['name' => 'Client'.++$index]);
             $client->managers()->save($otherUser);
         }
     }