Skip to content

Commit b9e5f78

Browse files
xu-liXu Li
andauthored
fix: #3266, replace ConfigRepository's type helper methods with get() (#3267)
* Fixes #3266: replace ConfigRepository's typed helper methods with `get()` * Fixes [#3266](#3266): cast config item to strings. --------- Co-authored-by: Xu Li <[email protected]>
1 parent d54d38d commit b9e5f78

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

src/CollectionDataTable.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public function results(): Collection
185185
private function revertIndexColumn($mDataSupport): void
186186
{
187187
if ($this->columnDef['index']) {
188-
$indexColumn = Config::string('datatables.index_column', 'DT_RowIndex');
188+
$indexColumn = Config::get('datatables.index_column', 'DT_RowIndex');
189189
/** @var int|string $index */
190190
$index = $mDataSupport ? $indexColumn : 0;
191191
$start = $this->request->start();

src/DataTables.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ public static function of($source)
4343
*/
4444
public static function make($source)
4545
{
46-
$engines = Config::array('datatables.engines', []);
47-
$builders = Config::array('datatables.builders', []);
46+
$engines = Config::get('datatables.engines', []);
47+
$builders = Config::get('datatables.builders', []);
4848

4949
$args = func_get_args();
5050
foreach ($builders as $class => $engine) {
@@ -102,7 +102,7 @@ public function getConfig(): DataTablesConfig
102102
*/
103103
public function query(QueryBuilder $builder): QueryDataTable
104104
{
105-
$dataTable = Config::string('datatables.engines.query');
105+
$dataTable = (string) Config::get('datatables.engines.query');
106106

107107
$this->validateDataTable($dataTable, QueryDataTable::class);
108108

@@ -116,8 +116,8 @@ public function query(QueryBuilder $builder): QueryDataTable
116116
*/
117117
public function eloquent(EloquentBuilder $builder): EloquentDataTable
118118
{
119-
$dataTable = Config::string('datatables.engines.eloquent');
120-
119+
$dataTable = (string) Config::get('datatables.engines.eloquent');
120+
121121
$this->validateDataTable($dataTable, EloquentDataTable::class);
122122

123123
return $dataTable::create($builder);
@@ -132,7 +132,7 @@ public function eloquent(EloquentBuilder $builder): EloquentDataTable
132132
*/
133133
public function collection($collection): CollectionDataTable
134134
{
135-
$dataTable = Config::string('datatables.engines.collection');
135+
$dataTable = (string) Config::get('datatables.engines.collection');
136136

137137
$this->validateDataTable($dataTable, CollectionDataTable::class);
138138

src/DataTablesServiceProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function register()
3838
*/
3939
public function boot()
4040
{
41-
$engines = Config::array('datatables.engines', []);
41+
$engines = Config::get('datatables.engines', []);
4242
foreach ($engines as $engine => $class) {
4343
$engine = Str::camel($engine);
4444

src/Processors/DataProcessor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function __construct(protected iterable $results, array $columnDef, prote
6868
public function process($object = false): array
6969
{
7070
$this->output = [];
71-
$indexColumn = Config::string('datatables.index_column', 'DT_RowIndex');
71+
$indexColumn = (string) Config::get('datatables.index_column', 'DT_RowIndex');
7272

7373
foreach ($this->results as $row) {
7474
$data = Helper::convertToArray($row, ['hidden' => $this->makeHidden, 'visible' => $this->makeVisible, 'ignore_getters' => $this->ignoreGetters]);

src/Utilities/Helper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ public static function isJavascript(string|array|object|null $value, string $key
358358
return false;
359359
}
360360

361-
$callbacks = Config::array('datatables.callback', ['$', '$.', 'function']);
361+
$callbacks = Config::get('datatables.callback', ['$', '$.', 'function']);
362362

363363
if (Str::startsWith($key, 'language.')) {
364364
return false;

0 commit comments

Comments
 (0)