Merge branch '2.2' into 2.3
commit
e29bff2727
|
@ -155,12 +155,6 @@ class PluginManager
|
|||
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') {
|
||||
$requiresComposer = null;
|
||||
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');
|
||||
|
||||
if (isset($this->registeredPlugins[$package->getName()])) {
|
||||
|
|
Loading…
Reference in New Issue