apply code changes by rector

spatie · Nov 17, 2023 · a99401f · a99401f
1 parent f30ea7e
commit a99401f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 15 deletions.
diff --git a/src/AllowedSort.php b/src/AllowedSort.php
@@ -35,7 +35,7 @@ public function __construct(string $name, Sort $sortClass, ?string $internalName
 
     public static function parseSortDirection(string $name): string
     {
-        return strpos($name, '-') === 0 ? SortDirection::DESCENDING : SortDirection::ASCENDING;
+        return str_starts_with($name, '-') ? SortDirection::DESCENDING : SortDirection::ASCENDING;
     }
 
     public function sort(QueryBuilder $query, ?bool $descending = null): void

diff --git a/src/Exceptions/InvalidSubject.php b/src/Exceptions/InvalidSubject.php
@@ -12,7 +12,7 @@ public static function make($subject)
             sprintf(
                 'Subject %s is invalid.',
                 is_object($subject)
-                    ? sprintf('class `%s`', get_class($subject))
+                    ? sprintf('class `%s`', $subject::class)
                     : sprintf('type `%s`', gettype($subject))
             )
         );

diff --git a/src/Filters/Filter.php b/src/Filters/Filter.php
@@ -11,10 +11,8 @@ interface Filter
 {
     /**
      * @param \Illuminate\Database\Eloquent\Builder<TModelClass> $query
-     * @param mixed $value
-     * @param string $property
      *
      * @return mixed
      */
-    public function __invoke(Builder $query, $value, string $property);
+    public function __invoke(Builder $query, mixed $value, string $property);
 }
diff --git a/src/Filters/FiltersScope.php b/src/Filters/FiltersScope.php
@@ -49,7 +49,7 @@ protected function resolveParameters(Builder $query, $values, string $scope): ar
             $parameters = (new ReflectionObject($query->getModel()))
                 ->getMethod('scope' . ucfirst($scope))
                 ->getParameters();
-        } catch (ReflectionException $e) {
+        } catch (ReflectionException) {
             return $values;
         }
 

diff --git a/src/Includes/IncludeInterface.php b/src/Includes/IncludeInterface.php
@@ -10,10 +10,9 @@
 interface IncludeInterface
 {
     /**
-    * @param \Illuminate\Database\Eloquent\Builder<TModelClass> $query
-    * @param string $include
-    *
-    * @return mixed
-    */
+     * @param \Illuminate\Database\Eloquent\Builder<TModelClass> $query
+     *
+     * @return mixed
+     */
     public function __invoke(Builder $query, string $include);
 }
diff --git a/src/Includes/IncludedCallback.php b/src/Includes/IncludedCallback.php
@@ -7,11 +7,8 @@
 
 class IncludedCallback implements IncludeInterface
 {
-    protected Closure $callback;
-
-    public function __construct(Closure $callback)
+    public function __construct(protected Closure $callback)
     {
-        $this->callback = $callback;
     }
 
     public function __invoke(Builder $query, string $relation)