Merge pull request #306 from FriendsOfCake/issue-305

Fix error when bake plugin is not loaded.

composer.json

@@ -26,7 +26,7 @@
     },
     "require-dev": {
         "cakephp/twig-view": "^1.1.1",
-        "cakephp/bake": "^2.2.0",
+        "cakephp/bake": "^2.3",
         "phpunit/phpunit": "~8.5.0",
         "cakephp/cakephp-codesniffer": "^4.0",
         "muffin/webservice": "^3.0@beta"

src/Command/BakeFilterCollectionCommand.php → src/Command/Bake/FilterCollectionCommand.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Search\Command;
+namespace Search\Command\Bake;
 
 use Bake\Command\BakeCommand;
 use Bake\Utility\TemplateRenderer;
@@ -19,7 +19,7 @@
  * src/Model/Filter/MyCustomFilterCollection.php
  * src/Model/Filter/Admin/UsersFilterCollection.php
  */
-class BakeFilterCollectionCommand extends BakeCommand
+class FilterCollectionCommand extends BakeCommand
 {
     /**
      * Task name used in path generation.

src/Plugin.php

@@ -3,6 +3,7 @@
 
 namespace Search;
 
+use Cake\Console\CommandCollection;
 use Cake\Core\BasePlugin;
 
 class Plugin extends BasePlugin
@@ -27,4 +28,17 @@ class Plugin extends BasePlugin
      * @var bool
      */
     protected $routesEnabled = false;
+
+    /**
+     * Add console commands for the plugin.
+     *
+     * @param \Cake\Console\CommandCollection $commands The command collection to update
+     * @return \Cake\Console\CommandCollection
+     */
+    public function console(CommandCollection $commands): CommandCollection
+    {
+        // Bake plugin handles discovery of bake commands itself.
+        // Since we currently only have a command class for bake command, we don't need to to anything here.
+        return $commands;
+    }
 }

tests/TestCase/Command/BakeFilterCollectionCommandTest.php → tests/TestCase/Command/Bake/FilterCollectionCommandTest.php

@@ -1,17 +1,20 @@
 <?php
 declare(strict_types=1);
 
-namespace Search\Test\TestCase\Command;
+namespace Search\Test\TestCase\Command\Bake;
 
 use Cake\Console\BaseCommand;
+use Cake\Console\CommandCollection;
 use Cake\Console\ConsoleInput;
 use Cake\Core\Plugin;
-use Cake\Filesystem\Folder;
+use Cake\Event\EventManager;
+use Cake\Filesystem\Filesystem;
 use Cake\TestSuite\ConsoleIntegrationTestTrait;
 use Cake\TestSuite\StringCompareTrait;
 use Cake\TestSuite\TestCase;
+use Search\Command\Bake\FilterCollectionCommand;
 
-class BakeFilterCollectionCommandTest extends TestCase
+class FilterCollectionCommandTest extends TestCase
 {
     use StringCompareTrait;
     use ConsoleIntegrationTestTrait;
@@ -41,12 +44,17 @@ public function setUp(): void
 
         $this->_in = $this->getMockBuilder(ConsoleInput::class)->getMock();
 
-        $files = (new Folder($this->_generatedBasePath))->findRecursive();
-        foreach ($files as $file) {
-            unlink($file);
-        }
+        $fs = new Filesystem();
+        $fs->deleteDir($this->_generatedBasePath);
 
         $this->useCommandRunner();
+
+        EventManager::instance()->on(
+            'Console.buildCommands',
+            function ($event, CommandCollection $commands) {
+                $commands->add(FilterCollectionCommand::defaultName(), FilterCollectionCommand::class);
+            }
+        );
     }
 
     /**