Stan fixes

Author: yajra

src/Processors/DataProcessor.php

@@ -81,7 +81,7 @@ public function process($object = false): array
      * Process add columns.
      *
      * @param  array  $data
-     * @param  mixed  $row
+     * @param  array|object  $row
      * @return array
      *
      * @throws \Exception
@@ -108,15 +108,15 @@ protected function addColumns(array $data, $row): array
     /**
      * Process edit columns.
      *
-     * @param  mixed  $data
-     * @param  mixed  $row
+     * @param  array  $data
+     * @param  array|object  $row
      * @return array
      *
      * @throws \Exception
      */
-    protected function editColumns($data, $row): array
+    protected function editColumns(array $data, object|array $row): array
     {
-        foreach ($this->editColumns as $key => $value) {
+        foreach ($this->editColumns as $value) {
             $value['content'] = Helper::compileContent($value['content'], $data, $row);
             Arr::set($data, $value['name'], $value['content']);
         }
@@ -128,12 +128,12 @@ protected function editColumns($data, $row): array
      * Setup additional DT row variables.
      *
      * @param  array  $data
-     * @param  mixed  $row
+     * @param  array|object  $row
      * @return array
      *
      * @throws \Exception
      */
-    protected function setupRowVariables($data, $row): array
+    protected function setupRowVariables(array $data, object|array $row): array
     {
         $processor = new RowProcessor($data, $row);
 

src/Processors/RowProcessor.php

@@ -9,9 +9,9 @@ class RowProcessor
 {
     /**
      * @param  array  $data
-     * @param  mixed  $row
+     * @param  array|object  $row
      */
-    public function __construct(protected $data, protected $row)
+    public function __construct(protected array $data, protected $row)
     {
     }
 

src/Utilities/Helper.php

@@ -6,8 +6,6 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
-use stdClass;
-use Yajra\DataTables\Exceptions\Exception;
 
 class Helper
 {
@@ -58,12 +56,12 @@ protected static function isItemOrderInvalid($item, $array)
      *
      * @param  mixed  $content  Pre-processed content
      * @param  array  $data  data to use with blade template
-     * @param  mixed  $param  parameter to call with callable
+     * @param  array|object  $param  parameter to call with callable
      * @return mixed
      *
      * @throws \Exception
      */
-    public static function compileContent($content, array $data, $param)
+    public static function compileContent($content, array $data, array|object $param)
     {
         if (is_string($content)) {
             return static::compileBlade($content, static::getMixedValue($data, $param));
@@ -102,10 +100,10 @@ public static function compileBlade($str, $data = [])
      * Get a mixed value of custom data and the parameters.
      *
      * @param  array  $data
-     * @param  mixed  $param
+     * @param  array|object  $param
      * @return array
      */
-    public static function getMixedValue(array $data, $param)
+    public static function getMixedValue(array $data, array|object $param)
     {
         $casted = self::castToArray($param);
 
@@ -123,26 +121,16 @@ public static function getMixedValue(array $data, $param)
     /**
      * Cast the parameter into an array.
      *
-     * @param  mixed  $param
+     * @param  array|object  $param
      * @return array
-     *
-     * @throws \Yajra\DataTables\Exceptions\Exception
      */
-    public static function castToArray($param): array
+    public static function castToArray(array|object $param): array
     {
-        if (is_array($param)) {
-            return $param;
-        }
-
-        if ($param instanceof stdClass) {
-            return (array) $param;
-        }
-
         if ($param instanceof Arrayable) {
             return $param->toArray();
         }
 
-        throw new Exception('Invalid parameter type.');
+        return (array) $param;
     }
 
     /**
@@ -169,8 +157,10 @@ public static function getOrMethod($method)
      */
     public static function convertToArray($row, $filters = [])
     {
-        $row = is_object($row) && method_exists($row, 'makeHidden') ? $row->makeHidden(Arr::get($filters, 'hidden', [])) : $row;
-        $row = is_object($row) && method_exists($row, 'makeVisible') ? $row->makeVisible(Arr::get($filters, 'visible', [])) : $row;
+        $row = is_object($row) && method_exists($row, 'makeHidden') ? $row->makeHidden(Arr::get($filters, 'hidden',
+            [])) : $row;
+        $row = is_object($row) && method_exists($row, 'makeVisible') ? $row->makeVisible(Arr::get($filters, 'visible',
+            [])) : $row;
         $data = $row instanceof Arrayable ? $row->toArray() : (array) $row;
 
         foreach ($data as &$value) {