mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[ticket/16955] Clean up composer classes and fix typos in exceptions

Browse Source 
PHPBB3-16955
This commit is contained in:
Marc Alexander
2022-12-27 16:15:46 +01:00
parent 35228ffd62
commit 2aed7ff4e3
6 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
phpBB/phpbb/composer/extension_manager.php
View File

@@ -29,7 +29,7 @@ use phpbb\filesystem\filesystem;
class extension_manager extends manager
{
/**
* @var manager
* @var ext_manager
*/
protected $extension_manager;
@@ -102,7 +102,8 @@ class extension_manager extends manager
{
if ($this->enable_on_install)
{
$io->writeError([['ENABLING_EXTENSIONS', [], 1]], true);
/** @psalm-suppress InvalidArgument */
$io->writeError([['ENABLING_EXTENSIONS', [], 1]]);
foreach ($packages as $package => $version)
{
try
@@ -111,11 +112,13 @@ class extension_manager extends manager
}
catch (\phpbb\exception\runtime_exception $e)
{
$io->writeError([[$e->getMessage(), $e->get_parameters(), 4]], true);
/** @psalm-suppress InvalidArgument */
$io->writeError([[$e->getMessage(), $e->get_parameters(), 4]]);
}
catch (\Exception $e)
{
$io->writeError([[$e->getMessage(), [], 4]], true);
/** @psalm-suppress InvalidArgument */
$io->writeError([[$e->getMessage(), [], 4]]);
}
}
}
@@ -126,7 +129,8 @@ class extension_manager extends manager
*/
protected function pre_update(array $packages, IOInterface $io = null)
{
$io->writeError([['DISABLING_EXTENSIONS', [], 1]], true);
/** @psalm-suppress InvalidArgument */
$io->writeError([['DISABLING_EXTENSIONS', [], 1]]);
$this->enabled_extensions = [];
foreach ($packages as $package => $version)
{
@@ -140,11 +144,13 @@ class extension_manager extends manager
}
catch (\phpbb\exception\runtime_exception $e)
{
$io->writeError([[$e->getMessage(), $e->get_parameters(), 4]], true);
/** @psalm-suppress InvalidArgument */
$io->writeError([[$e->getMessage(), $e->get_parameters(), 4]]);
}
catch (\Exception $e)
{
$io->writeError([[$e->getMessage(), [], 4]], true);
/** @psalm-suppress InvalidArgument */
$io->writeError([[$e->getMessage(), [], 4]]);
}
}
}
@@ -154,7 +160,8 @@ class extension_manager extends manager
*/
protected function post_update(array $packages, IOInterface $io = null)
{
$io->writeError([['ENABLING_EXTENSIONS', [], 1]], true);
/** @psalm-suppress InvalidArgument */
$io->writeError([['ENABLING_EXTENSIONS', [], 1]]);
foreach ($this->enabled_extensions as $package)
{
try
@@ -163,11 +170,13 @@ class extension_manager extends manager
}
catch (\phpbb\exception\runtime_exception $e)
{
$io->writeError([[$e->getMessage(), $e->get_parameters(), 4]], true);
/** @psalm-suppress InvalidArgument */
$io->writeError([[$e->getMessage(), $e->get_parameters(), 4]]);
}
catch (\Exception $e)
{
$io->writeError([[$e->getMessage(), [], 4]], true);
/** @psalm-suppress InvalidArgument */
$io->writeError([[$e->getMessage(), [], 4]]);
}
}
}
@@ -195,7 +204,8 @@ class extension_manager extends manager
{
if ($this->purge_on_remove)
{
$io->writeError([['DISABLING_EXTENSIONS', [], 1]], true);
/** @psalm-suppress InvalidArgument */
$io->writeError([['DISABLING_EXTENSIONS', [], 1]]);
}
foreach ($packages as $package => $version)
@@ -216,11 +226,13 @@ class extension_manager extends manager
}
catch (\phpbb\exception\runtime_exception $e)
{
$io->writeError([[$e->getMessage(), $e->get_parameters(), 4]], true);
/** @psalm-suppress InvalidArgument */
$io->writeError([[$e->getMessage(), $e->get_parameters(), 4]]);
}
catch (\Exception $e)
{
$io->writeError([[$e->getMessage(), [], 4]], true);
/** @psalm-suppress InvalidArgument */
$io->writeError([[$e->getMessage(), [], 4]]);
}
}
}
@@ -244,7 +256,8 @@ class extension_manager extends manager
if ($this->extension_manager->is_enabled($package))
{
$enabled = true;
$io->writeError([['DISABLING_EXTENSIONS', [], 1]], true);
/** @psalm-suppress InvalidArgument */
$io->writeError([['DISABLING_EXTENSIONS', [], 1]]);
$this->extension_manager->disable($package);
}
@@ -279,7 +292,8 @@ class extension_manager extends manager
{
try
{
$io->writeError([['ENABLING_EXTENSIONS', [], 1]], true);
/** @psalm-suppress InvalidArgument */
$io->writeError([['ENABLING_EXTENSIONS', [], 1]]);
$this->extension_manager->enable($package);
}
catch (\Exception $e)