Merge pull request #911 from cakephp/issue-909

Fix error when trying to bake with non-existent plugins directory.
cakephp · Feb 21, 2023 · 4e1ac8f · 4e1ac8f
2 parents e7e795c + 63acf52
commit 4e1ac8f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/src/Command/PluginCommand.php b/src/Command/PluginCommand.php
@@ -383,7 +383,7 @@ public function buildOptionParser(ConsoleOptionParser $parser): ConsoleOptionPar
         ])->addOption('theme', [
             'short' => 't',
             'help' => 'The theme to use when baking code.',
-            'default' => Configure::read('Bake.theme') ?? '',
+            'default' => Configure::read('Bake.theme') ?: null,
             'choices' => $this->_getBakeThemes(),
         ]);
 

diff --git a/tests/TestCase/Command/PluginCommandTest.php b/tests/TestCase/Command/PluginCommandTest.php
@@ -34,6 +34,8 @@ class PluginCommandTest extends TestCase
 {
     protected $testAppFile = APP . 'Application.php';
 
+    protected $pluginsPath = TMP . 'plugin_task' . DS;
+
     /**
      * setUp method
      *
@@ -47,11 +49,10 @@ public function setUp(): void
         $this->useCommandRunner();
 
         // Output into a safe place.
-        $path = TMP . 'plugin_task' . DS;
-        Configure::write('App.paths.plugins', [$path]);
+        Configure::write('App.paths.plugins', [$this->pluginsPath]);
 
         // Create the test output path
-        mkdir($path, 0777, true);
+        mkdir($this->pluginsPath, 0777, true);
 
         if (file_exists(APP . 'Application.php.bak')) {
             rename(APP . 'Application.php.bak', APP . 'Application.php');
@@ -68,7 +69,7 @@ public function setUp(): void
     public function tearDown(): void
     {
         $fs = new Filesystem();
-        $fs->deleteDir(TMP . 'plugin_task');
+        $fs->deleteDir($this->pluginsPath);
 
         if (file_exists(APP . 'Application.php.bak')) {
             rename(APP . 'Application.php.bak', APP . 'Application.php');
@@ -89,6 +90,16 @@ public function testMainBakePluginContents()
         $this->assertPluginContents('SimpleExample');
     }
 
+    public function testBakingWithNonExistentPluginsDir()
+    {
+        $fs = new Filesystem();
+        $fs->deleteDir($this->pluginsPath);
+
+        $this->exec('bake plugin SimpleExample', ['y', 'n']);
+        $this->assertExitCode(CommandInterface::CODE_SUCCESS);
+        $this->assertPluginContents('SimpleExample');
+    }
+
     /**
      * test creating a plugin with a custom app namespace.
      *
@@ -211,7 +222,7 @@ public function testFindPathNonExistent()
         $result = $command->findPath($paths, $io);
 
         $this->assertNull($result, 'no return');
-        $this->assertSame(TMP . 'plugin_task' . DS, $command->path);
+        $this->assertSame($this->pluginsPath, $command->path);
     }
 
     /**