Specify button renderer callable type (#143)

yiisoft · Dec 5, 2023 · 601909c · 601909c
1 parent 3495a4b
commit 601909c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Column/ActionColumn.php b/src/Column/ActionColumn.php
@@ -12,6 +12,7 @@
  * the items.
  *
  * @psalm-type UrlCreator = callable(string,DataContext):string
+ * @psalm-type ButtonRenderer = callable(string):string
  */
 final class ActionColumn implements ColumnInterface
 {
@@ -25,7 +26,7 @@ final class ActionColumn implements ColumnInterface
      * @param ?callable $urlCreator A callback that creates a button URL using the specified data information.
      *
      * @psalm-param UrlCreator|null $urlCreator
-     * @psalm-param array<string,Closure> $buttons
+     * @psalm-param array<string,ButtonRenderer> $buttons
      * @psalm-param array<string,bool|Closure>|null $visibleButtons
      */
     public function __construct(

diff --git a/src/Column/ActionColumnRenderer.php b/src/Column/ActionColumnRenderer.php
@@ -4,7 +4,6 @@
 
 namespace Yiisoft\Yii\DataView\Column;
 
-use Closure;
 use InvalidArgumentException;
 use LogicException;
 use Yiisoft\Html\Html;
@@ -14,6 +13,7 @@
 
 /**
  * @psalm-import-type UrlCreator from ActionColumn
+ * @psalm-import-type ButtonRenderer from ActionColumn
  */
 final class ActionColumnRenderer implements ColumnRendererInterface
 {
@@ -23,13 +23,13 @@ final class ActionColumnRenderer implements ColumnRendererInterface
     private $defaultUrlCreator;
 
     /**
-     * @psalm-var array<string,Closure>
+     * @psalm-var array<string,ButtonRenderer>
      */
     private readonly array $defaultButtons;
 
     /**
      * @psalm-param UrlCreator|null $defaultUrlCreator
-     * @psalm-param array<string,Closure> $defaultButtons
+     * @psalm-param array<string,ButtonRenderer>|null $defaultButtons
      */
     public function __construct(
         ?callable $defaultUrlCreator = null,
@@ -117,7 +117,7 @@ function (array $matches) use ($column, $buttons, $context): string {
                         isset($buttons[$name])
                     ) {
                         $url = $this->createUrl($name, $context);
-                        return (string)$buttons[$name]($url);
+                        return $buttons[$name]($url);
                     }
 
                     return '';