Skip to content
Extraits de code Groupes Projets
Valider 0be511f6 rédigé par Thomas Steur's avatar Thomas Steur
Parcourir les fichiers

refs #6065 maybe this makes sure to load plugins always in same order in...

refs #6065 maybe this makes sure to load plugins always in same order in tests? As glob will return files in any order it pleases. It is only a wrapper for libc glob() function
parent 4187a5ae
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -311,6 +311,10 @@ class Fixture extends PHPUnit_Framework_Assert ...@@ -311,6 +311,10 @@ class Fixture extends PHPUnit_Framework_Assert
continue; continue;
} }
if (in_array($pluginName, $plugins)) {
continue;
}
$plugins[] = $pluginName; $plugins[] = $pluginName;
if ($testEnvironment) { if ($testEnvironment) {
$testEnvironment->pluginsToLoad = array_merge($testEnvironment->pluginsToLoad ?: array(), array($pluginName)); $testEnvironment->pluginsToLoad = array_merge($testEnvironment->pluginsToLoad ?: array(), array($pluginName));
......
...@@ -106,7 +106,7 @@ class Piwik_TestingEnvironment ...@@ -106,7 +106,7 @@ class Piwik_TestingEnvironment
'DBStats', 'ExampleUI', 'ExampleCommand', 'ExampleSettingsPlugin' 'DBStats', 'ExampleUI', 'ExampleCommand', 'ExampleSettingsPlugin'
)); ));
return array_filter(PluginManager::getInstance()->readPluginsDirectory(), function ($pluginName) use ($disabledPlugins) { $plugins = array_filter(PluginManager::getInstance()->readPluginsDirectory(), function ($pluginName) use ($disabledPlugins) {
if (in_array($pluginName, $disabledPlugins)) { if (in_array($pluginName, $disabledPlugins)) {
return false; return false;
} }
...@@ -114,6 +114,10 @@ class Piwik_TestingEnvironment ...@@ -114,6 +114,10 @@ class Piwik_TestingEnvironment
return PluginManager::getInstance()->isPluginBundledWithCore($pluginName) return PluginManager::getInstance()->isPluginBundledWithCore($pluginName)
|| PluginManager::getInstance()->isPluginOfficialAndNotBundledWithCore($pluginName); || PluginManager::getInstance()->isPluginOfficialAndNotBundledWithCore($pluginName);
}); });
sort($plugins);
return $plugins;
} }
public static function addHooks() public static function addHooks()
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter