1
0
Fork 0

Merge branch '2.3'

pull/10937/head
Jordi Boggiano 2022-07-12 13:25:12 +02:00
commit 12e15b7f60
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 6 additions and 6 deletions

View File

@ -155,12 +155,6 @@ class PluginManager
return; return;
} }
if (!$this->isPluginAllowed($package->getName(), $isGlobalPlugin)) {
$this->io->writeError('Skipped loading "'.$package->getName() . '" '.($isGlobalPlugin ? '(installed globally) ' : '').'as it is not in config.allow-plugins', true, IOInterface::DEBUG);
return;
}
if ($package->getType() === 'composer-plugin') { if ($package->getType() === 'composer-plugin') {
$requiresComposer = null; $requiresComposer = null;
foreach ($package->getRequires() as $link) { /** @var Link $link */ foreach ($package->getRequires() as $link) { /** @var Link $link */
@ -192,6 +186,12 @@ class PluginManager
} }
} }
if (!$this->isPluginAllowed($package->getName(), $isGlobalPlugin)) {
$this->io->writeError('Skipped loading "'.$package->getName() . '" '.($isGlobalPlugin ? '(installed globally) ' : '').'as it is not in config.allow-plugins', true, IOInterface::DEBUG);
return;
}
$oldInstallerPlugin = ($package->getType() === 'composer-installer'); $oldInstallerPlugin = ($package->getType() === 'composer-installer');
if (isset($this->registeredPlugins[$package->getName()])) { if (isset($this->registeredPlugins[$package->getName()])) {