Skip to content

Commit efdc115

Browse files
committed
Fix up getDisplayField() in relation to Cake 6.0
1 parent 2edc94f commit efdc115

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/Command/ModelCommand.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -641,15 +641,15 @@ public function findBelongsToMany(Table $model, array $associations): array
641641
*
642642
* @param \Cake\ORM\Table $model The model to introspect.
643643
* @param \Cake\Console\Arguments $args CLI Arguments
644-
* @return array<string>|string|null
644+
* @return array<string>|string
645645
*/
646-
public function getDisplayField(Table $model, Arguments $args): array|string|null
646+
public function getDisplayField(Table $model, Arguments $args): array|string
647647
{
648648
if ($args->getOption('display-field')) {
649649
return (string)$args->getOption('display-field');
650650
}
651651

652-
return $model->getDisplayField();
652+
return $model->getDisplayField() ?? [];
653653
}
654654

655655
/**

0 commit comments

Comments
 (0)