Apply fixes from StyleCI (#22)

rasmuscnielsen · web-flow · commit 593b714f8070 · 2022-01-26T13:39:51.000+01:00
diff --git a/src/Builder/Builder.php b/src/Builder/Builder.php
@@ -32,7 +32,7 @@ class Builder
     /**
      * Builder constructor.
      *
-     * @param Model $model
+     * @param  Model  $model
      */
     public function __construct(Model $model)
     {
@@ -47,7 +47,6 @@ public function __construct(Model $model)
      *
      * @param $method
      * @param $parameters
-     *
      * @return Builder
      */
     public function __call($method, $parameters)
@@ -77,8 +76,7 @@ public function __call($method, $parameters)
     /**
      * @param $model
      * @param $name
-     * @param array ...$args
-     *
+     * @param  array  ...$args
      * @return Builder
      */
     public static function make($model, $name, ...$args)
@@ -100,8 +98,7 @@ public static function registerConstraint($class)
 
     /**
      * @param $name
-     * @param array ...$args
-     *
+     * @param  array  ...$args
      * @return mixed
      */
     public function callScopeFunction($name, ...$args)
diff --git a/src/Builder/Stack.php b/src/Builder/Stack.php
@@ -21,8 +21,8 @@ public function __construct()
     }
 
     /**
-     * @param QueryConstraint $constraint
-     * @param bool $or
+     * @param  QueryConstraint  $constraint
+     * @param  bool  $or
      * @return Stack
      */
     public function apply(QueryConstraint $constraint, $or = false)
@@ -61,7 +61,7 @@ protected function push($constraint)
     }
 
     /**
-     * @param Stack $stack
+     * @param  Stack  $stack
      * @param $model
      * @return bool
      */
@@ -73,7 +73,7 @@ public function check($model)
     }
 
     /**
-     * @param Collection $track
+     * @param  Collection  $track
      * @param $model
      * @return bool
      */
diff --git a/src/Builder/Where.php b/src/Builder/Where.php
@@ -25,7 +25,7 @@ class Where implements QueryConstraint
     /**
      * Where constructor.
      *
-     * @param array ...$args
+     * @param  array  ...$args
      */
     public function __construct(...$args)
     {
@@ -34,7 +34,6 @@ public function __construct(...$args)
 
     /**
      * @param $model
-     *
      * @return bool
      */
     public function check($model)
@@ -85,8 +84,7 @@ protected function isSubQuery()
     /**
      * @param $property
      * @param $operator
-     * @param null $value
-     *
+     * @param  null  $value
      * @return array
      */
     protected function normalize($property, $operator = null, $value = null)
diff --git a/src/Builder/WhereBetween.php b/src/Builder/WhereBetween.php
@@ -33,7 +33,6 @@ public function __construct($property, $range)
 
     /**
      * @param $model
-     *
      * @return bool
      */
     public function check($model)
diff --git a/src/Builder/WhereColumn.php b/src/Builder/WhereColumn.php
@@ -25,9 +25,9 @@ class WhereColumn implements QueryConstraint
     /**
      * WhereColumn constructor.
      *
-     * @param mixed $property
-     * @param mixed $operator
-     * @param mixed $propertyToCompare
+     * @param  mixed  $property
+     * @param  mixed  $operator
+     * @param  mixed  $propertyToCompare
      */
     public function __construct($property, $operator, $propertyToCompare)
     {
@@ -38,7 +38,6 @@ public function __construct($property, $operator, $propertyToCompare)
 
     /**
      * @param $model
-     *
      * @return bool
      */
     public function check($model)
diff --git a/src/Builder/WhereIn.php b/src/Builder/WhereIn.php
@@ -33,7 +33,6 @@ public function __construct($property, $haystack)
 
     /**
      * @param $model
-     *
      * @return bool
      */
     public function check($model)
diff --git a/src/Builder/WhereNotBetween.php b/src/Builder/WhereNotBetween.php
@@ -6,7 +6,6 @@ class WhereNotBetween extends WhereBetween
 {
     /**
      * @param $model
-     *
      * @return bool
      */
     public function check($model)
diff --git a/src/Builder/WhereNotIn.php b/src/Builder/WhereNotIn.php
@@ -6,7 +6,6 @@ class WhereNotIn extends WhereIn
 {
     /**
      * @param $model
-     *
      * @return bool
      */
     public function check($model)
diff --git a/src/Builder/WhereNotNull.php b/src/Builder/WhereNotNull.php
@@ -23,7 +23,6 @@ public function __construct($property)
 
     /**
      * @param $model
-     *
      * @return bool
      */
     public function check($model)
diff --git a/src/Builder/WhereNull.php b/src/Builder/WhereNull.php
@@ -23,7 +23,6 @@ public function __construct($property)
 
     /**
      * @param $model
-     *
      * @return bool
      */
     public function check($model)
diff --git a/src/Contracts/QueryConstraint.php b/src/Contracts/QueryConstraint.php
@@ -6,7 +6,6 @@ interface QueryConstraint
 {
     /**
      * @param $model
-     *
      * @return mixed
      */
     public function check($model);
diff --git a/src/QueryKit.php b/src/QueryKit.php
@@ -10,8 +10,7 @@ trait QueryKit
      * Check if a model passes the given scope.
      *
      * @param $name
-     * @param array ...$args
-     *
+     * @param  array  ...$args
      * @return mixed
      */
     public function passesScope($name, ...$args)
@@ -23,8 +22,7 @@ public function passesScope($name, ...$args)
      * Check if a model fails the given scope.
      *
      * @param $name
-     * @param array ...$args
-     *
+     * @param  array  ...$args
      * @return mixed
      */
     public function failsScope($name, ...$args)
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -16,7 +16,7 @@ public function setUp(): void
     }
 
     /**
-     * @param \Illuminate\Foundation\Application $app
+     * @param  \Illuminate\Foundation\Application  $app
      * @return array
      */
     protected function getPackageProviders($app)
@@ -27,7 +27,7 @@ protected function getPackageProviders($app)
     }
 
     /**
-     * @param \Illuminate\Foundation\Application $app
+     * @param  \Illuminate\Foundation\Application  $app
      */
     protected function getEnvironmentSetUp($app)
     {
@@ -40,7 +40,7 @@ protected function getEnvironmentSetUp($app)
     }
 
     /**
-     * @param \Illuminate\Foundation\Application $app
+     * @param  \Illuminate\Foundation\Application  $app
      */
     protected function setUpDatabase($app)
     {
@@ -54,8 +54,8 @@ protected function setUpDatabase($app)
     }
 
     /**
-     * @param null $name
-     * @param null $age
+     * @param  null  $name
+     * @param  null  $age
      * @return TestModel
      */
     protected function create($name = null, $age = null)
diff --git a/tests/TestModel.php b/tests/TestModel.php
@@ -24,7 +24,7 @@ class TestModel extends \Illuminate\Database\Eloquent\Model
     ];
 
     /**
-     * @param Builder $query
+     * @param  Builder  $query
      * @param $name
      * @return Builder
      */
@@ -34,7 +34,7 @@ public function scopeNameIs($query, $name)
     }
 
     /**
-     * @param Builder $query
+     * @param  Builder  $query
      * @param $name
      * @return Builder
      */
@@ -44,7 +44,7 @@ public function scopeNameLike($query, $name)
     }
 
     /**
-     * @param Builder $query
+     * @param  Builder  $query
      * @param $names
      * @return Builder
      */
@@ -54,7 +54,7 @@ public function scopeNameIn($query, $names)
     }
 
     /**
-     * @param Builder $query
+     * @param  Builder  $query
      * @param $operator
      * @param $age
      * @return Builder
@@ -65,7 +65,7 @@ public function scopeAge($query, $operator, $age)
     }
 
     /**
-     * @param Builder $query
+     * @param  Builder  $query
      * @return Builder
      */
     public function scopeHasAge($query)
@@ -74,7 +74,7 @@ public function scopeHasAge($query)
     }
 
     /**
-     * @param Builder $query
+     * @param  Builder  $query
      * @return Builder
      */
     public function scopeNoAge($query)
@@ -83,7 +83,7 @@ public function scopeNoAge($query)
     }
 
     /**
-     * @param Builder $query
+     * @param  Builder  $query
      * @return Builder
      */
     public function scopeOld($query)
@@ -92,7 +92,7 @@ public function scopeOld($query)
     }
 
     /**
-     * @param Builder $query
+     * @param  Builder  $query
      * @return Builder
      */
     public function scopeJaneOrJohn($query)
@@ -102,7 +102,7 @@ public function scopeJaneOrJohn($query)
     }
 
     /**
-     * @param Builder $query
+     * @param  Builder  $query
      * @return Builder
      */
     public function scopeHasNameOrAge($query)
@@ -111,7 +111,7 @@ public function scopeHasNameOrAge($query)
     }
 
     /**
-     * @param Builder $query
+     * @param  Builder  $query
      * @return Builder
      */
     public function scopeMissingNameOrAge($query)
diff --git a/tests/Unit/BehaviorTest.php b/tests/Unit/BehaviorTest.php
@@ -9,7 +9,8 @@ class BehaviorTest extends TestCase
 {
     public function test_statements_are_bound_to_the_object()
     {
-        $class = new class extends TestModel {
+        $class = new class extends TestModel
+        {
             public function scopeJohnSenior($query)
             {
                 // This should take effect even if we don't return it to match Laravel behavior

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ class WhereNotBetween extends WhereBetween`
`6`	`6`	`{`
`7`	`7`	`/**`
`8`	`8`	`* @param $model`
`9`		`- *`
`10`	`9`	`* @return bool`
`11`	`10`	`*/`
`12`	`11`	`public function check($model)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ class WhereNotIn extends WhereIn`
`6`	`6`	`{`
`7`	`7`	`/**`
`8`	`8`	`* @param $model`
`9`		`- *`
`10`	`9`	`* @return bool`
`11`	`10`	`*/`
`12`	`11`	`public function check($model)`