General code health improvements (#988)

* Remove unused parameter

* Use null-safe operator instead of optional() helper

Also the model is not nullable at this point, so we can safely remove the null-safe operator below the if condition.

* Mark nullable parameters explicitly

* Sort use() variables

* Use direct empty string check to reduce cognitive load

* Remove unnecessary else branch

Author: xHeaven

src/AllowedFilter.php

@@ -48,56 +48,56 @@ public function filter(QueryBuilder $query, $value): void
         ($this->filterClass)($query->getEloquentBuilder(), $valueToFilter, $this->internalName);
     }
 
-    public static function setFilterArrayValueDelimiter(string $delimiter = null): void
+    public static function setFilterArrayValueDelimiter(?string $delimiter = null): void
     {
         if (isset($delimiter)) {
             QueryBuilderRequest::setFilterArrayValueDelimiter($delimiter);
         }
     }
 
-    public static function exact(string $name, ?string $internalName = null, bool $addRelationConstraint = true, string $arrayValueDelimiter = null): static
+    public static function exact(string $name, ?string $internalName = null, bool $addRelationConstraint = true, ?string $arrayValueDelimiter = null): static
     {
         static::setFilterArrayValueDelimiter($arrayValueDelimiter);
 
         return new static($name, new FiltersExact($addRelationConstraint), $internalName);
     }
 
-    public static function partial(string $name, $internalName = null, bool $addRelationConstraint = true, string $arrayValueDelimiter = null): static
+    public static function partial(string $name, $internalName = null, bool $addRelationConstraint = true, ?string $arrayValueDelimiter = null): static
     {
         static::setFilterArrayValueDelimiter($arrayValueDelimiter);
 
         return new static($name, new FiltersPartial($addRelationConstraint), $internalName);
     }
 
-    public static function beginsWithStrict(string $name, $internalName = null, bool $addRelationConstraint = true, string $arrayValueDelimiter = null): static
+    public static function beginsWithStrict(string $name, $internalName = null, bool $addRelationConstraint = true, ?string $arrayValueDelimiter = null): static
     {
         static::setFilterArrayValueDelimiter($arrayValueDelimiter);
 
         return new static($name, new FiltersBeginsWithStrict($addRelationConstraint), $internalName);
     }
 
-    public static function endsWithStrict(string $name, $internalName = null, bool $addRelationConstraint = true, string $arrayValueDelimiter = null): static
+    public static function endsWithStrict(string $name, $internalName = null, bool $addRelationConstraint = true, ?string $arrayValueDelimiter = null): static
     {
         static::setFilterArrayValueDelimiter($arrayValueDelimiter);
 
         return new static($name, new FiltersEndsWithStrict($addRelationConstraint), $internalName);
     }
 
-    public static function belongsTo(string $name, $internalName = null, string $arrayValueDelimiter = null): static
+    public static function belongsTo(string $name, $internalName = null, ?string $arrayValueDelimiter = null): static
     {
         static::setFilterArrayValueDelimiter($arrayValueDelimiter);
 
         return new static($name, new FiltersBelongsTo(), $internalName);
     }
 
-    public static function scope(string $name, $internalName = null, string $arrayValueDelimiter = null): static
+    public static function scope(string $name, $internalName = null, ?string $arrayValueDelimiter = null): static
     {
         static::setFilterArrayValueDelimiter($arrayValueDelimiter);
 
         return new static($name, new FiltersScope(), $internalName);
     }
 
-    public static function callback(string $name, $callback, $internalName = null, string $arrayValueDelimiter = null): static
+    public static function callback(string $name, $callback, $internalName = null, ?string $arrayValueDelimiter = null): static
     {
         static::setFilterArrayValueDelimiter($arrayValueDelimiter);
 
@@ -109,18 +109,18 @@ public static function trashed(string $name = 'trashed', $internalName = null):
         return new static($name, new FiltersTrashed(), $internalName);
     }
 
-    public static function custom(string $name, Filter $filterClass, $internalName = null, string $arrayValueDelimiter = null): static
+    public static function custom(string $name, Filter $filterClass, $internalName = null, ?string $arrayValueDelimiter = null): static
     {
         static::setFilterArrayValueDelimiter($arrayValueDelimiter);
 
         return new static($name, $filterClass, $internalName);
     }
 
-    public static function operator(string $name, FilterOperator $filterOperator, string $boolean = 'and', ?string $internalName = null, bool $addRelationConstraint = true, string $arrayValueDelimiter = null): self
+    public static function operator(string $name, FilterOperator $filterOperator, string $boolean = 'and', ?string $internalName = null, bool $addRelationConstraint = true, ?string $arrayValueDelimiter = null): self
     {
         static::setFilterArrayValueDelimiter($arrayValueDelimiter);
 
-        return new static($name, new FiltersOperator($addRelationConstraint, $filterOperator, $boolean), $internalName, $filterOperator);
+        return new static($name, new FiltersOperator($addRelationConstraint, $filterOperator, $boolean), $internalName);
     }
 
     public function getFilterClass(): Filter

src/Filters/FiltersBelongsTo.php

@@ -70,14 +70,14 @@ protected function getModelFromRelation(Model $model, string $relation, int $lev
         $relationParts = explode('.', $relation);
         if (count($relationParts) == 1) {
             return $this->getRelatedModelFromRelation($model, $relation);
-        } else {
-            $firstRelation = $relationParts[0];
-            $firstRelatedModel = $this->getRelatedModelFromRelation($model, $firstRelation);
-            if (! $firstRelatedModel) {
-                return null;
-            }
+        }
 
-            return $this->getModelFromRelation($firstRelatedModel, implode('.', array_slice($relationParts, 1)), $level + 1);
+        $firstRelation = $relationParts[0];
+        $firstRelatedModel = $this->getRelatedModelFromRelation($model, $firstRelation);
+        if (! $firstRelatedModel) {
+            return null;
         }
+
+        return $this->getModelFromRelation($firstRelatedModel, implode('.', array_slice($relationParts, 1)), $level + 1);
     }
 }

src/Filters/FiltersExact.php

@@ -66,7 +66,7 @@ protected function withRelationConstraint(Builder $query, mixed $value, string $
                 $parts->last(),
             ]);
 
-        $query->whereHas($relation, function (Builder $query) use ($value, $property) {
+        $query->whereHas($relation, function (Builder $query) use ($property, $value) {
             $this->relationConstraints[] = $property = $query->qualifyColumn($property);
 
             $this->__invoke($query, $value, $property);

src/Filters/FiltersPartial.php

@@ -25,12 +25,12 @@ public function __invoke(Builder $query, $value, string $property)
         $databaseDriver = $this->getDatabaseDriver($query);
 
         if (is_array($value)) {
-            if (count(array_filter($value, fn ($item) => strlen($item) > 0)) === 0) {
+            if (count(array_filter($value, fn ($item) => $item != '')) === 0) {
                 return $query;
             }
 
-            $query->where(function (Builder $query) use ($databaseDriver, $value, $wrappedProperty) {
-                foreach (array_filter($value, fn ($item) => strlen($item) > 0) as $partialValue) {
+            $query->where(function (Builder $query) use ($value, $wrappedProperty, $databaseDriver) {
+                foreach (array_filter($value, fn ($item) => $item != '') as $partialValue) {
                     [$sql, $bindings] = $this->getWhereRawParameters($partialValue, $wrappedProperty, $databaseDriver);
                     $query->orWhereRaw($sql, $bindings);
                 }

src/Filters/FiltersScope.php

@@ -54,12 +54,12 @@ protected function resolveParameters(Builder $query, $values, string $scope): ar
         }
 
         foreach ($parameters as $parameter) {
-            if (! optional($this->getClass($parameter))->isSubclassOf(Model::class)) {
+            if (! $this->getClass($parameter)?->isSubclassOf(Model::class)) {
                 continue;
             }
 
             /** @var TModelClass $model */
-            $model = $this->getClass($parameter)?->newInstance();
+            $model = $this->getClass($parameter)->newInstance();
             $index = $parameter->getPosition() - 1;
             $value = $values[$index];