Merge pull request #344 from FriendsOfCake/action-group-single-action

ADmad · web-flow · commit adad112067d3 · 2025-04-19T17:58:18.000+05:30
Don't generate dropdown if the action group has only 1 action.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -19,7 +19,7 @@ parameters:
 			path: src/Listener/ViewListener.php
 
 		-
-			message: '#^Parameter \#1 \$field of method CrudView\\Listener\\ViewListener\:\:_deriveFieldFromContext\(\) expects string, list\<string\>\|string\|null given\.$#'
+			message: '#^Parameter \#1 \$field of method CrudView\\Listener\\ViewListener\:\:_deriveFieldFromContext\(\) expects string, array\<string\>\|string\|null given\.$#'
 			identifier: argument.type
 			count: 1
 			path: src/Listener/ViewListener.php
diff --git a/src/Breadcrumb/ActiveBreadcrumb.php b/src/Breadcrumb/ActiveBreadcrumb.php
@@ -9,7 +9,6 @@ class ActiveBreadcrumb extends Breadcrumb
     /**
      * // phpcs:ignore
      * @inheritDoc
-     * @psalm-suppress MissingParamType
      */
     public function __construct(string|array $title, string|array|null $url = null, array $options = [])
     {
diff --git a/src/Listener/ViewListener.php b/src/Listener/ViewListener.php
@@ -42,7 +42,7 @@ class ViewListener extends BaseListener
      *
      * @param \Cake\Event\EventInterface $event Event.
      * @return void
-     * @psalm-param \Cake\Event\EventInterface<\Crud\Event\Subject> $event
+     * @phpstan-param \Cake\Event\EventInterface<\Crud\Event\Subject> $event
      */
     public function beforeFind(EventInterface $event): void
     {
@@ -63,7 +63,7 @@ public function beforeFind(EventInterface $event): void
      *
      * @param \Cake\Event\EventInterface $event Event.
      * @return void
-     * @psalm-param \Cake\Event\EventInterface<\Crud\Event\Subject> $event
+     * @phpstan-param \Cake\Event\EventInterface<\Crud\Event\Subject> $event
      */
     public function beforePaginate(EventInterface $event): void
     {
@@ -84,7 +84,7 @@ public function beforePaginate(EventInterface $event): void
      *
      * @param \Cake\Event\EventInterface $event Event.
      * @return void
-     * @psalm-param \Cake\Event\EventInterface<\Crud\Event\Subject> $event
+     * @phpstan-param \Cake\Event\EventInterface<\Crud\Event\Subject> $event
      */
     public function beforeRender(EventInterface $event): void
     {
@@ -96,7 +96,6 @@ public function beforeRender(EventInterface $event): void
             $this->_entity = $event->getSubject()->entity;
         }
 
-        /** @psalm-suppress RedundantPropertyInitializationCheck */
         if (!isset($this->associations)) {
             $this->associations = $this->_associations(array_keys($this->_getRelatedModels()));
         }
@@ -134,12 +133,11 @@ public function beforeRender(EventInterface $event): void
      *
      * @param \Cake\Event\EventInterface $event Event.
      * @return void
-     * @psalm-param \Cake\Event\EventInterface<\Crud\Event\Subject> $event
+     * @phpstan-param \Cake\Event\EventInterface<\Crud\Event\Subject> $event
      */
     public function setFlash(EventInterface $event): void
     {
         unset($event->getSubject()->params['class']);
-        /** @psalm-suppress UndefinedPropertyAssignment */
         $event->getSubject()->element = ltrim($event->getSubject()->type);
     }
 
@@ -181,11 +179,11 @@ protected function _getPageTitle(): string
             $displayFieldValue === null
             || $this->_model()->getDisplayField() === $this->_model()->getPrimaryKey()
         ) {
-            /** @psalm-var string $primaryKeyValue */
+            /** @phpstan-var string $primaryKeyValue */
             return sprintf('%s %s #%s', $actionName, $controllerName, $primaryKeyValue);
         }
 
-        /** @psalm-var string $primaryKeyValue */
+        /** @phpstan-var string $primaryKeyValue */
         return sprintf('%s %s #%s: %s', $actionName, $controllerName, $primaryKeyValue, $displayFieldValue);
     }
 
@@ -410,9 +408,7 @@ protected function _getControllerActions(): array
         }
 
         foreach ($actionBlacklist as $actionName) {
-            /** @psalm-suppress EmptyArrayAccess */
             unset($table[$actionName]);
-            /** @psalm-suppress EmptyArrayAccess */
             unset($entity[$actionName]);
         }
 
@@ -440,7 +436,6 @@ protected function _getControllerActionConfiguration(string $actionName, array $
         if ($this->_crud()->isActionMapped($realAction)) {
             $action = $this->_action($realAction);
             $class = get_class($action);
-            /** @psalm-suppress PossiblyFalseOperand */
             $class = substr($class, strrpos($class, '\\') + 1);
 
             if ($class === 'DeleteAction') {
@@ -591,7 +586,6 @@ protected function _primaryKeyValue(): array|string|int|null
      */
     protected function _displayFieldValue(): string|int|null
     {
-        /** @psalm-suppress PossiblyInvalidArgument */
         return $this->_deriveFieldFromContext($this->_model()->getDisplayField());
     }
 
diff --git a/src/Listener/ViewSearchListener.php b/src/Listener/ViewSearchListener.php
@@ -144,7 +144,6 @@ public function fields(): array
                 $input['class'] = 'autocomplete';
             }
 
-            /** @psalm-suppress PossiblyUndefinedArrayOffset */
             if (
                 !empty($input['class'])
                 && strpos($input['class'], 'autocomplete') !== false
@@ -156,7 +155,6 @@ public function fields(): array
                     $input['options'][$input['value']] = $input['value'];
                 }
 
-                /** @psalm-suppress PossiblyInvalidOperand */
                 $input += [
                     'data-input-type' => 'text',
                     'data-tags' => 'true',
diff --git a/src/View/Cell/TablesListCell.php b/src/View/Cell/TablesListCell.php
@@ -25,7 +25,6 @@ public function display(?array $tables = null, ?array $blacklist = null): void
             $tables = $schema->listTables();
             sort($tables);
 
-            /** @psalm-suppress RiskyTruthyFalsyComparison */
             if (!empty($blacklist)) {
                 $tables = array_diff($tables, $blacklist);
             }
diff --git a/src/View/Helper/CrudViewHelper.php b/src/View/Helper/CrudViewHelper.php
@@ -155,7 +155,6 @@ public function introspect(string $field, mixed $value, array $options = []): ar
 
         $fieldFormatters = $this->getConfig('fieldFormatters');
         if (isset($fieldFormatters[$type])) {
-            /** @psalm-suppress PossiblyNullArrayOffset */
             if (is_callable($fieldFormatters[$type])) {
                 return $fieldFormatters[$type](
                     $field,
@@ -166,7 +165,6 @@ public function introspect(string $field, mixed $value, array $options = []): ar
                 );
             }
 
-            /** @psalm-suppress PossiblyNullArrayOffset */
             return $this->{$fieldFormatters[$type]}($field, $value, $options);
         }
 
diff --git a/src/View/Widget/DateTimeWidget.php b/src/View/Widget/DateTimeWidget.php
@@ -111,7 +111,6 @@ public function render(array $data, ContextInterface $context): string
 
         $clearIcon = $this->clearIcon;
         $toggleIcon = $this->calendarIcon;
-        /** @psalm-suppress PossiblyUndefinedArrayOffset */
         if (isset($datetimePicker['iconClass'])) {
             $toggleIcon = $datetimePicker['iconClass'];
             unset($datetimePicker['iconClass']);
@@ -155,7 +154,6 @@ public function render(array $data, ContextInterface $context): string
             return $input;
         }
 
-        /** @psalm-suppress PossiblyInvalidArrayOffset */
         return $this->_templates->format('datetimePicker', [
             'input' => $input,
             'toggleIcon' => $toggleIcon,
diff --git a/templates/element/action-groups.php b/templates/element/action-groups.php
@@ -15,6 +15,17 @@
 ?>
 
 <?php foreach ($groups as $key => $group) : ?>
+    <?php
+    if (count($group) === 1) {
+        $subaction = key($group);
+        if (is_numeric($subaction)) {
+            $subaction = $group[$subaction];
+        }
+
+        echo $this->element('action-button', ['config' => $links[$subaction]]);
+        continue;
+    }
+    ?>
     <div class='btn-group' role="group">
         <button type="button" class="btn btn-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
             <?= $key ?>

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ parameters:`
`19`	`19`	`path: src/Listener/ViewListener.php`
`20`	`20`
`21`	`21`	`-`
`22`		`- message: '#^Parameter \#1 \$field of method CrudView\\Listener\\ViewListener\:\:_deriveFieldFromContext\(\) expects string, list\<string\>\\|string\\|null given\.$#'`
	`22`	`+ message: '#^Parameter \#1 \$field of method CrudView\\Listener\\ViewListener\:\:_deriveFieldFromContext\(\) expects string, array\<string\>\\|string\\|null given\.$#'`
`23`	`23`	`identifier: argument.type`
`24`	`24`	`count: 1`
`25`	`25`	`path: src/Listener/ViewListener.php`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ class ActiveBreadcrumb extends Breadcrumb`
`9`	`9`	`/**`
`10`	`10`	`* // phpcs:ignore`
`11`	`11`	`* @inheritDoc`
`12`		`- * @psalm-suppress MissingParamType`
`13`	`12`	`*/`
`14`	`13`	`public function __construct(string\|array $title, string\|array\|null $url = null, array $options = [])`
`15`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class ViewListener extends BaseListener`
`42`	`42`	`*`
`43`	`43`	`* @param \Cake\Event\EventInterface $event Event.`
`44`	`44`	`* @return void`
`45`		`- * @psalm-param \Cake\Event\EventInterface<\Crud\Event\Subject> $event`
	`45`	`+ * @phpstan-param \Cake\Event\EventInterface<\Crud\Event\Subject> $event`
`46`	`46`	`*/`
`47`	`47`	`public function beforeFind(EventInterface $event): void`
`48`	`48`	`{`
`@@ -63,7 +63,7 @@ public function beforeFind(EventInterface $event): void`
`63`	`63`	`*`
`64`	`64`	`* @param \Cake\Event\EventInterface $event Event.`
`65`	`65`	`* @return void`
`66`		`- * @psalm-param \Cake\Event\EventInterface<\Crud\Event\Subject> $event`
	`66`	`+ * @phpstan-param \Cake\Event\EventInterface<\Crud\Event\Subject> $event`
`67`	`67`	`*/`
`68`	`68`	`public function beforePaginate(EventInterface $event): void`
`69`	`69`	`{`
`@@ -84,7 +84,7 @@ public function beforePaginate(EventInterface $event): void`
`84`	`84`	`*`
`85`	`85`	`* @param \Cake\Event\EventInterface $event Event.`
`86`	`86`	`* @return void`
`87`		`- * @psalm-param \Cake\Event\EventInterface<\Crud\Event\Subject> $event`
	`87`	`+ * @phpstan-param \Cake\Event\EventInterface<\Crud\Event\Subject> $event`
`88`	`88`	`*/`
`89`	`89`	`public function beforeRender(EventInterface $event): void`
`90`	`90`	`{`
`@@ -96,7 +96,6 @@ public function beforeRender(EventInterface $event): void`
`96`	`96`	`$this->_entity = $event->getSubject()->entity;`
`97`	`97`	`}`
`98`	`98`
`99`		`- /** @psalm-suppress RedundantPropertyInitializationCheck */`
`100`	`99`	`if (!isset($this->associations)) {`
`101`	`100`	`$this->associations = $this->_associations(array_keys($this->_getRelatedModels()));`
`102`	`101`	`}`
`@@ -134,12 +133,11 @@ public function beforeRender(EventInterface $event): void`
`134`	`133`	`*`
`135`	`134`	`* @param \Cake\Event\EventInterface $event Event.`
`136`	`135`	`* @return void`
`137`		`- * @psalm-param \Cake\Event\EventInterface<\Crud\Event\Subject> $event`
	`136`	`+ * @phpstan-param \Cake\Event\EventInterface<\Crud\Event\Subject> $event`
`138`	`137`	`*/`
`139`	`138`	`public function setFlash(EventInterface $event): void`
`140`	`139`	`{`
`141`	`140`	`unset($event->getSubject()->params['class']);`
`142`		`- /** @psalm-suppress UndefinedPropertyAssignment */`
`143`	`141`	`$event->getSubject()->element = ltrim($event->getSubject()->type);`
`144`	`142`	`}`
`145`	`143`
`@@ -181,11 +179,11 @@ protected function _getPageTitle(): string`
`181`	`179`	`$displayFieldValue === null`
`182`	`180`	`\|\| $this->_model()->getDisplayField() === $this->_model()->getPrimaryKey()`
`183`	`181`	`) {`
`184`		`- /** @psalm-var string $primaryKeyValue */`
	`182`	`+ /** @phpstan-var string $primaryKeyValue */`
`185`	`183`	`return sprintf('%s %s #%s', $actionName, $controllerName, $primaryKeyValue);`
`186`	`184`	`}`
`187`	`185`
`188`		`- /** @psalm-var string $primaryKeyValue */`
	`186`	`+ /** @phpstan-var string $primaryKeyValue */`
`189`	`187`	`return sprintf('%s %s #%s: %s', $actionName, $controllerName, $primaryKeyValue, $displayFieldValue);`
`190`	`188`	`}`
`191`	`189`
`@@ -410,9 +408,7 @@ protected function _getControllerActions(): array`
`410`	`408`	`}`
`411`	`409`
`412`	`410`	`foreach ($actionBlacklist as $actionName) {`
`413`		`- /** @psalm-suppress EmptyArrayAccess */`
`414`	`411`	`unset($table[$actionName]);`
`415`		`- /** @psalm-suppress EmptyArrayAccess */`
`416`	`412`	`unset($entity[$actionName]);`
`417`	`413`	`}`
`418`	`414`
`@@ -440,7 +436,6 @@ protected function _getControllerActionConfiguration(string $actionName, array $`
`440`	`436`	`if ($this->_crud()->isActionMapped($realAction)) {`
`441`	`437`	`$action = $this->_action($realAction);`
`442`	`438`	`$class = get_class($action);`
`443`		`- /** @psalm-suppress PossiblyFalseOperand */`
`444`	`439`	`$class = substr($class, strrpos($class, '\\') + 1);`
`445`	`440`
`446`	`441`	`if ($class === 'DeleteAction') {`
`@@ -591,7 +586,6 @@ protected function _primaryKeyValue(): array\|string\|int\|null`
`591`	`586`	`*/`
`592`	`587`	`protected function _displayFieldValue(): string\|int\|null`
`593`	`588`	`{`
`594`		`- /** @psalm-suppress PossiblyInvalidArgument */`
`595`	`589`	`return $this->_deriveFieldFromContext($this->_model()->getDisplayField());`
`596`	`590`	`}`
`597`	`591`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,6 @@ public function fields(): array`
`144`	`144`	`$input['class'] = 'autocomplete';`
`145`	`145`	`}`
`146`	`146`
`147`		`- /** @psalm-suppress PossiblyUndefinedArrayOffset */`
`148`	`147`	`if (`
`149`	`148`	`!empty($input['class'])`
`150`	`149`	`&& strpos($input['class'], 'autocomplete') !== false`
`@@ -156,7 +155,6 @@ public function fields(): array`
`156`	`155`	`$input['options'][$input['value']] = $input['value'];`
`157`	`156`	`}`
`158`	`157`
`159`		`- /** @psalm-suppress PossiblyInvalidOperand */`
`160`	`158`	`$input += [`
`161`	`159`	`'data-input-type' => 'text',`
`162`	`160`	`'data-tags' => 'true',`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ public function display(?array $tables = null, ?array $blacklist = null): void`
`25`	`25`	`$tables = $schema->listTables();`
`26`	`26`	`sort($tables);`
`27`	`27`
`28`		`- /** @psalm-suppress RiskyTruthyFalsyComparison */`
`29`	`28`	`if (!empty($blacklist)) {`
`30`	`29`	`$tables = array_diff($tables, $blacklist);`
`31`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,6 @@ public function introspect(string $field, mixed $value, array $options = []): ar`
`155`	`155`
`156`	`156`	`$fieldFormatters = $this->getConfig('fieldFormatters');`
`157`	`157`	`if (isset($fieldFormatters[$type])) {`
`158`		`- /** @psalm-suppress PossiblyNullArrayOffset */`
`159`	`158`	`if (is_callable($fieldFormatters[$type])) {`
`160`	`159`	`return $fieldFormatters[$type](`
`161`	`160`	`$field,`
`@@ -166,7 +165,6 @@ public function introspect(string $field, mixed $value, array $options = []): ar`
`166`	`165`	`);`
`167`	`166`	`}`
`168`	`167`
`169`		`- /** @psalm-suppress PossiblyNullArrayOffset */`
`170`	`168`	`return $this->{$fieldFormatters[$type]}($field, $value, $options);`
`171`	`169`	`}`
`172`	`170`