Skip to content

[FIX] 1.2 Replace plugin eager loading #580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukeTowers merged 1 commit into from
Jun 20, 2022
Merged

[FIX] 1.2 Replace plugin eager loading #580

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions modules/system/classes/PluginManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,20 +324,6 @@ public function registerPlugin(PluginBase $plugin, ?string $pluginId = null): vo
View::addNamespace($pluginNamespace, $viewsPath);
}

/*
* Register namespace aliases for any replaced plugins
*/
if ($replaces = $plugin->getReplaces()) {
foreach ($replaces as $replace) {
$replaceNamespace = $this->getNamespace($replace);

$this->app->make(ClassLoader::class)->addNamespaceAliases([
// class_alias() expects order to be $real, $alias
$this->getNamespace($pluginId) => $replaceNamespace,
]);
}
}

/**
* Disable plugin registration for restricted pages, unless elevated
*/
Expand Down Expand Up @@ -734,6 +720,12 @@ protected function registerPluginReplacements(): void
foreach ($this->replacementMap as $target => $replacement) {
// Alias the replaced plugin to the replacing plugin
$this->aliasPluginAs($replacement, $target);

// Register namespace aliases for any replaced plugins
$this->app->make(ClassLoader::class)->addNamespaceAliases([
// class_alias() expects order to be $real, $alias
$this->getNamespace($replacement) => $this->getNamespace($target),
]);
}
}

Expand Down