Resolving a problem with global state messing up with tests

core/Menu/MenuAbstract.php

@@ -55,15 +55,25 @@ abstract class MenuAbstract extends Singleton
      */
     protected function getAllMenus()
     {
-//        if (!empty(self::$menus)) {
-//            return self::$menus;
-//        }
+        if (!empty(self::$menus)) {
+            return self::$menus;
+        }
 
         self::$menus = PluginManager::getInstance()->findComponents('Menu', 'Piwik\\Plugin\\Menu');
 
         return self::$menus;
     }
 
+    /**
+     * To use only for tests.
+     *
+     * @deprecated The whole $menus cache should be replaced by a real transient cache
+     */
+    public static function clearMenus()
+    {
+        self::$menus = array();
+    }
+
     /**
      * Adds a new entry to the menu.
      *

tests/PHPUnit/Framework/TestCase/IntegrationTestCase.php

@@ -11,6 +11,7 @@ namespace Piwik\Tests\Framework\TestCase;
 use Piwik\Access;
 use Piwik\Config;
 use Piwik\Db;
+use Piwik\Menu\MenuAbstract;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Cache as PiwikCache;
 use Piwik\Tests\Framework\TestingEnvironmentVariables;
@@ -88,6 +89,7 @@ abstract class IntegrationTestCase extends SystemTestCase
 
         PiwikCache::getEagerCache()->flushAll();
         PiwikCache::getTransientCache()->flushAll();
+        MenuAbstract::clearMenus();
     }
 
     /**