chore: rector and pint

Author: yajra

composer.json

@@ -28,7 +28,8 @@
         "laravel/pint": "^1.14",
         "laravel/scout": "^10.8.3",
         "meilisearch/meilisearch-php": "^1.6.1",
-        "orchestra/testbench": "^9"
+        "orchestra/testbench": "^9",
+        "rector/rector": "^1.0"
     },
     "suggest": {
         "yajra/laravel-datatables-export": "Plugin for server-side exporting using livewire and queue worker.",
@@ -72,7 +73,14 @@
     "scripts": {
         "test": "./vendor/bin/phpunit",
         "pint": "./vendor/bin/pint",
-        "stan": "./vendor/bin/phpstan analyse --memory-limit=2G --ansi --no-progress --no-interaction --configuration=phpstan.neon.dist"
+        "rector": "./vendor/bin/rector",
+        "stan": "./vendor/bin/phpstan analyse --memory-limit=2G --ansi --no-progress --no-interaction --configuration=phpstan.neon.dist",
+        "pr": [
+            "@rector",
+            "@pint",
+            "@stan",
+            "@test"
+        ]
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

rector.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
+use Rector\Config\RectorConfig;
+use Rector\Set\ValueObject\LevelSetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__.'/src',
+        __DIR__.'/tests',
+    ]);
+
+    // register a single rule
+    $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
+
+    // define sets of rules
+    $rectorConfig->sets([
+        LevelSetList::UP_TO_PHP_82,
+    ]);
+};

src/CollectionDataTable.php

@@ -13,13 +13,6 @@
 
 class CollectionDataTable extends DataTableAbstract
 {
-    /**
-     * Collection object.
-     *
-     * @var \Illuminate\Support\Collection<array-key, array>
-     */
-    public Collection $collection;
-
     /**
      * Collection object.
      *
@@ -37,21 +30,18 @@ class CollectionDataTable extends DataTableAbstract
      *
      * @param  \Illuminate\Support\Collection<array-key, array>  $collection
      */
-    public function __construct(Collection $collection)
+    public function __construct(public Collection $collection)
     {
         $this->request = app('datatables.request');
         $this->config = app('datatables.config');
-        $this->collection = $collection;
-        $this->original = $collection;
-        $this->columns = array_keys($this->serialize($collection->first()));
+        $this->original = $this->collection;
+        $this->columns = array_keys($this->serialize($this->collection->first()));
     }
 
     /**
      * Serialize collection.
-     *
-     * @param  mixed  $collection
      */
-    protected function serialize($collection): array
+    protected function serialize(mixed $collection): array
     {
         return $collection instanceof Arrayable ? $collection->toArray() : (array) $collection;
     }
@@ -257,9 +247,7 @@ protected function defaultOrdering(): void
             $sorter = $this->getSorter($criteria);
 
             $this->collection = $this->collection
-                ->map(function ($data) {
-                    return Arr::dot($data);
-                })
+                ->map(fn ($data) => Arr::dot($data))
                 ->sort($sorter)
                 ->map(function ($data) {
                     foreach ($data as $key => $value) {

src/Contracts/Formatter.php

@@ -5,9 +5,8 @@
 interface Formatter
 {
     /**
-     * @param  mixed  $value
      * @param  array|\Illuminate\Database\Eloquent\Model|object  $row
      * @return string
      */
-    public function format($value, $row);
+    public function format(mixed $value, $row);
 }

src/DataTableAbstract.php

@@ -120,21 +120,19 @@ abstract class DataTableAbstract implements DataTable
     /**
      * Can the DataTable engine be created with these parameters.
      *
-     * @param  mixed  $source
      * @return bool
      */
-    public static function canCreate($source)
+    public static function canCreate(mixed $source)
     {
         return false;
     }
 
     /**
      * Factory method, create and return an instance for the DataTable engine.
      *
-     * @param  mixed  $source
      * @return static
      */
-    public static function create($source)
+    public static function create(mixed $source)
     {
         return new static($source);
     }
@@ -162,9 +160,7 @@ public function formatColumn($columns, $formatter): static
             foreach ((array) $columns as $column) {
                 $this->addColumn(
                     $column.'_formatted',
-                    function ($row) use ($column, $formatter) {
-                        return $formatter(data_get($row, $column), $row);
-                    }
+                    fn ($row) => $formatter(data_get($row, $column), $row)
                 );
             }
 
@@ -174,9 +170,7 @@ function ($row) use ($column, $formatter) {
         foreach ((array) $columns as $column) {
             $this->addColumn(
                 $column.'_formatted',
-                function ($row) use ($column) {
-                    return data_get($row, $column);
-                }
+                fn ($row) => data_get($row, $column)
             );
         }
 
@@ -425,11 +419,9 @@ public function addRowAttr($key, $value): static
     /**
      * Append data on json response.
      *
-     * @param  mixed  $key
-     * @param  mixed  $value
      * @return $this
      */
-    public function with($key, $value = ''): static
+    public function with(mixed $key, mixed $value = ''): static
     {
         if (is_array($key)) {
             $this->appends = $key;
@@ -680,10 +672,9 @@ public function toJson($options = 0)
      * Add a search pane options on response.
      *
      * @param  string  $column
-     * @param  mixed  $options
      * @return $this
      */
-    public function searchPane($column, $options, ?callable $builder = null): static
+    public function searchPane($column, mixed $options, ?callable $builder = null): static
     {
         $options = value($options);
 
@@ -748,9 +739,7 @@ public function filtering(): void
     protected function smartGlobalSearch($keyword): void
     {
         collect(explode(' ', $keyword))
-            ->reject(function ($keyword) {
-                return trim($keyword) === '';
-            })
+            ->reject(fn ($keyword) => trim((string) $keyword) === '')
             ->each(function ($keyword) {
                 $this->globalSearch($keyword);
             });

src/DataTables.php

@@ -74,7 +74,7 @@ public static function make($source)
             }
         }
 
-        throw new Exception('No available engine for '.get_class($source));
+        throw new Exception('No available engine for '.$source::class);
     }
 
     /**

src/DataTablesServiceProvider.php

@@ -23,13 +23,9 @@ public function register()
         $this->setupAssets();
 
         $this->app->alias('datatables', DataTables::class);
-        $this->app->singleton('datatables', function () {
-            return new DataTables;
-        });
+        $this->app->singleton('datatables', fn () => new DataTables);
 
-        $this->app->singleton('datatables.request', function () {
-            return new Request;
-        });
+        $this->app->singleton('datatables.request', fn () => new Request);
 
         $this->app->singleton('datatables.config', Config::class);
     }

src/EloquentDataTable.php

@@ -56,9 +56,7 @@ public function addColumns(array $names, $order = false)
                 $name = $attribute;
             }
 
-            $this->addColumn($name, function ($model) use ($attribute) {
-                return $model->getAttribute($attribute);
-            }, is_int($order) ? $order++ : $order);
+            $this->addColumn($name, fn ($model) => $model->getAttribute($attribute), is_int($order) ? $order++ : $order);
         }
 
         return $this;
@@ -237,7 +235,7 @@ protected function joinEagerLoadedColumn($relation, $relationColumn)
                     break;
 
                 default:
-                    throw new Exception('Relation '.get_class($model).' is not yet supported.');
+                    throw new Exception('Relation '.$model::class.' is not yet supported.');
             }
             $this->performJoin($table, $foreign, $other);
             $lastQuery = $model->getQuery();

src/Processors/DataProcessor.php

@@ -9,8 +9,6 @@
 
 class DataProcessor
 {
-    protected int $start;
-
     protected array $output = [];
 
     /**
@@ -23,8 +21,6 @@ class DataProcessor
      */
     protected array $editColumns = [];
 
-    protected array $templates = [];
-
     protected array $rawColumns = [];
 
     /**
@@ -45,18 +41,12 @@ class DataProcessor
      */
     protected mixed $escapeColumns = [];
 
-    protected iterable $results;
-
     protected bool $includeIndex = false;
 
     protected bool $ignoreGetters = false;
 
-    /**
-     * @param  iterable  $results
-     */
-    public function __construct($results, array $columnDef, array $templates, int $start = 0)
+    public function __construct(protected iterable $results, array $columnDef, protected array $templates, protected int $start = 0)
     {
-        $this->results = $results;
         $this->appendColumns = $columnDef['append'] ?? [];
         $this->editColumns = $columnDef['edit'] ?? [];
         $this->excessColumns = $columnDef['excess'] ?? [];
@@ -67,8 +57,6 @@ public function __construct($results, array $columnDef, array $templates, int $s
         $this->makeHidden = $columnDef['hidden'] ?? [];
         $this->makeVisible = $columnDef['visible'] ?? [];
         $this->ignoreGetters = $columnDef['ignore_getters'] ?? false;
-        $this->templates = $templates;
-        $this->start = $start;
     }
 
     /**