refactor add column functions

Author: pxpm

src/app/Library/CrudPanel/Traits/Columns.php

@@ -66,26 +66,17 @@ public function setColumns($columns)
      */
     public function addColumn($column)
     {
-        $column = $this->makeSureColumnHasNeededAttributes($column);
-        $this->addColumnToOperationSettings($column);
-
-        (new CrudColumn($column['name']))->callRegisteredAttributeMacros();
+        $this->prepareAttributesAndAddColumn($column);
 
         return $this;
     }
 
     /**
-     * Add a column at the end of to the CRUD object's "columns" array and return it.
-     *
-     * @param  array|string  $column
-     * @return self
+     * Add a column at the end of the CRUD object's "columns" array and return it
      */
-    public function addAndReturnColumn($column)
+    public function addAndReturnColumn(array|string $column): CrudColumn
     {
-        $column = $this->makeSureColumnHasNeededAttributes($column);
-        $this->addColumnToOperationSettings($column);
-
-        $column = (new CrudColumn($column['name']))->callRegisteredAttributeMacros();
+        $column = $this->prepareAttributesAndAddColumn($column);
 
         return $column;
     }

src/app/Library/CrudPanel/Traits/ColumnsProtectedMethods.php

@@ -2,6 +2,7 @@
 
 namespace Backpack\CRUD\app\Library\CrudPanel\Traits;
 
+use Backpack\CRUD\app\Library\CrudPanel\CrudColumn;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 
@@ -325,4 +326,17 @@ protected function hasDatabaseColumn($table, $name)
 
         return in_array($name, $columns);
     }
+
+    /**
+     * Prepare the column attributes and add it to operation settings
+     */
+    private function prepareAttributesAndAddColumn(array|string $column): CrudColumn
+    {
+        $column = $this->makeSureColumnHasNeededAttributes($column);
+        $this->addColumnToOperationSettings($column);
+
+        $column = (new CrudColumn($column['name']))->callRegisteredAttributeMacros();
+
+        return $column;
+    }
 }

tests/Unit/CrudPanel/CrudPanelColumnsTest.php

@@ -621,10 +621,14 @@ public function testItCanAddAColumnToCrudFromClass()
         CrudColumn::name('test');
         $this->assertCount(1, $this->crudPanel->columns());
     }
-
     public function testItCanAddAFluentColumnUsingArray()
     {
         $this->crudPanel->column($this->oneColumnArray);
         $this->assertCount(1, $this->crudPanel->columns());
     }
+    public function testItCanAddAFluentColumnUsingArrayWithoutName()
+    {
+        $this->crudPanel->column(['type' => 'text']);
+        $this->assertCount(1, $this->crudPanel->columns());
+    }
 }