beenull/Pico
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Pico::sortPlugins(): Fix sorting of non-native plugins

Browse source
This commit is contained in:
Daniel Rudolf 2017-10-12 12:12:37 +02:00
parent 20297deaec
commit 9dcb06c258
No known key found for this signature in database
GPG key ID: A061F02CD8DE4538
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/Pico.php
View file

@ -692,9 +692,17 @@ class Pico
protected function sortPlugins() protected function sortPlugins()
{ {
$plugins = $this->plugins; $plugins = $this->plugins;
$nativePlugins = $this->nativePlugins;
$sortedPlugins = array(); $sortedPlugins = array();
$visitedPlugins = array(); $visitedPlugins = array();
$visitPlugin = function ($plugin) use ($plugins, &$sortedPlugins, &$visitedPlugins, &$visitPlugin) {
$visitPlugin = function ($plugin) use (
$plugins,
$nativePlugins,
&$sortedPlugins,
&$visitedPlugins,
&$visitPlugin
) {
$pluginName = get_class($plugin); $pluginName = get_class($plugin);
// skip already visited plugins and ignore circular dependencies // skip already visited plugins and ignore circular dependencies
@ -705,7 +713,7 @@ class Pico
if ($plugin instanceof PicoPluginInterface) { if ($plugin instanceof PicoPluginInterface) {
$dependencies = $plugin->getDependencies(); $dependencies = $plugin->getDependencies();
} }
if (!isset($this->nativePlugins[$pluginName])) { if (!isset($nativePlugins[$pluginName])) {
$dependencies[] = 'PicoDeprecated'; $dependencies[] = 'PicoDeprecated';
} }