L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-49329 admin: Make core_plugin_manager better suited for unit testing

Browse Source 
We can now override the plugin manager's methods in the testable
subclass while still keeping the singleton behaviour of it. The change
makes use of late static binding.
This commit is contained in:
David Mudrák
2015-10-08 23:32:02 +02:00
parent 30d8bc5f66
commit 361feecdcf
3 changed files with 79 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/plugin_manager.php
+15 -15
View File
@@ -86,10 +86,10 @@ class core_plugin_manager {
* @return core_plugin_manager the singleton instance
*/
public static function instance() {
if (is_null(self::$singletoninstance)) {
self::$singletoninstance = new self();
if (is_null(static::$singletoninstance)) {
static::$singletoninstance = new static();
}
return self::$singletoninstance;
return static::$singletoninstance;
}
/**
@@ -98,15 +98,15 @@ class core_plugin_manager {
*/
public static function reset_caches($phpunitreset = false) {
if ($phpunitreset) {
self::$singletoninstance = null;
static::$singletoninstance = null;
} else {
if (self::$singletoninstance) {
self::$singletoninstance->pluginsinfo = null;
self::$singletoninstance->subpluginsinfo = null;
self::$singletoninstance->installedplugins = null;
self::$singletoninstance->enabledplugins = null;
self::$singletoninstance->presentplugins = null;
self::$singletoninstance->plugintypes = null;
if (static::$singletoninstance) {
static::$singletoninstance->pluginsinfo = null;
static::$singletoninstance->subpluginsinfo = null;
static::$singletoninstance->installedplugins = null;
static::$singletoninstance->enabledplugins = null;
static::$singletoninstance->presentplugins = null;
static::$singletoninstance->plugintypes = null;
}
}
$cache = cache::make('core', 'plugin_manager');
@@ -238,7 +238,7 @@ class core_plugin_manager {
$plugintypes = core_component::get_plugin_types();
foreach ($plugintypes as $plugintype => $fulldir) {
$plugininfoclass = self::resolve_plugininfo_class($plugintype);
$plugininfoclass = static::resolve_plugininfo_class($plugintype);
if (class_exists($plugininfoclass)) {
$enabled = $plugininfoclass::get_enabled_plugins();
if (!is_array($enabled)) {
@@ -374,13 +374,13 @@ class core_plugin_manager {
if (!isset($types[$type])) {
// Orphaned subplugins!
$plugintypeclass = self::resolve_plugininfo_class($type);
$plugintypeclass = static::resolve_plugininfo_class($type);
$this->pluginsinfo[$type] = $plugintypeclass::get_plugins($type, null, $plugintypeclass);
return $this->pluginsinfo[$type];
}
/** @var \core\plugininfo\base $plugintypeclass */
$plugintypeclass = self::resolve_plugininfo_class($type);
$plugintypeclass = static::resolve_plugininfo_class($type);
$plugins = $plugintypeclass::get_plugins($type, $types[$type], $plugintypeclass);
$this->pluginsinfo[$type] = $plugins;
@@ -1297,7 +1297,7 @@ class core_plugin_manager {
return false;
}
if ($pluginfo->get_status() === self::PLUGIN_STATUS_NEW) {
if ($pluginfo->get_status() === static::PLUGIN_STATUS_NEW) {
// The plugin is not installed. It should be either installed or removed from the disk.
// Relying on this temporary state may be tricky.
return false;