Merge branch '2.3'
commit
12e15b7f60
|
@ -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()])) {
|
||||||
|
|
Loading…
Reference in New Issue