From 9dcb06c258bc43db4946f1ca45aee0d6cb52981b Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Thu, 12 Oct 2017 12:12:37 +0200 Subject: [PATCH] Pico::sortPlugins(): Fix sorting of non-native plugins --- lib/Pico.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/Pico.php b/lib/Pico.php index 6ffd810..9f116e4 100644 --- a/lib/Pico.php +++ b/lib/Pico.php @@ -692,9 +692,17 @@ class Pico protected function sortPlugins() { $plugins = $this->plugins; + $nativePlugins = $this->nativePlugins; $sortedPlugins = array(); $visitedPlugins = array(); - $visitPlugin = function ($plugin) use ($plugins, &$sortedPlugins, &$visitedPlugins, &$visitPlugin) { + + $visitPlugin = function ($plugin) use ( + $plugins, + $nativePlugins, + &$sortedPlugins, + &$visitedPlugins, + &$visitPlugin + ) { $pluginName = get_class($plugin); // skip already visited plugins and ignore circular dependencies @@ -705,7 +713,7 @@ class Pico if ($plugin instanceof PicoPluginInterface) { $dependencies = $plugin->getDependencies(); } - if (!isset($this->nativePlugins[$pluginName])) { + if (!isset($nativePlugins[$pluginName])) { $dependencies[] = 'PicoDeprecated'; }