mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00
Code Issues Releases Wiki Activity

Merge pull request #6350 from rxu/ticket/16688

Browse Source 
[ticket/16688] Fix PHP fatal errors on installing extensions via catalog
This commit is contained in:
Marc Alexander
2022-01-22 20:53:26 +01:00
committed by GitHub
parent 869867fdbe afe97fb573
commit f7538e7d37
5 changed files with 127 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/phpbb/composer/installer.php
View File

@@ -152,7 +152,9 @@ class installer
{
if (!$io)
{
$this->restore_cwd();
$io = new null_io();
$this->move_to_root();
}
$this->generate_ext_json_file($packages);
@@ -184,6 +186,7 @@ class installer
catch (\Exception $e)
{
$this->restore_ext_json_file();
$this->restore_cwd();
throw new runtime_exception('COMPOSER_CANNOT_INSTALL', [], $e);
}
@@ -191,6 +194,7 @@ class installer
if ($result !== 0)
{
$this->restore_ext_json_file();
$this->restore_cwd();
throw new runtime_exception($io->get_composer_error(), []);
}
@@ -587,6 +591,7 @@ class installer
$repositories[] = [
'type' => 'composer',
'url' => $repository,
'canonical' => $this->packagist ? false : true,
];
}
}

2
phpBB/phpbb/composer/manager.php
View File

@@ -89,7 +89,7 @@ class manager implements manager_interface
$managed_packages = array_merge($this->get_all_managed_packages(), $packages);
ksort($managed_packages);
$this->installer->install($managed_packages, array_keys($packages), $io);
$this->installer->install($managed_packages, [], $io);
$this->post_install($packages, $io);