eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

[TESTS] Raise App\Util\HTML test coverage to 100%

Browse Source
This commit is contained in:
Hugo Sales 2021-05-02 21:02:43 +00:00
parent fbea08ca9b
commit a49ee453ab
Signed by untrusted user: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Util/HTML.php
View File

@ -28,6 +28,7 @@
namespace App\Util;
use Functional as F;
use InvalidArgumentException;
abstract class HTML
{
@ -37,12 +38,13 @@ abstract class HTML
* @param string $tag
* @param array|string $content
* @param bool $empty_tag
* @param null|mixed $attrs
*
* @return array
*/
private static function tag(string $tag, $content = '', bool $empty_tag = false): array
public static function tag(string $tag, $attrs = null, $content = null, bool $empty_tag = false): array
{
return self::attr_tag($tag, '', $content);
return self::attr_tag($tag, $attrs ?? '', $content ?? '', $empty_tag);
}
/**
@ -58,11 +60,11 @@ abstract class HTML
private static function attr_tag(string $tag, $attrs, $content = '', bool $empty_tag = false): array
{
$html = '<' . $tag . (is_string($attrs) ? ($attrs ? ' ' : '') . $attrs : self::attr($attrs));
if (empty($content) || $empty_tag) {
$html .= '>';
if ($empty_tag) {
$html .= '/>';
} else {
$inner = Formatting::indent($content);
$html .= ">\n" . ($inner == '' ? '' : $inner . "\n") . Formatting::indent("</{$tag}>");
$html .= ">\n" . ($inner == '' ? '' : $inner . "\n") . "</{$tag}>";
}
return explode("\n", $html);
}
@ -77,7 +79,7 @@ abstract class HTML
private static function attr(array $attrs): string
{
return ' ' . implode(' ', F\map($attrs, function ($val, $key, $_) {
return "{$key} = '{$val}'";
return "{$key}=\"{$val}\"";
}));
}
@ -105,7 +107,7 @@ abstract class HTML
}
return $out;
} else {
return '';
throw new InvalidArgumentException('HTML::html argument must be of type string or array');
}
}
}

7
tests/Util/HTMLTest.php
View File

@ -20,15 +20,22 @@
namespace App\Tests\Util;
use App\Util\HTML;
use Jchook\AssertThrows\AssertThrows;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
class HTMLTest extends WebTestCase
{
use AssertThrows;
public function testHTML()
{
static::assertSame('', HTML::html(''));
static::assertSame("<a>\n\n</a>\n", HTML::html(['a' => '']));
static::assertSame("<a>\n <p>\n </p>\n</a>\n", HTML::html(['a' => ['p' => '']]));
static::assertSame("<a href=\"test\">\n <p>\n </p>\n</a>\n", HTML::html(['a' => ['attrs' => ['href' => 'test'], 'p' => '']]));
static::assertSame("<a>\n <p>\n foo\n </p>\n <br/>\n</a>\n", HTML::html(['a' => ['p' => 'foo', 'br' => 'empty']]));
static::assertThrows(\InvalidArgumentException::class, fn () => HTML::html(1));
static::assertSame("<a href=\"test\">\n foo\n</a>", implode("\n", HTML::tag('a', ['href' => 'test'], content: 'foo', empty_tag: false)));
static::assertSame('<br/>', implode("\n", HTML::tag('br', attrs: null, content: null, empty_tag: true)));
}
}