Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/CollectionDataTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
12 changes: 6 additions & 6 deletions src/DataTables.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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);

Expand All @@ -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);
Expand All @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/DataTablesServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/Processors/DataProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down
2 changes: 1 addition & 1 deletion src/Utilities/Helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down