Merge branch '3.next' into 3.x

Author: markstory

src/Command/BakeCommand.php

@@ -27,6 +27,7 @@
 use Cake\Core\ConventionsTrait;
 use Cake\Event\Event;
 use Cake\Event\EventManager;
+use Cake\ORM\Locator\TableLocator;
 use InvalidArgumentException;
 use function Cake\Core\pluginSplit;
 
@@ -48,6 +49,22 @@ abstract class BakeCommand extends Command
      */
     protected string $pathFragment;
 
+    /**
+     * Initialize the command.
+     *
+     * @return void
+     */
+    public function initialize(): void
+    {
+        parent::initialize();
+
+        $locator = $this->getTableLocator();
+        if ($locator instanceof TableLocator) {
+            $locator->allowFallbackClass(true);
+            $this->setTableLocator($locator);
+        }
+    }
+
     /**
      * Get the command name.
      *

src/Command/ModelCommand.php

@@ -642,15 +642,15 @@ public function findBelongsToMany(Table $model, array $associations): array
      *
      * @param \Cake\ORM\Table $model The model to introspect.
      * @param \Cake\Console\Arguments $args CLI Arguments
-     * @return array<string>|string|null
+     * @return array<string>|string
      */
-    public function getDisplayField(Table $model, Arguments $args): array|string|null
+    public function getDisplayField(Table $model, Arguments $args): array|string
     {
         if ($args->getOption('display-field')) {
             return (string)$args->getOption('display-field');
         }
 
-        return $model->getDisplayField();
+        return $model->getDisplayField() ?? [];
     }
 
     /**

src/Command/TemplateCommand.php

@@ -100,6 +100,8 @@ class TemplateCommand extends BakeCommand
      */
     public function initialize(): void
     {
+        parent::initialize();
+
         $this->path = current(App::path('templates'));
     }