Merge pull request #8016 from piwik/fix/deactivating-plugins

Deactivating a plugin: clear the caches before unloading the plugin

core/Plugin/Manager.php

@@ -337,6 +337,8 @@ class Manager
      */
     public function deactivatePlugin($pluginName)
     {
+        $this->clearCache($pluginName);
+
         // execute deactivate() to let the plugin do cleanups
         $this->executePluginDeactivate($pluginName);
 
@@ -344,8 +346,6 @@ class Manager
 
         $this->removePluginFromConfig($pluginName);
 
-        $this->clearCache($pluginName);
-
         /**
          * Event triggered after a plugin has been deactivated.
          *

tests/PHPUnit/Integration/Plugin/ManagerTest.php

@@ -75,6 +75,15 @@ class ManagerTest extends IntegrationTestCase
         $this->assertEquals(array(), $this->manager->getLoadedPlugins());
     }
 
+    public function test_deactivatePlugin()
+    {
+        $this->assertFalse($this->manager->isPluginActivated('ExampleTheme'));
+        $this->manager->activatePlugin('ExampleTheme');
+        $this->assertTrue($this->manager->isPluginActivated('ExampleTheme'));
+        $this->manager->deactivatePlugin('ExampleTheme');
+        $this->assertFalse($this->manager->isPluginActivated('ExampleTheme'));
+    }
+
     private function getCacheForTrackerPlugins()
     {
         return PiwikCache::getEagerCache();