Merge pull request #456 from cakephp/4.x-bake-exclude

[4.x] exclude bake commands

composer.json

@@ -26,7 +26,7 @@
     "require-dev": {
         "phpunit/phpunit": "~8.5.0",
         "cakephp/cakephp": "^4.0.5",
-        "cakephp/bake": "^2.0.9",
+        "cakephp/bake": "^2.1.0",
         "cakephp/cakephp-codesniffer": "~4.1.0"
     },
     "autoload": {

src/Plugin.php

@@ -13,6 +13,7 @@
  */
 namespace Migrations;
 
+use Cake\Console\CommandCollection;
 use Cake\Core\BasePlugin;
 
 /**
@@ -33,4 +34,46 @@ class Plugin extends BasePlugin
      * @var bool
      */
     protected $routesEnabled = false;
+
+    protected $migrationCommandsList = [
+        Command\MigrationsCommand::class,
+        Command\MigrationsCreateCommand::class,
+        Command\MigrationsDumpCommand::class,
+        Command\MigrationsMarkMigratedCommand::class,
+        Command\MigrationsMigrateCommand::class,
+        Command\MigrationsCacheBuildCommand::class,
+        Command\MigrationsCacheClearCommand::class,
+        Command\MigrationsRollbackCommand::class,
+        Command\MigrationsSeedCommand::class,
+        Command\MigrationsStatusCommand::class,
+    ];
+
+    /**
+     * Add migrations commands.
+     *
+     * @param \Cake\Console\CommandCollection $collection The command collection to update
+     * @return \Cake\Console\CommandCollection
+     */
+    public function console(CommandCollection $collection): CommandCollection
+    {
+        if (class_exists('Bake\Command\SimpleBakeCommand')) {
+            $commands = $collection->discoverPlugin($this->getName());
+
+            return $collection->addMany($commands);
+        }
+        $commands = [];
+        foreach ($this->migrationCommandsList as $class) {
+            $name = $class::defaultName();
+            // If the short name has been used, use the full name.
+            // This allows app commands to have name preference.
+            // and app commands to overwrite migration commands.
+            if (!$collection->has($name)) {
+                $commands[$name] = $class;
+            }
+            // full name
+            $commands['migrations.' . $name] = $class;
+        }
+
+        return $collection->addMany($commands);
+    }
 }

templates/bake/config/snapshot.twig

@@ -40,12 +40,12 @@ class {{ name }} extends AbstractMigration
      */
     public function up()
     {
-{% element 'Migrations.create-tables' {
+{{~ element('Migrations.create-tables', {
     tables: tables,
     autoId: autoId,
     useSchema: false
-} %}
-    }
+})
+}}    }
 
     /**
      * Down Method.

templates/bake/element/create-tables.twig

@@ -58,12 +58,13 @@
             )
 {%     endfor %}
             ->create();
-{% endfor %}
+{% endfor -%}
 {% if createData.constraints %}
 {%   for table, tableConstraints in createData.constraints %}
-{%     element 'Migrations.add-foreign-keys' {
+{{-     element('Migrations.add-foreign-keys', {
          constraints: tableConstraints,
          table: table
-       } %}
-{%   endfor %}
-{% endif %}
+       })
+-}}
+{%   endfor -%}
+{% endif -%}

tests/TestCase/TestCase.php

@@ -41,7 +41,7 @@ public function setUp(): void
         parent::setUp();
 
         Router::reload();
-        $this->loadPlugins(['WyriHaximus/TwigView']);
+        $this->loadPlugins(['Cake/TwigView']);
     }
 
     public function tearDown(): void