Fixed Unload Task for Plugin Shell. Plugins with breaked lines can no…

…w be unloaded.
cakephp · Mar 11, 2015 · 6534182 · 6534182
1 parent 9b7cf6d
commit 6534182
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Shell/Task/UnloadTask.php b/src/Shell/Task/UnloadTask.php
@@ -64,13 +64,13 @@ public function main($plugin = null)
      */
     protected function _modifyBootstrap($plugin)
     {
-        $bool = "(false|true)";
-        $finder = "/Plugin::load\('$plugin', \['autoload' => $bool, 'bootstrap' => $bool, 'routes' => $bool]\);\n/";
+        $finder = "/\nPlugin::load\('$plugin'(.|.\n|)+\);\n/";
 
         $bootstrap = new File($this->bootstrap, false);
         $contents = $bootstrap->read();
 
         if (!preg_match("@\n\s*Plugin::loadAll@", $contents)) {
+
             $contents = preg_replace($finder, "", $contents);
 
             $bootstrap->write($contents);

diff --git a/tests/TestCase/Shell/Task/UnloadTaskTest.php b/tests/TestCase/Shell/Task/UnloadTaskTest.php
@@ -73,6 +73,8 @@ public function testUnload()
 
         $this->_addPluginToBootstrap("TestPlugin");
 
+        $this->_addPluginToBootstrap("TestPluginSecond");
+
         $expected = "Plugin::load('TestPlugin', ['autoload' => true, 'bootstrap' => false, 'routes' => false]);";
         $this->assertContains($expected, $bootstrap->read());
 
@@ -81,6 +83,8 @@ public function testUnload()
         $this->assertTrue($action);
         $expected = "Plugin::load('TestPlugin', ['autoload' => true, 'bootstrap' => false, 'routes' => false]);";
         $this->assertNotContains($expected, $bootstrap->read());
+        $expected = "Plugin::load('TestPluginSecond', ['autoload' => true, 'bootstrap' => false, 'routes' => false]);";
+        $this->assertContains($expected, $bootstrap->read());
     }
 
     /**
@@ -94,6 +98,6 @@ public function testUnload()
     protected function _addPluginToBootstrap($name)
     {
         $bootstrap = new File($this->bootstrap, false);
-        $bootstrap->append("Plugin::load('" . $name . "', ['autoload' => true, 'bootstrap' => false, 'routes' => false]);\n");
+        $bootstrap->append("\nPlugin::load('" . $name . "', ['autoload' => true, 'bootstrap' => false, 'routes' => false]);");
     }
 }