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

Merge pull request #6581 from marc1706/ticket/17283

Browse Source 
[ticket/17283] Remove iconify support
This commit is contained in:
Marc Alexander
2024-02-22 19:49:18 +01:00
committed by GitHub
parent 6fe2012bf8 073e19552f
commit ba2421ec0e
105 changed files with 450 additions and 110736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
tests/assets/iconify_bundler_test.php
View File

@@ -1,143 +0,0 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace phpbb\tests\unit\assets;
class iconify_bundler_test extends \phpbb_test_case
{
/** @var array Log content */
protected $log_content = [];
/** @var \phpbb\assets\iconify_bundler */
protected $bundler;
public function setUp(): void
{
global $phpbb_root_path;
$log = $this->getMockBuilder('\phpbb\log\dummy')
->onlyMethods(['add'])
->getMock();
$log->method('add')
->willReturnCallback(function ($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = array()) {
$this->log_content[] = $log_operation;
});
$this->bundler = new \phpbb\assets\iconify_bundler($log, $phpbb_root_path);
}
public function data_test_generate_bundle()
{
return [
[
['fa:address-card-o'],
['"prefix":"fa"', '"address-card-o"'],
],
[
['fa:address-card-o', 'ic:baseline-credit-card'],
['"prefix":"fa"', '"address-card-o"', '"prefix":"ic"', '"baseline-credit-card"'],
],
[
['fa:address-card-o', 'fa:foo-bar'],
['"prefix":"fa"', '"address-card-o"'],
['LOG_ICON_INVALID'],
],
[
['fa:address-card-o', 'ic:baseline-credit-card', 'ic:baseline-credit-card'],
['"prefix":"fa"', '"address-card-o"', '"prefix":"ic"', '"baseline-credit-card"'],
],
[
['fa:address-card-o', 'ic:baseline-credit-card', 'ic:baseline-add-ic-call'],
['"prefix":"fa"', '"address-card-o"', '"prefix":"ic"', '"baseline-credit-card"', '"baseline-add-ic-call"'],
],
[
['fa:address-card-o', 'fa:bell', 'ic:baseline-credit-card', 'ic:baseline-add-ic-call'],
['"prefix":"fa"', '"address-card-o"', '"bell"', '"prefix":"ic"', '"baseline-credit-card"', '"baseline-add-ic-call"'],
],
[
['@test'],
[],
['LOG_ICON_INVALID'],
],
[
['fa:address-foo-o'],
['"prefix":"fa"', '"icons":[]'],
['LOG_ICON_INVALID'],
],
[
['foo:bar'],
[],
['LOG_ICON_COLLECTION_INVALID']
],
[
['@iconify:fa:address-card-o'],
['"prefix":"fa"', '"address-card-o"'],
],
[
['@iconify:someother:fa:address-card-o'],
[],
['LOG_ICON_INVALID'],
],
[
['iconify:fa:address-card-o'],
['"prefix":"fa"', '"address-card-o"'],
],
[
['iconify:fa:fa:address-card-o'],
[],
['LOG_ICON_INVALID'],
],
[
['test'],
[],
['LOG_ICON_INVALID'],
],
[
[''],
[],
['LOG_ICON_INVALID'],
],
[
['fa-address-card-o'],
['"prefix":"fa"', '"address-card-o"'],
],
];
}
/**
* @dataProvider data_test_generate_bundle
*/
public function test_generate_bundle($icons, $expected, $log_content = [])
{
$this->bundler->add_icons($icons);
$bundle = $this->bundler->run();
foreach ($expected as $expected_part)
{
$this->assertStringContainsString($expected_part, $bundle, 'Failed asserting that generated bundle contains ' . $expected_part);
}
if (!count($expected))
{
$this->assertEquals($bundle, '', 'Failed asserting that generated bundle is empty');
}
if (count($log_content))
{
$this->assertEquals($this->log_content, $log_content, 'Failed asserting that log content is correct');
}
else
{
$this->assertEmpty($this->log_content, 'Failed asserting that log content is empty');
}
}
}

4
tests/controller/common_helper_route.php
View File

@@ -116,9 +116,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_database_test_
$container = new phpbb_mock_container_builder();
$container->setParameter('core.environment', PHPBB_ENVIRONMENT);
$cache_path = $phpbb_root_path . 'cache/twig';
$log = new \phpbb\log\dummy();
$iconify_bundler = new \phpbb\assets\iconify_bundler($log, $phpbb_root_path);
$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
$assets_bag = new \phpbb\template\assets_bag();
$context = new \phpbb\template\context();
$loader = new \phpbb\template\twig\loader('');
$twig = new \phpbb\template\twig\environment(

1
tests/di/fixtures/config/production/container/environment.yml
View File

@@ -37,4 +37,5 @@ services:
- ~
- ~
- ~
- ~
- []

1
tests/di/fixtures/config/test/container/environment.yml
View File

@@ -34,4 +34,5 @@ services:
- ~
- ~
- ~
- ~
- []

1
tests/di/fixtures/other_config/production/container/environment.yml
View File

@@ -34,4 +34,5 @@ services:
- ~
- ~
- ~
- ~
- []

1
tests/di/fixtures/other_config/test/container/environment.yml
View File

@@ -26,4 +26,5 @@ services:
- ~
- ~
- ~
- ~
- []

4
tests/email/email_parsing_test.php
View File

@@ -66,9 +66,7 @@ class phpbb_email_parsing_test extends phpbb_test_case
);
$phpbb_container->set('ext.manager', $extension_manager);
$log = new \phpbb\log\dummy();
$iconify_bundler = new \phpbb\assets\iconify_bundler($log, $phpbb_root_path);
$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
$assets_bag = new \phpbb\template\assets_bag();
$phpbb_container->set('assets.bag', $assets_bag);
$context = new \phpbb\template\context();

3
tests/extension/metadata_manager_test.php
View File

@@ -67,8 +67,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
$this->phpEx
);
$log = new \phpbb\log\dummy();
$iconify_bundler = new \phpbb\assets\iconify_bundler($log, $this->phpbb_root_path);
$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
$assets_bag = new \phpbb\template\assets_bag();
$twig = new \phpbb\template\twig\environment(
$assets_bag,
$this->config,

42
tests/template/extension_test.php
View File

@@ -96,8 +96,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
$context = new \phpbb\template\context();
$loader = new \phpbb\template\twig\loader([]);
$log = new \phpbb\log\dummy();
$iconify_bundler = new \phpbb\assets\iconify_bundler($log, $phpbb_root_path);
$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
$assets_bag = new \phpbb\template\assets_bag();
$twig = new \phpbb\template\twig\environment(
$assets_bag,
$config,
@@ -295,7 +294,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
[
'ICON_PHONE' => 'Phone icon',
],
'<i class="o-icon o-icon-font fa-phone"></i><span>Phone icon</span>',
'<i class="o-icon o-icon-font fa-fw fa-phone fas"></i><span>Phone icon</span>',
],
/** Font: all options */
@@ -314,7 +313,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
[
'ICON_PENCIL' => 'Pencil icon',
],
'<i class="o-icon o-icon-font fa-pencil a-class another-class" title="Pencil icon" aria-hidden="true" data-attr-1="true" data-attr-2="two"></i>
'<i class="o-icon o-icon-font fa-fw fa-pencil a-class another-class" title="Pencil icon" aria-hidden="true" data-attr-1="true" data-attr-2="two"></i>
<span class="sr-only">Pencil icon</span>'
],
/** Font: icons array */
@@ -336,7 +335,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
[
'ICON_TOPIC' => 'Topic icon',
],
'<i class="o-icon o-icon-font fa-lock"></i>
'<i class="o-icon o-icon-font fa-fw fa-lock fas"></i>
<span>Topic icon</span>',
],
/** Font: icons array with no key for the default */
@@ -358,40 +357,9 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
[
'ICON_TOPIC' => 'Topic icon',
],
'<i class="o-icon o-icon-font fa-file"></i>
'<i class="o-icon o-icon-font fa-fw fa-file fas"></i>
<span>Topic icon</span>',
],
/** Iconify: default */
[
[
'type' => 'iconify',
'icon' => 'fa:phone',
'title' => '',
'hidden' => false,
'classes' => '',
'attributes' => [],
],
[],
'<i class="iconify o-icon-src-fa o-icon" data-icon="fa:phone" data-inline="true"></i>',
],
/** Iconify: all options */
[
[
'type' => 'iconify',
'icon' => 'mdi:pencil',
'title' => 'ICON_PENCIL',
'hidden' => true,
'classes' => 'icon-lg',
'attributes' => [
'style' => 'color: #12a3eb;',
],
],
[
'ICON_PENCIL' => 'Pencil icon',
],
'<i class="iconify o-icon-src-mdi o-icon icon-lg" title="Pencil icon" aria-hidden="true" data-icon="mdi:pencil" data-inline="true" style="color: #12a3eb;"></i>
<span class="sr-only">Pencil icon</span>',
],
/** PNG: default */
[
[

3
tests/template/template_allfolder_test.php
View File

@@ -59,8 +59,7 @@ class phpbb_template_allfolder_test extends phpbb_template_template_test_case
$context = new \phpbb\template\context();
$loader = new \phpbb\template\twig\loader('');
$log = new \phpbb\log\dummy();
$iconify_bundler = new \phpbb\assets\iconify_bundler($log, $phpbb_root_path);
$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
$assets_bag = new \phpbb\template\assets_bag();
$twig = new \phpbb\template\twig\environment(
$assets_bag,
$config,

3
tests/template/template_events_test.php
View File

@@ -153,8 +153,7 @@ Zeta test event in all',
$context = new \phpbb\template\context();
$loader = new \phpbb\template\twig\loader('');
$log = new \phpbb\log\dummy();
$iconify_bundler = new \phpbb\assets\iconify_bundler($log, $phpbb_root_path);
$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
$assets_bag = new \phpbb\template\assets_bag();
$twig = new \phpbb\template\twig\environment(
$assets_bag,
$config,

3
tests/template/template_includecss_test.php
View File

@@ -45,8 +45,7 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
$context = new \phpbb\template\context();
$loader = new \phpbb\template\twig\loader('');
$log = new \phpbb\log\dummy();
$iconify_bundler = new \phpbb\assets\iconify_bundler($log, $phpbb_root_path);
$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
$assets_bag = new \phpbb\template\assets_bag();
$twig = new \phpbb\template\twig\environment(
$assets_bag,
$config,

3
tests/template/template_test_case.php
View File

@@ -96,8 +96,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
$context = new \phpbb\template\context();
$loader = new \phpbb\template\twig\loader('');
$log = new \phpbb\log\dummy();
$iconify_bundler = new \phpbb\assets\iconify_bundler($log, $phpbb_root_path);
$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
$assets_bag = new \phpbb\template\assets_bag();
$twig = new \phpbb\template\twig\environment(
$assets_bag,
$config,

3
tests/template/template_test_case_with_tree.php
View File

@@ -46,8 +46,7 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
$context = new \phpbb\template\context();
$loader = new \phpbb\template\twig\loader('');
$log = new \phpbb\log\dummy();
$iconify_bundler = new \phpbb\assets\iconify_bundler($log, $phpbb_root_path);
$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
$assets_bag = new \phpbb\template\assets_bag();
$twig = new \phpbb\template\twig\environment(
$assets_bag,
$config,

3
tests/template/twig_test.php
View File

@@ -64,8 +64,7 @@ class twig_test extends \phpbb_test_case
$context = new \phpbb\template\context();
$loader = new \phpbb\template\twig\loader('');
$log = new \phpbb\log\dummy();
$iconify_bundler = new \phpbb\assets\iconify_bundler($log, $phpbb_root_path);
$assets_bag = new \phpbb\template\assets_bag($iconify_bundler);
$assets_bag = new \phpbb\template\assets_bag();
$twig = new \phpbb\template\twig\environment(
$assets_bag,
$config,