diff --git a/src/plugin/FolderPluginLoader.php b/src/plugin/FolderPluginLoader.php index 73f6b8841d..b881b117b8 100644 --- a/src/plugin/FolderPluginLoader.php +++ b/src/plugin/FolderPluginLoader.php @@ -41,11 +41,8 @@ class FolderPluginLoader implements PluginLoader{ /** * Loads the plugin contained in $file */ - public function loadPlugin(string $path) : void{ - $description = $this->getPluginDescription($path); - if($description !== null){ - $this->loader->addPath($description->getSrcNamespacePrefix(), "$path/src"); - } + public function loadPlugin(string $path, PluginDescription $description) : void{ + $this->loader->addPath($description->getSrcNamespacePrefix(), "$path/src"); } /** diff --git a/src/plugin/PharPluginLoader.php b/src/plugin/PharPluginLoader.php index 1ef8f2b841..865ab2edcf 100644 --- a/src/plugin/PharPluginLoader.php +++ b/src/plugin/PharPluginLoader.php @@ -42,11 +42,8 @@ class PharPluginLoader implements PluginLoader{ /** * Loads the plugin contained in $file */ - public function loadPlugin(string $path) : void{ - $description = $this->getPluginDescription($path); - if($description !== null){ - $this->loader->addPath($description->getSrcNamespacePrefix(), "$path/src"); - } + public function loadPlugin(string $path, PluginDescription $description) : void{ + $this->loader->addPath($description->getSrcNamespacePrefix(), "$path/src"); } /** diff --git a/src/plugin/PluginLoader.php b/src/plugin/PluginLoader.php index d87daf9fc4..b29448965b 100644 --- a/src/plugin/PluginLoader.php +++ b/src/plugin/PluginLoader.php @@ -36,7 +36,7 @@ interface PluginLoader{ /** * Loads the plugin contained in $file */ - public function loadPlugin(string $path) : void; + public function loadPlugin(string $path, PluginDescription $description) : void; /** * Gets the PluginDescription from the file diff --git a/src/plugin/PluginManager.php b/src/plugin/PluginManager.php index 3750af3ef8..5e4196d7d2 100644 --- a/src/plugin/PluginManager.php +++ b/src/plugin/PluginManager.php @@ -150,7 +150,7 @@ class PluginManager{ } $prefixed = $loader->getAccessProtocol() . $path; - $loader->loadPlugin($prefixed); + $loader->loadPlugin($prefixed, $description); $mainClass = $description->getMain(); if(!class_exists($mainClass, true)){ diff --git a/src/plugin/ScriptPluginLoader.php b/src/plugin/ScriptPluginLoader.php index 8e45eaab8c..1d0e42d53f 100644 --- a/src/plugin/ScriptPluginLoader.php +++ b/src/plugin/ScriptPluginLoader.php @@ -46,7 +46,7 @@ class ScriptPluginLoader implements PluginLoader{ /** * Loads the plugin contained in $file */ - public function loadPlugin(string $path) : void{ + public function loadPlugin(string $path, PluginDescription $description) : void{ include_once $path; }