Merge remote-tracking branch 'origin/column-renderer' into column-ren…

…derer
yiisoft · Nov 23, 2023 · 963383f · 963383f
2 parents c927ccb + 6648e19
commit 963383f
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 20 deletions.
diff --git a/src/Column/ActionColumnRenderer.php b/src/Column/ActionColumnRenderer.php
@@ -96,7 +96,7 @@ public function renderFooter(ColumnInterface $column, Cell $cell, GlobalContext
     private function createUrl(ActionColumn $column, string $action, array|object $data, mixed $key): string
     {
         if ($column->getUrlCreator() !== null) {
-            return (string) call_user_func($column->getUrlCreator(), $action, $data, $key);
+            return (string) ($column->getUrlCreator())($action, $data, $key);
         }
 
         $primaryKey = $column->getPrimaryKey();

diff --git a/src/Column/DataColumn.php b/src/Column/DataColumn.php
@@ -6,18 +6,9 @@
 
 use InvalidArgumentException;
 use Stringable;
-use Yiisoft\Arrays\ArrayHelper;
-use Yiisoft\Data\Paginator\OffsetPaginator;
-use Yiisoft\Data\Paginator\PaginatorInterface;
-use Yiisoft\Html\Tag\Input;
-use Yiisoft\Html\Tag\Select;
 use Yiisoft\Yii\DataView\Column\Base\Cell;
-use Yiisoft\Yii\DataView\Column\Base\GlobalContext;
-use Yiisoft\Yii\DataView\Column\Base\DataContext;
 use Yiisoft\Yii\DataView\Helper\Attribute;
 
-use Yiisoft\Yii\DataView\LinkSorter;
-
 use function sprintf;
 
 /**

diff --git a/src/Column/DataColumnRenderer.php b/src/Column/DataColumnRenderer.php
@@ -18,8 +18,6 @@
 
 final class DataColumnRenderer implements ColumnRendererInterface
 {
-
-
     public function renderColumn(ColumnInterface $column, Cell $cell, GlobalContext $context): Cell
     {
         $this->checkColumn($column);

diff --git a/tests/Column/ActionColumnTest.php b/tests/Column/ActionColumnTest.php
@@ -10,7 +10,6 @@
 use Yiisoft\Definitions\Exception\NotInstantiableException;
 use Yiisoft\Factory\NotFoundException;
 use Yiisoft\Html\Html;
-use Yiisoft\Html\Tag\A;
 use Yiisoft\Yii\DataView\Column\ActionColumn;
 use Yiisoft\Yii\DataView\Column\Base\DataContext;
 use Yiisoft\Yii\DataView\Column\DataColumn;

diff --git a/tests/Column/CheckboxColumnTest.php b/tests/Column/CheckboxColumnTest.php
@@ -65,9 +65,7 @@ public function testContent(): void
                 ->columns(
                     new DataColumn('id'),
                     new DataColumn('name'),
-                    new CheckboxColumn(content: static function (Checkbox $input, DataContext $context): string {
-                        return '<input name="checkbox-selection" type="checkbox" value="' . $context->getIndex() . '">';
-                    }),
+                    new CheckboxColumn(content: static fn(Checkbox $input, DataContext $context): string => '<input name="checkbox-selection" type="checkbox" value="' . $context->getIndex() . '">'),
                 )
                 ->id('w1-grid')
                 ->dataReader($this->createOffsetPaginator($this->data, 10))
@@ -115,10 +113,8 @@ public function testContentAttributes(): void
                     new DataColumn('id'),
                     new DataColumn('name'),
                     new CheckboxColumn(
-                        content: static function (Checkbox $input, DataContext $context): string {
-                            return '<input name="checkbox-selection" type="checkbox" value="'
-                                . $context->getIndex() . '">';
-                        },
+                        content: static fn(Checkbox $input, DataContext $context): string => '<input name="checkbox-selection" type="checkbox" value="'
+                            . $context->getIndex() . '">',
                         bodyAttributes: ['class' => 'test.class'],
                     ),
                 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,8 +18,6 @@ @@
     final class DataColumnRenderer implements ColumnRendererInterface
     {
         public function renderColumn(ColumnInterface $column, Cell $cell, GlobalContext $context): Cell
         {
             $this->checkColumn($column);
@@ Expand Down @@