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

[ticket/17279] Get iconify icons from assets folder

Browse Source 
PHPBB3-17279
This commit is contained in:
Marc Alexander
2023-12-29 21:26:41 +01:00
parent 5afa5db41f
commit 0c2fa3a065
4 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,8 +18,8 @@ use phpbb\log\log_interface;
class iconify_bundler
{
/** @var log_interface */
protected $log;
/** @var string Icons path */
protected string $icons_path;
/** @var string[] Icons list */
protected $icons_list = [];
@@ -28,10 +28,11 @@ class iconify_bundler
* Constructor for iconify bundler
*
* @param log_interface|null $log Logger
* @param string $root_path phpBB root path
*/
public function __construct(?log_interface $log)
public function __construct(protected ?log_interface $log, string $root_path)
{
$this->log = $log;
$this->icons_path = $root_path . 'assets/iconify/';
}
/**
@@ -206,6 +207,17 @@ class iconify_bundler
return null;
}
/**
* Get collection path for prefix
*
* @param string $prefix Icon collection prefix
* @return string Icon collection path
*/
protected function get_collection_path(string $prefix): string
{
return $this->icons_path . $prefix . '.json';
}
/**
* Load icons date for supplied icons array
*
@@ -220,7 +232,7 @@ class iconify_bundler
{
// Load icon set
$collection = new Collection($prefix);
$collection_file = Collection::findIconifyCollection($prefix);
$collection_file = $this->get_collection_path($prefix);
if (!file_exists($collection_file) || !$collection->loadFromFile($collection_file))
{
$this->log?->add('critical', ANONYMOUS, '', 'LOG_ICON_COLLECTION_INVALID', false, [$prefix]);