refactor: enhance key retrieval logic for array manipulations across multiple classes

Author: yajra

src/CollectionDataTable.php

@@ -191,7 +191,8 @@ private function revertIndexColumn($mDataSupport): void
             $start = $this->request->start();
 
             $this->collection->transform(function ($data) use ($index, &$start) {
-                $data[$index] = ++$start;
+                $indexKey = is_string($index) || is_int($index) ? $index : 0;
+                $data[$indexKey] = ++$start;
 
                 return $data;
             });

src/DataTableAbstract.php

@@ -433,9 +433,8 @@ public function with(mixed $key, mixed $value = ''): static
         if (is_array($key)) {
             $this->appends = $key;
         } else {
-            /** @var int|string $arrayKey */
-            $arrayKey = is_int($key) || is_string($key) ? $key : (string) $key;
-            $this->appends[$arrayKey] = value($value);
+            $appendsKey = is_string($key) || is_int($key) ? $key : (string) $key;
+            $this->appends[$appendsKey] = value($value);
         }
 
         return $this;

src/DataTables.php

@@ -4,10 +4,9 @@
 
 use Illuminate\Contracts\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Contracts\Database\Query\Builder as QueryBuilder;
-use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Traits\Macroable;
 use Yajra\DataTables\Exceptions\Exception;
-use Yajra\DataTables\Utilities\Config as DataTablesConfig;
+use Yajra\DataTables\Utilities\Config;
 use Yajra\DataTables\Utilities\Request;
 
 class DataTables
@@ -43,15 +42,17 @@ public static function of($source)
      */
     public static function make($source)
     {
-        $engines = Config::array('datatables.engines', []);
-        $builders = Config::array('datatables.builders', []);
+        $engines = (array) config('datatables.engines');
+        $builders = (array) config('datatables.builders');
 
         $args = func_get_args();
         foreach ($builders as $class => $engine) {
-            if (is_string($class) && $source instanceof $class) {
-                /** @var int|string $engineKey */
-                $engineKey = is_int($engine) || is_string($engine) ? $engine : (string) $engine;
-                $callback = [$engines[$engineKey], 'create'];
+            if (is_string($class) && class_exists($class) && $source instanceof $class) {
+                $engineClass = is_string($engine) && isset($engines[$engine]) ? $engines[$engine] : null;
+                if ($engineClass === null) {
+                    continue;
+                }
+                $callback = [$engineClass, 'create'];
 
                 if (is_callable($callback)) {
                     /** @var \Yajra\DataTables\DataTableAbstract $instance */
@@ -90,7 +91,7 @@ public function getRequest(): Request
     /**
      * Get config instance.
      */
-    public function getConfig(): DataTablesConfig
+    public function getConfig(): Config
     {
         return app('datatables.config');
     }
@@ -102,7 +103,8 @@ public function getConfig(): DataTablesConfig
      */
     public function query(QueryBuilder $builder): QueryDataTable
     {
-        $dataTable = Config::string('datatables.engines.query');
+        /** @var string $dataTable */
+        $dataTable = config('datatables.engines.query');
 
         $this->validateDataTable($dataTable, QueryDataTable::class);
 
@@ -116,7 +118,8 @@ public function query(QueryBuilder $builder): QueryDataTable
      */
     public function eloquent(EloquentBuilder $builder): EloquentDataTable
     {
-        $dataTable = Config::string('datatables.engines.eloquent');
+        /** @var string $dataTable */
+        $dataTable = config('datatables.engines.eloquent');
 
         $this->validateDataTable($dataTable, EloquentDataTable::class);
 
@@ -132,7 +135,8 @@ public function eloquent(EloquentBuilder $builder): EloquentDataTable
      */
     public function collection($collection): CollectionDataTable
     {
-        $dataTable = Config::string('datatables.engines.collection');
+        /** @var string $dataTable */
+        $dataTable = config('datatables.engines.collection');
 
         $this->validateDataTable($dataTable, CollectionDataTable::class);
 

src/Processors/DataProcessor.php

@@ -79,7 +79,8 @@ public function process($object = false): array
             $value = $this->removeExcessColumns($value);
 
             if ($this->includeIndex) {
-                $value[$indexColumn] = ++$this->start;
+                $indexKey = is_string($indexColumn) ? $indexColumn : 'DT_RowIndex';
+                $value[$indexKey] = ++$this->start;
             }
 
             $this->output[] = $object ? $value : $this->flatten($value);

src/Utilities/Helper.php

@@ -7,7 +7,6 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Blade;
-use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Str;
 use ReflectionFunction;
 use ReflectionMethod;
@@ -19,11 +18,11 @@ class Helper
      */
     public static function includeInArray(array $item, array $array): array
     {
-        /** @var int|string $itemName */
-        $itemName = is_int($item['name']) || is_string($item['name']) ? $item['name'] : (string) $item['name'];
-
+        $itemName = isset($item['name']) && is_string($item['name']) ? $item['name'] : '';
+        $itemContent = $item['content'] ?? null;
+        
         if (self::isItemOrderInvalid($item, $array)) {
-            return array_merge($array, [$itemName => $item['content']]);
+            return array_merge($array, [$itemName => $itemContent]);
         }
 
         $count = 0;
@@ -40,7 +39,7 @@ public static function includeInArray(array $item, array $array): array
             $count++;
         }
 
-        return array_merge($first, [$itemName => $item['content']], $last);
+        return array_merge($first, [$itemName => $itemContent], $last);
     }
 
     /**
@@ -358,7 +357,8 @@ public static function isJavascript(string|array|object|null $value, string $key
             return false;
         }
 
-        $callbacks = Config::array('datatables.callback', ['$', '$.', 'function']);
+        /** @var array $callbacks */
+        $callbacks = config('datatables.callback', ['$', '$.', 'function']);
 
         if (Str::startsWith($key, 'language.')) {
             return false;