diff --git a/src/CollectionDataTable.php b/src/CollectionDataTable.php index 36ca5184..002fdcb6 100644 --- a/src/CollectionDataTable.php +++ b/src/CollectionDataTable.php @@ -185,7 +185,7 @@ public function results(): Collection private function revertIndexColumn($mDataSupport): void { if ($this->columnDef['index']) { - $indexColumn = Config::string('datatables.index_column', 'DT_RowIndex'); + $indexColumn = Config::get('datatables.index_column', 'DT_RowIndex'); /** @var int|string $index */ $index = $mDataSupport ? $indexColumn : 0; $start = $this->request->start(); diff --git a/src/DataTables.php b/src/DataTables.php index a7e2339d..f2bf208b 100644 --- a/src/DataTables.php +++ b/src/DataTables.php @@ -43,8 +43,8 @@ public static function of($source) */ public static function make($source) { - $engines = Config::array('datatables.engines', []); - $builders = Config::array('datatables.builders', []); + $engines = Config::get('datatables.engines', []); + $builders = Config::get('datatables.builders', []); $args = func_get_args(); foreach ($builders as $class => $engine) { @@ -102,7 +102,7 @@ public function getConfig(): DataTablesConfig */ public function query(QueryBuilder $builder): QueryDataTable { - $dataTable = Config::string('datatables.engines.query'); + $dataTable = (string) Config::get('datatables.engines.query'); $this->validateDataTable($dataTable, QueryDataTable::class); @@ -116,8 +116,8 @@ public function query(QueryBuilder $builder): QueryDataTable */ public function eloquent(EloquentBuilder $builder): EloquentDataTable { - $dataTable = Config::string('datatables.engines.eloquent'); - + $dataTable = (string) Config::get('datatables.engines.eloquent'); + $this->validateDataTable($dataTable, EloquentDataTable::class); return $dataTable::create($builder); @@ -132,7 +132,7 @@ public function eloquent(EloquentBuilder $builder): EloquentDataTable */ public function collection($collection): CollectionDataTable { - $dataTable = Config::string('datatables.engines.collection'); + $dataTable = (string) Config::get('datatables.engines.collection'); $this->validateDataTable($dataTable, CollectionDataTable::class); diff --git a/src/DataTablesServiceProvider.php b/src/DataTablesServiceProvider.php index a9ae011e..a54eed81 100644 --- a/src/DataTablesServiceProvider.php +++ b/src/DataTablesServiceProvider.php @@ -38,7 +38,7 @@ public function register() */ public function boot() { - $engines = Config::array('datatables.engines', []); + $engines = Config::get('datatables.engines', []); foreach ($engines as $engine => $class) { $engine = Str::camel($engine); diff --git a/src/Processors/DataProcessor.php b/src/Processors/DataProcessor.php index f1a42fd9..2fe53148 100644 --- a/src/Processors/DataProcessor.php +++ b/src/Processors/DataProcessor.php @@ -68,7 +68,7 @@ public function __construct(protected iterable $results, array $columnDef, prote public function process($object = false): array { $this->output = []; - $indexColumn = Config::string('datatables.index_column', 'DT_RowIndex'); + $indexColumn = (string) Config::get('datatables.index_column', 'DT_RowIndex'); foreach ($this->results as $row) { $data = Helper::convertToArray($row, ['hidden' => $this->makeHidden, 'visible' => $this->makeVisible, 'ignore_getters' => $this->ignoreGetters]); diff --git a/src/Utilities/Helper.php b/src/Utilities/Helper.php index 6f389640..35d2ca6d 100644 --- a/src/Utilities/Helper.php +++ b/src/Utilities/Helper.php @@ -358,7 +358,7 @@ public static function isJavascript(string|array|object|null $value, string $key return false; } - $callbacks = Config::array('datatables.callback', ['$', '$.', 'function']); + $callbacks = Config::get('datatables.callback', ['$', '$.', 'function']); if (Str::startsWith($key, 'language.')) { return false;