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

[ticket/16944] Add missing definitions and make logging optional

Browse Source 
PHPBB3-16944
This commit is contained in:
Marc Alexander
2023-11-12 16:00:59 +01:00
parent 3db2089208
commit 1f5ae7be76
3 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
phpBB/phpbb/assets/iconify_bundler.php
View File

@@ -14,10 +14,11 @@
namespace phpbb\assets;
use Iconify\JSONTools\Collection;
use phpbb\log\log_interface;
class iconify_bundler
{
/** @var \phpbb\log\log_interface */
/** @var log_interface */
protected $log;
/** @var string[] Icons list */
@@ -26,9 +27,9 @@ class iconify_bundler
/**
* Constructor for iconify bundler
*
* @param \phpbb\log\log_interface $log Logger
* @param log_interface|null $log Logger
*/
public function __construct(\phpbb\log\log_interface $log)
public function __construct(?log_interface $log)
{
$this->log = $log;
}
@@ -113,7 +114,10 @@ class iconify_bundler
if ($icon === null || $icon['provider'] !== '')
{
// Invalid name or icon name does not have provider
$this->log->add('critical', ANONYMOUS, '', 'LOG_ICON_INVALID', false, [$icon_name]);
if ($this->log)
{
$this->log->add('critical', ANONYMOUS, '', 'LOG_ICON_INVALID', false, [$icon_name]);
}
continue;
}
@@ -214,7 +218,11 @@ class iconify_bundler
$collection = new Collection($prefix);
if (!$collection->loadIconifyCollection($prefix))
{
$this->log->add('critical', ANONYMOUS, '', 'LOG_ICON_COLLECTION_INVALID', false, [$prefix]);
if ($this->log)
{
$this->log->add('critical', ANONYMOUS, '', 'LOG_ICON_COLLECTION_INVALID', false, [$prefix]);
}
continue;
}
// Make sure all icons exist
@@ -222,7 +230,10 @@ class iconify_bundler
{
if (!$collection->iconExists($name))
{
$this->log->add('critical', ANONYMOUS, '', 'LOG_ICON_INVALID', false, [$prefix . ':' . $name]);
if ($this->log)
{
$this->log->add('critical', ANONYMOUS, '', 'LOG_ICON_INVALID', false, [$prefix . ':' . $name]);
}
}
}