mirrors
/
flight-core
mirror of https://github.com/flightphp/core
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1. renders self close components without arguments

Browse Source
580-view-class-steroids
fadrian06 1 day ago
parent 576801967c
commit a94431ae05
5 changed files with 56 additions and 16 deletions
Show Stats Download Patch File Download Diff File

39
flight/template/View.php
Unescape View File

@ -92,6 +92,17 @@ class View
* @throws Exception If template not found * @throws Exception If template not found
*/ */
public function render(string $file, ?array $templateData = null): void public function render(string $file, ?array $templateData = null): void
{
echo $this->fetch($file, $templateData);
}
/**
* Gets the output of a template
* @param string $file Template file
* @param ?array<string, mixed> $data Template data
* @return string Output of template
*/
public function fetch(string $file, ?array $data = null): string
{ {
$template = $this->getTemplate($file); $template = $this->getTemplate($file);
@ -101,30 +112,26 @@ class View
extract($this->vars); extract($this->vars);
if (is_array($templateData)) { if (is_array($data)) {
extract($templateData); extract($data);
if ($this->preserveVars) { if ($this->preserveVars) {
$this->vars += $templateData; $this->vars += $data;
} }
} }
include $template;
}
/**
* Gets the output of a template
* @param string $file Template file
* @param ?array<string, mixed> $data Template data
* @return string Output of template
*/
public function fetch(string $file, ?array $data = null): string
{
ob_start(); ob_start();
include $template;
$view = ob_get_clean();
preg_match('/<f-(?<component>[a-z-]+)\s*\/>/', $view, $matches);
$this->render($file, $data); if ($matches) {
$tag = $matches[0];
$component = $this->fetch("components/{$matches['component']}");
$view = str_replace($tag, $component, $view);
}
return ob_get_clean(); return $view;
} }
/** /**

26
tests/ViewTest.php
Unescape View File

@ -234,6 +234,32 @@ class ViewTest extends TestCase
]; ];
} }
/** @dataProvider pagesDataProvider */
public function testItRendersComponent(string $page, string $expected): void
{
$view = new View(__DIR__ . '/views');
$view->preserveVars = false;
$actual = $view->fetch($page);
self::assertSame(self::removeLineEndings($expected), self::removeLineEndings($actual));
}
public static function pagesDataProvider(): array
{
return [
['pages/page-with-component-with-old-syntax', <<<'html'
<body>
value
</body>
html],
['pages/page-with-component-with-new-syntax', <<<'html'
<body>
value
</body>
html],
];
}
private static function removeLineEndings(string $subject): string private static function removeLineEndings(string $subject): string
{ {
return str_replace(["\r", "\n"], '', $subject); return str_replace(["\r", "\n"], '', $subject);

1
tests/views/components/my-component.php
Unescape View File

@ -0,0 +1 @@
value

3
tests/views/pages/page-with-component-with-new-syntax.php
Unescape View File

@ -0,0 +1,3 @@
<body>
<f-my-component />
</body>

3
tests/views/pages/page-with-component-with-old-syntax.php
Unescape View File

@ -0,0 +1,3 @@
<body>
<?php $this->render('components/my-component') ?>
</body>
Write Preview
Loading…
Cancel
Save