mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-03 18:42:37 +00:00
Code Issues Projects Releases Wiki Activity

PluginManager: Ensure dependents are disabled before dependencies in disablePlugins() (#5227)

Browse Source 
this could later be expanded to disablePlugin() to make this disable order mandatory, to provide certainty for plugin devs.

Alternative solutions to this include disabling plugins in the opposite order that they were enabled in, but this doesn't allow for random plugin disables. This way seemed to make sense.
This commit is contained in:
Dylan T 2022-08-31 18:43:30 +01:00 committed by GitHub
parent a25cb3741a
commit 65ec318c30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugin/PluginManager.php
View File

@ -75,6 +75,9 @@ class PluginManager{
/** @var Plugin[] */
protected $enabledPlugins = [];
/** @var array<string, array<string, true>> */
private array $pluginDependents = [];
private bool $loadPluginsGuard = false;
/**
@ -453,6 +456,15 @@ class PluginManager{
if($plugin->isEnabled()){ //the plugin may have disabled itself during onEnable()
$this->enabledPlugins[$plugin->getDescription()->getName()] = $plugin;
foreach($plugin->getDescription()->getDepend() as $dependency){
$this->pluginDependents[$dependency][$plugin->getDescription()->getName()] = true;
}
foreach($plugin->getDescription()->getSoftDepend() as $dependency){
if(isset($this->plugins[$dependency])){
$this->pluginDependents[$dependency][$plugin->getDescription()->getName()] = true;
}
}
(new PluginEnableEvent($plugin))->call();
return true;
@ -472,8 +484,19 @@ class PluginManager{
}
public function disablePlugins() : void{
foreach($this->getPlugins() as $plugin){
$this->disablePlugin($plugin);
while(count($this->enabledPlugins) > 0){
foreach($this->enabledPlugins as $plugin){
if(!$plugin->isEnabled()){
continue; //in case a plugin disabled another plugin
}
$name = $plugin->getDescription()->getName();
if(isset($this->pluginDependents[$name]) && count($this->pluginDependents[$name]) > 0){
$this->server->getLogger()->debug("Deferring disable of plugin $name due to dependent plugins still enabled: " . implode(", ", array_keys($this->pluginDependents[$name])));
continue;
}
$this->disablePlugin($plugin);
}
}
}
@ -483,6 +506,12 @@ class PluginManager{
(new PluginDisableEvent($plugin))->call();
unset($this->enabledPlugins[$plugin->getDescription()->getName()]);
foreach(Utils::stringifyKeys($this->pluginDependents) as $dependency => $dependentList){
unset($this->pluginDependents[$dependency][$plugin->getDescription()->getName()]);
if(count($this->pluginDependents[$dependency]) === 0){
unset($this->pluginDependents[$dependency]);
}
}
$plugin->onEnableStateChange(false);
$plugin->getScheduler()->shutdown();