chore: rector updates

yajra · yajra · commit 254da7227428 · 2024-02-27T13:53:32.000+08:00
diff --git a/rector.php b/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,
+    ]);
+};
diff --git a/src/Html/Builder.php b/src/Html/Builder.php
@@ -20,21 +20,21 @@ class Builder
     use Macroable;
 
     // Select plugin constants.
-    const SELECT_STYLE_API = 'api';
+    final const SELECT_STYLE_API = 'api';
 
-    const SELECT_STYLE_SINGLE = 'single';
+    final const SELECT_STYLE_SINGLE = 'single';
 
-    const SELECT_STYLE_MULTI = 'multi';
+    final const SELECT_STYLE_MULTI = 'multi';
 
-    const SELECT_STYLE_OS = 'os';
+    final const SELECT_STYLE_OS = 'os';
 
-    const SELECT_STYLE_MULTI_SHIFT = 'multi+shift';
+    final const SELECT_STYLE_MULTI_SHIFT = 'multi+shift';
 
-    const SELECT_ITEMS_ROW = 'row';
+    final const SELECT_ITEMS_ROW = 'row';
 
-    const SELECT_ITEMS_COLUMN = 'column';
+    final const SELECT_ITEMS_COLUMN = 'column';
 
-    const SELECT_ITEMS_CELL = 'cell';
+    final const SELECT_ITEMS_CELL = 'cell';
 
     /**
      * The default type to use for the DataTables javascript.
@@ -53,7 +53,10 @@ class Builder
 
     protected string $template = '';
 
-    protected array $attributes = [];
+    protected array $attributes = [
+        'serverSide' => true,
+        'processing' => true,
+    ];
 
     protected string|array $ajax = '';
 
@@ -66,10 +69,6 @@ public function __construct(public Repository $config, public Factory $view, pub
 
         $this->collection = new Collection;
         $this->tableAttributes = $defaults;
-        $this->attributes = [
-            'serverSide' => true,
-            'processing' => true,
-        ];
     }
 
     /**
diff --git a/src/Html/Column.php b/src/Html/Column.php
@@ -503,7 +503,7 @@ public function parseRender(mixed $value): ?string
             return $value($parameters);
         } elseif ($this->isBuiltInRenderFunction($value)) {
             return $value;
-        } elseif (strlen($value) < 256 && $view->exists($value)) {
+        } elseif (strlen((string) $value) < 256 && $view->exists($value)) {
             return $view->make($value)->with($parameters)->render();
         }
 
diff --git a/src/Html/Editor/Editor.php b/src/Html/Editor/Editor.php
@@ -24,15 +24,15 @@ class Editor extends Fluent
     use HasAuthorizations;
     use HasEvents;
 
-    const DISPLAY_LIGHTBOX = 'lightbox';
+    final const DISPLAY_LIGHTBOX = 'lightbox';
 
-    const DISPLAY_ENVELOPE = 'envelope';
+    final const DISPLAY_ENVELOPE = 'envelope';
 
-    const DISPLAY_BOOTSTRAP = 'bootstrap';
+    final const DISPLAY_BOOTSTRAP = 'bootstrap';
 
-    const DISPLAY_FOUNDATION = 'foundation';
+    final const DISPLAY_FOUNDATION = 'foundation';
 
-    const DISPLAY_JQUERYUI = 'jqueryui';
+    final const DISPLAY_JQUERYUI = 'jqueryui';
 
     public array $events = [];
 
@@ -43,6 +43,7 @@ class Editor extends Fluent
      */
     public function __construct($instance = 'editor')
     {
+        $attributes = [];
         $attributes['instance'] = $instance;
 
         parent::__construct($attributes);
diff --git a/src/Html/Editor/Fields/BelongsTo.php b/src/Html/Editor/Fields/BelongsTo.php
@@ -19,7 +19,7 @@ public static function model(Builder|string $class, string $text, string $id = '
         }
 
         $table = Str::singular($table);
-        $foreign = $foreign ?? $table.'_id';
+        $foreign ??= $table.'_id';
 
         return self::make($foreign, Str::title($table))
             ->modelOptions($class, $text, $id);
diff --git a/src/Html/Editor/Fields/Field.php b/src/Html/Editor/Fields/Field.php
@@ -31,7 +31,7 @@ class Field extends Fluent
      */
     public function __construct($attributes = [])
     {
-        $attributes['type'] = $attributes['type'] ?? $this->type;
+        $attributes['type'] ??= $this->type;
 
         parent::__construct($attributes);
     }
diff --git a/src/Html/Editor/Fields/Options.php b/src/Html/Editor/Fields/Options.php
@@ -39,12 +39,10 @@ public static function model(string|EloquentBuilder $model, string $value, strin
             $model = $model::query();
         }
 
-        return $model->get()->map(function ($model) use ($value, $key) {
-            return [
-                'value' => $model->{$key},
-                'label' => $model->{$value},
-            ];
-        });
+        return $model->get()->map(fn($model) => [
+            'value' => $model->{$key},
+            'label' => $model->{$value},
+        ]);
     }
 
     /**
@@ -65,9 +63,7 @@ public static function table(
             $callback($query);
         }
 
-        return $query->get()->map(function ($row) {
-            return (array) $row;
-        });
+        return $query->get()->map(fn($row) => (array) $row);
     }
 
     /**
diff --git a/src/Html/Editor/Fields/Select2.php b/src/Html/Editor/Fields/Select2.php
@@ -84,7 +84,7 @@ public function ajaxData(array|string $data): static
         if (is_array($data)) {
             $script = 'function(params) {';
             foreach ($data as $key => $value) {
-                $value = json_encode($value);
+                $value = json_encode($value, JSON_THROW_ON_ERROR);
                 $script .= " params.$key = $value; ";
             }
             $script .= 'return params; }';
diff --git a/src/Html/HasTable.php b/src/Html/HasTable.php
@@ -111,7 +111,7 @@ public function removeTableClass(array|string $class): static
         $currentClass = $this->getTableAttribute('class');
 
         $classes = array_diff(
-            (array) preg_split('#\s+#', $currentClass, -1, PREG_SPLIT_NO_EMPTY),
+            (array) preg_split('#\s+#', (string) $currentClass, -1, PREG_SPLIT_NO_EMPTY),
             (array) preg_split('#\s+#', $class, -1, PREG_SPLIT_NO_EMPTY)
         );
         $class = implode(' ', array_unique($classes));
diff --git a/src/Html/HtmlBuilder.php b/src/Html/HtmlBuilder.php
@@ -8,23 +8,20 @@
 
 class HtmlBuilder
 {
-    /**
-     * The URL generator instance.
-     */
-    protected UrlGenerator $url;
-
-    /**
-     * The View Factory instance.
-     */
-    protected Factory $view;
-
     /**
      * Create a new HTML builder instance.
      */
-    public function __construct(UrlGenerator $url, Factory $view)
+    public function __construct(
+        /**
+         * The URL generator instance.
+         */
+        protected UrlGenerator $url,
+        /**
+         * The View Factory instance.
+         */
+        protected Factory $view
+    )
     {
-        $this->url = $url;
-        $this->view = $view;
     }
 
     /**
diff --git a/src/Html/Options/HasColumns.php b/src/Html/Options/HasColumns.php
@@ -175,9 +175,7 @@ public function removeColumn(...$names): static
     {
         foreach ($names as $name) {
             // @phpstan-ignore-next-line
-            $this->collection = $this->collection->filter(function (Column $column) use ($name) {
-                return $column->name !== $name;
-            })->flatten();
+            $this->collection = $this->collection->filter(fn(Column $column) => $column->name !== $name)->flatten();
         }
 
         return $this;
diff --git a/src/Html/SearchPane.php b/src/Html/SearchPane.php
@@ -213,7 +213,6 @@ public function hideTotal(bool $value = true): static
      * Get options from a model.
      *
      * @param  class-string<\Illuminate\Database\Eloquent\Model>|EloquentBuilder  $model
-     * @return $this
      */
     public function modelOptions(EloquentBuilder|string $model, string $value, string $key = 'id'): SearchPane
     {
diff --git a/src/HtmlServiceProvider.php b/src/HtmlServiceProvider.php
@@ -36,12 +36,8 @@ public function register(): void
     {
         $this->mergeConfigFrom(__DIR__.'/resources/config/config.php', 'datatables-html');
 
-        $this->app->bind('datatables.html', function () {
-            return $this->app->make(Html\Builder::class);
-        });
+        $this->app->bind('datatables.html', fn() => $this->app->make(Html\Builder::class));
 
-        DataTables::macro('getHtmlBuilder', function (): Html\Builder {
-            return app('datatables.html');
-        });
+        DataTables::macro('getHtmlBuilder', fn(): Html\Builder => app('datatables.html'));
     }
 }
diff --git a/tests/BuilderOptionsPluginsTest.php b/tests/BuilderOptionsPluginsTest.php
@@ -273,9 +273,7 @@ public function it_has_search_panes_plugin()
         $builder->searchPanes(['hide' => true]);
         $this->assertEquals(['hide' => true], $builder->getAttribute('searchPanes'));
 
-        $builder->searchPanes(function () {
-            return ['show' => true];
-        });
+        $builder->searchPanes(fn() => ['show' => true]);
         $this->assertEquals(['show' => true], $builder->getAttribute('searchPanes'));
 
         $builder->searchPanes(SearchPane::make()->show()->cascadePanes());

Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ public function parseRender(mixed $value): ?string`
`503`	`503`	`return $value($parameters);`
`504`	`504`	`} elseif ($this->isBuiltInRenderFunction($value)) {`
`505`	`505`	`return $value;`
`506`		`- } elseif (strlen($value) < 256 && $view->exists($value)) {`
	`506`	`+ } elseif (strlen((string) $value) < 256 && $view->exists($value)) {`
`507`	`507`	`return $view->make($value)->with($parameters)->render();`
`508`	`508`	`}`
`509`	`509`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public static function model(Builder\|string $class, string $text, string $id = '`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`$table = Str::singular($table);`
`22`		`- $foreign = $foreign ?? $table.'_id';`
	`22`	`+ $foreign ??= $table.'_id';`
`23`	`23`
`24`	`24`	`return self::make($foreign, Str::title($table))`
`25`	`25`	`->modelOptions($class, $text, $id);`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class Field extends Fluent`
`31`	`31`	`*/`
`32`	`32`	`public function __construct($attributes = [])`
`33`	`33`	`{`
`34`		`- $attributes['type'] = $attributes['type'] ?? $this->type;`
	`34`	`+ $attributes['type'] ??= $this->type;`
`35`	`35`
`36`	`36`	`parent::__construct($attributes);`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,12 +39,10 @@ public static function model(string\|EloquentBuilder $model, string $value, strin`
`39`	`39`	`$model = $model::query();`
`40`	`40`	`}`
`41`	`41`
`42`		`- return $model->get()->map(function ($model) use ($value, $key) {`
`43`		`- return [`
`44`		`- 'value' => $model->{$key},`
`45`		`- 'label' => $model->{$value},`
`46`		`- ];`
`47`		`- });`
	`42`	`+ return $model->get()->map(fn($model) => [`
	`43`	`+ 'value' => $model->{$key},`
	`44`	`+ 'label' => $model->{$value},`
	`45`	`+ ]);`
`48`	`46`	`}`
`49`	`47`
`50`	`48`	`/**`
`@@ -65,9 +63,7 @@ public static function table(`
`65`	`63`	`$callback($query);`
`66`	`64`	`}`
`67`	`65`
`68`		`- return $query->get()->map(function ($row) {`
`69`		`- return (array) $row;`
`70`		`- });`
	`66`	`+ return $query->get()->map(fn($row) => (array) $row);`
`71`	`67`	`}`
`72`	`68`
`73`	`69`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public function ajaxData(array\|string $data): static`
`84`	`84`	`if (is_array($data)) {`
`85`	`85`	`$script = 'function(params) {';`
`86`	`86`	`foreach ($data as $key => $value) {`
`87`		`- $value = json_encode($value);`
	`87`	`+ $value = json_encode($value, JSON_THROW_ON_ERROR);`
`88`	`88`	`$script .= " params.$key = $value; ";`
`89`	`89`	`}`
`90`	`90`	`$script .= 'return params; }';`