chore: updated for laravel 11

oniice · oniice · commit 932736fa7caf · 2024-11-19T22:07:00.000Z
Signed-off-by: Fred Myerscough &lt;oniice@gmail.com&gt;
diff --git a/composer.json b/composer.json
@@ -27,13 +27,13 @@
     }
   ],
   "require": {
-    "php": "^8.1"
+    "php": "^8.2"
   },
   "require-dev": {
-    "laravel/framework": "^10.0",
-    "mockery/mockery": "^1.2",
-    "orchestra/testbench": "^8.0",
-    "phpunit/phpunit": "^10.0"
+    "laravel/framework": "^11",
+    "mockery/mockery": "^1.6",
+    "orchestra/testbench": "^v9.6.0",
+    "phpunit/phpunit": "^11.4.3"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/Clause/BeginsWithClause.php b/src/Clause/BeginsWithClause.php
@@ -10,11 +10,11 @@ class BeginsWithClause extends AbstractClause
     /**
      * {@inheritdoc}
      */
-    public function filter(Builder $builder, $value, $column)
+    public function filter(Builder $builder, $value, $column): Builder
     {
         if (!empty($value)) {
             $values = is_array($value) ? $value : [$value];
-            collect($values)->each(static function ($value) use ($column, $builder) : void {
+            collect($values)->each(static function (string $value) use ($column, $builder) : void {
                 $builder->where($column, 'like', $value . '%');
             });
         }
diff --git a/src/Clause/ContainsClause.php b/src/Clause/ContainsClause.php
@@ -10,11 +10,11 @@ class ContainsClause extends AbstractClause
     /**
      * {@inheritdoc}
      */
-    public function filter(Builder $builder, $value, $column)
+    public function filter(Builder $builder, $value, $column): Builder
     {
         if (!empty($value)) {
             $values = is_array($value) ? $value : [$value];
-            collect($values)->each(static function ($value) use ($column, $builder) : void {
+            collect($values)->each(static function (string $value) use ($column, $builder) : void {
                 $builder->where($column, 'like', '%' . $value . '%');
             });
         }
diff --git a/src/Clause/DoesNotEqualClause.php b/src/Clause/DoesNotEqualClause.php
@@ -10,7 +10,7 @@ class DoesNotEqualClause extends AbstractClause
     /**
      * {@inheritdoc}
      */
-    public function filter(Builder $builder, $value, $column)
+    public function filter(Builder $builder, $value, $column): Builder
     {
         if (!empty($value)) {
             $values = is_array($value) ? $value : [$value];
diff --git a/src/Clause/EndsWithClause.php b/src/Clause/EndsWithClause.php
@@ -10,11 +10,11 @@ class EndsWithClause extends AbstractClause
     /**
      * {@inheritdoc}
      */
-    public function filter(Builder $builder, $value, $column)
+    public function filter(Builder $builder, $value, $column): Builder
     {
         if (!empty($value)) {
             $values = is_array($value) ? $value : [$value];
-            collect($values)->each(static function ($value) use ($column, $builder) : void {
+            collect($values)->each(static function (string $value) use ($column, $builder) : void {
                 $builder->where($column, 'like', '%' . $value);
             });
         }
diff --git a/src/Clause/EqualsClause.php b/src/Clause/EqualsClause.php
@@ -10,7 +10,7 @@ class EqualsClause extends AbstractClause
     /**
      * {@inheritdoc}
      */
-    public function filter(Builder $builder, $value, $column)
+    public function filter(Builder $builder, $value, $column): Builder
     {
         if (!empty($value)) {
             $values = is_array($value) ? $value : [$value];
diff --git a/src/Clause/GreaterThanClause.php b/src/Clause/GreaterThanClause.php
@@ -10,7 +10,7 @@ class GreaterThanClause extends AbstractClause
     /**
      * {@inheritdoc}
      */
-    public function filter(Builder $builder, $value, $column)
+    public function filter(Builder $builder, $value, $column): Builder
     {
         if (!empty($value)) {
             $values = is_array($value) ? $value : [$value];
diff --git a/src/Clause/GreaterThanOrEqualsClause.php b/src/Clause/GreaterThanOrEqualsClause.php
@@ -10,7 +10,7 @@ class GreaterThanOrEqualsClause extends AbstractClause
     /**
      * {@inheritdoc}
      */
-    public function filter(Builder $builder, $value, $column)
+    public function filter(Builder $builder, $value, $column): Builder
     {
         if (!empty($value)) {
             $values = is_array($value) ? $value : [$value];
diff --git a/src/Clause/IsInClause.php b/src/Clause/IsInClause.php
@@ -10,7 +10,7 @@ class IsInClause extends AbstractClause
     /**
      * {@inheritdoc}
      */
-    public function filter(Builder $builder, $value, $column)
+    public function filter(Builder $builder, $value, $column): Builder
     {
         if (!empty($value)) {
             $values = is_array($value) ? $value : [$value];
diff --git a/src/Clause/IsNotInClause.php b/src/Clause/IsNotInClause.php
@@ -10,7 +10,7 @@ class IsNotInClause extends AbstractClause
     /**
      * {@inheritdoc}
      */
-    public function filter(Builder $builder, $value, $column)
+    public function filter(Builder $builder, $value, $column): Builder
     {
         if (!empty($value)) {
             $values = is_array($value) ? $value : [$value];
diff --git a/src/Clause/LessThanClause.php b/src/Clause/LessThanClause.php
@@ -10,7 +10,7 @@ class LessThanClause extends AbstractClause
     /**
      * {@inheritdoc}
      */
-    public function filter(Builder $builder, $value, $column)
+    public function filter(Builder $builder, $value, $column): Builder
     {
         if (!empty($value)) {
             $values = is_array($value) ? $value : [$value];
diff --git a/src/Clause/LessThanOrEqualsClause.php b/src/Clause/LessThanOrEqualsClause.php
@@ -10,7 +10,7 @@ class LessThanOrEqualsClause extends AbstractClause
     /**
      * {@inheritdoc}
      */
-    public function filter(Builder $builder, $value, $column)
+    public function filter(Builder $builder, $value, $column): Builder
     {
         if (!empty($value)) {
             $values = is_array($value) ? $value : [$value];
diff --git a/src/Clause/OrEqualsClause.php b/src/Clause/OrEqualsClause.php
@@ -10,7 +10,7 @@ class OrEqualsClause extends AbstractClause
     /**
      * {@inheritdoc}
      */
-    public function filter(Builder $builder, $value, $column)
+    public function filter(Builder $builder, $value, $column): Builder
     {
         if (!empty($value)) {
             $values = is_array($value) ? $value : [$value];
diff --git a/src/Filter.php b/src/Filter.php
@@ -106,13 +106,13 @@ public function filter(): Filter
 
             $defaultFilter = $parameterConf->defaultMethod();
 
-            if (empty($defaultFilter)) {
+            if ($defaultFilter === null || $defaultFilter === '' || $defaultFilter === '0') {
                 $defaultFilter = $this->defaultFilter;
             }
 
             if (count($defaultFilters) > 1) {
                 $defaultFilter = $parameterConf->multiMethod();
-                if (empty($defaultFilter)) {
+                if ($defaultFilter === null || $defaultFilter === '' || $defaultFilter === '0') {
                     $defaultFilter = $this->defaultMultiFilter;
                 }
             }
@@ -221,9 +221,11 @@ public function order(): Filter
                 if (is_int($key)) {
                     $direction = $sortBy->get($value) ?? $defaultDirection;
                     return [$value => $direction];
-                } elseif (is_array($value)) {
+                }
+                if (is_array($value)) {
                     return collect($value)->mapWithKeys(static fn($value): array => [$value => $key])->toArray();
-                } else {
+                }
+                else {
                     return [$value => $key];
                 }
             })->toArray();
@@ -361,9 +363,9 @@ private function prepareValues(mixed $values, Parameter $parameter): array
         $filterValues = array_merge($indexedValues, $namedValues);
 
         // if there are any disabled filter clauses remove them
-        if (!empty($disabled = $parameter->disabled())) {
+        if (($disabled = $parameter->disabled()) !== []) {
             // TODO remove need for collect
-            $filterValues = collect($filterValues)->except($disabled)->all();
+            return collect($filterValues)->except($disabled)->all();
         }
 
         return $filterValues;
@@ -372,7 +374,7 @@ private function prepareValues(mixed $values, Parameter $parameter): array
     protected function transmuteValues(array $values, Parameter $parameter)
     {
         if (($transmuteClass = $parameter->transmuteWith()) && (class_exists($transmuteClass) && ($transmute = app($transmuteClass)) instanceof TransmuteInterface)) {
-            $values = array_map(static function ($filerValue) use ($transmute) {
+            return array_map(static function ($filerValue) use ($transmute) {
                 $property = new Property($filerValue);
                 $transmute->transmute($property);
                 return $property->getValue();
diff --git a/src/FilterBuilder.php b/src/FilterBuilder.php
@@ -27,7 +27,7 @@ public function __construct(private readonly Request $request, private readonly
      * @throws BuilderNotFoundException
      * @throws BuilderNotSetException
      */
-    private function setBuilder($builderOrModel)
+    private function setBuilder($builderOrModel): void
     {
         if (empty($builderOrModel)) {
             throw new BuilderNotSetException();
diff --git a/src/Paginated.php b/src/Paginated.php
@@ -21,8 +21,8 @@ public function getMeta(): array
             'total' => $this->total(),
             'hasMorePage' => $this->hasMorePages(),
             'currentPageUrl' => urldecode($this->url($this->currentPage())),
-            'previousPageUrl' => urldecode($this->previousPageUrl()),
-            'nextPageUrl' => urldecode($this->nextPageUrl()),
+            'previousPageUrl' => urldecode((string) $this->previousPageUrl()),
+            'nextPageUrl' => urldecode((string) $this->nextPageUrl()),
             'currentPage' => $this->currentPage(),
             'lastPage' => $this->lastPage(),
             'perPage' => $this->perPage(),
diff --git a/src/Strategies/Property.php b/src/Strategies/Property.php
@@ -28,10 +28,7 @@ public function getValue()
         return $this->value;
     }
 
-    /**
-     * @return Property
-     */
-    public function setValue(mixed $value)
+    public function setValue(mixed $value): static
     {
         $this->value = $value;
 
diff --git a/src/Strategies/Strategy.php b/src/Strategies/Strategy.php
@@ -92,11 +92,15 @@ private function compile(): void
         $parameters = $this->config() ?? [];
 
         foreach ($parameters as $config) {
-            if (isset($config['aliases']) && is_array($config['aliases'])) {
-                array_walk($config['aliases'], static function ($alias) use (&$parameters, $config) {
-                    $parameters[$alias] = $config;
-                });
+            if (!isset($config['aliases'])) {
+                continue;
             }
+            if (!is_array($config['aliases'])) {
+                continue;
+            }
+            array_walk($config['aliases'], static function ($alias) use (&$parameters, $config): void {
+                $parameters[$alias] = $config;
+            });
         }
 
         foreach ($parameters as $parameter => $config) {
diff --git a/src/Stubs/Clause.php b/src/Stubs/Clause.php
@@ -11,7 +11,7 @@ class DummyClass extends AbstractClause
     /**
      * {@inheritdoc}
      */
-    public function filter(Builder $builder, $value, $column)
+    public function filter(Builder $builder, $value, $column): Builder
     {
         return $builder;
     }
diff --git a/tests/ClauseTest.php b/tests/ClauseTest.php
diff --git a/tests/FilterBuilderTest.php b/tests/FilterBuilderTest.php
diff --git a/tests/FilterTest.php b/tests/FilterTest.php
diff --git a/tests/ParameterTest.php b/tests/ParameterTest.php
diff --git a/tests/QueryTest.php b/tests/QueryTest.php
diff --git a/tests/StrategyConfigTest.php b/tests/StrategyConfigTest.php
diff --git a/tests/StrategyManagerTest.php b/tests/StrategyManagerTest.php
diff --git a/tests/Support/Clause/CustomMultiClause.php b/tests/Support/Clause/CustomMultiClause.php
diff --git a/tests/Support/Clause/LookupClause.php b/tests/Support/Clause/LookupClause.php

Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,11 @@ class BeginsWithClause extends AbstractClause`
`10`	`10`	`/**`
`11`	`11`	`* {@inheritdoc}`
`12`	`12`	`*/`
`13`		`- public function filter(Builder $builder, $value, $column)`
	`13`	`+ public function filter(Builder $builder, $value, $column): Builder`
`14`	`14`	`{`
`15`	`15`	`if (!empty($value)) {`
`16`	`16`	`$values = is_array($value) ? $value : [$value];`
`17`		`- collect($values)->each(static function ($value) use ($column, $builder) : void {`
	`17`	`+ collect($values)->each(static function (string $value) use ($column, $builder) : void {`
`18`	`18`	`$builder->where($column, 'like', $value . '%');`
`19`	`19`	`});`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,11 @@ class ContainsClause extends AbstractClause`
`10`	`10`	`/**`
`11`	`11`	`* {@inheritdoc}`
`12`	`12`	`*/`
`13`		`- public function filter(Builder $builder, $value, $column)`
	`13`	`+ public function filter(Builder $builder, $value, $column): Builder`
`14`	`14`	`{`
`15`	`15`	`if (!empty($value)) {`
`16`	`16`	`$values = is_array($value) ? $value : [$value];`
`17`		`- collect($values)->each(static function ($value) use ($column, $builder) : void {`
	`17`	`+ collect($values)->each(static function (string $value) use ($column, $builder) : void {`
`18`	`18`	`$builder->where($column, 'like', '%' . $value . '%');`
`19`	`19`	`});`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class DoesNotEqualClause extends AbstractClause`
`10`	`10`	`/**`
`11`	`11`	`* {@inheritdoc}`
`12`	`12`	`*/`
`13`		`- public function filter(Builder $builder, $value, $column)`
	`13`	`+ public function filter(Builder $builder, $value, $column): Builder`
`14`	`14`	`{`
`15`	`15`	`if (!empty($value)) {`
`16`	`16`	`$values = is_array($value) ? $value : [$value];`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,11 @@ class EndsWithClause extends AbstractClause`
`10`	`10`	`/**`
`11`	`11`	`* {@inheritdoc}`
`12`	`12`	`*/`
`13`		`- public function filter(Builder $builder, $value, $column)`
	`13`	`+ public function filter(Builder $builder, $value, $column): Builder`
`14`	`14`	`{`
`15`	`15`	`if (!empty($value)) {`
`16`	`16`	`$values = is_array($value) ? $value : [$value];`
`17`		`- collect($values)->each(static function ($value) use ($column, $builder) : void {`
	`17`	`+ collect($values)->each(static function (string $value) use ($column, $builder) : void {`
`18`	`18`	`$builder->where($column, 'like', '%' . $value);`
`19`	`19`	`});`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class EqualsClause extends AbstractClause`
`10`	`10`	`/**`
`11`	`11`	`* {@inheritdoc}`
`12`	`12`	`*/`
`13`		`- public function filter(Builder $builder, $value, $column)`
	`13`	`+ public function filter(Builder $builder, $value, $column): Builder`
`14`	`14`	`{`
`15`	`15`	`if (!empty($value)) {`
`16`	`16`	`$values = is_array($value) ? $value : [$value];`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class GreaterThanClause extends AbstractClause`
`10`	`10`	`/**`
`11`	`11`	`* {@inheritdoc}`
`12`	`12`	`*/`
`13`		`- public function filter(Builder $builder, $value, $column)`
	`13`	`+ public function filter(Builder $builder, $value, $column): Builder`
`14`	`14`	`{`
`15`	`15`	`if (!empty($value)) {`
`16`	`16`	`$values = is_array($value) ? $value : [$value];`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class GreaterThanOrEqualsClause extends AbstractClause`
`10`	`10`	`/**`
`11`	`11`	`* {@inheritdoc}`
`12`	`12`	`*/`
`13`		`- public function filter(Builder $builder, $value, $column)`
	`13`	`+ public function filter(Builder $builder, $value, $column): Builder`
`14`	`14`	`{`
`15`	`15`	`if (!empty($value)) {`
`16`	`16`	`$values = is_array($value) ? $value : [$value];`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class IsInClause extends AbstractClause`
`10`	`10`	`/**`
`11`	`11`	`* {@inheritdoc}`
`12`	`12`	`*/`
`13`		`- public function filter(Builder $builder, $value, $column)`
	`13`	`+ public function filter(Builder $builder, $value, $column): Builder`
`14`	`14`	`{`
`15`	`15`	`if (!empty($value)) {`
`16`	`16`	`$values = is_array($value) ? $value : [$value];`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class IsNotInClause extends AbstractClause`
`10`	`10`	`/**`
`11`	`11`	`* {@inheritdoc}`
`12`	`12`	`*/`
`13`		`- public function filter(Builder $builder, $value, $column)`
	`13`	`+ public function filter(Builder $builder, $value, $column): Builder`
`14`	`14`	`{`
`15`	`15`	`if (!empty($value)) {`
`16`	`16`	`$values = is_array($value) ? $value : [$value];`