1
0
Fork 0

Merge branch '2.2' into 2.3

pull/10933/head
Jordi Boggiano 2022-07-05 22:21:37 +02:00
commit d60ffc3b82
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 12 additions and 2 deletions

View File

@ -48,8 +48,8 @@ class PluginInstaller extends LibraryInstaller
*/ */
public function prepare($type, PackageInterface $package, PackageInterface $prevPackage = null) public function prepare($type, PackageInterface $package, PackageInterface $prevPackage = null)
{ {
// fail install process early if it going to fail due to a plugin not being allowed // fail install process early if it is going to fail due to a plugin not being allowed
if ($type === 'install' || $type === 'update') { if (($type === 'install' || $type === 'update') && !$this->getPluginManager()->arePluginsDisabled()) {
$this->getPluginManager()->isPluginAllowed($package->getName(), false); $this->getPluginManager()->isPluginAllowed($package->getName(), false);
} }

View File

@ -673,6 +673,16 @@ class PluginManager
return $rules; return $rules;
} }
/**
* @internal
*
* @return bool
*/
public function arePluginsDisabled()
{
return $this->disablePlugins;
}
/** /**
* @internal * @internal
* *