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

Fix component style/script dedupe leakage

Browse Source 
Use per-render instance state for component style/script dedupe in View::fetch so assets are deduped within a render without leaking across tests or subsequent renders.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
580-view-class-steroids
fadrian06 2 weeks ago
parent 7acf6c00b9
commit 8c277dadd6
2 changed files with 211 additions and 198 deletions
Show Stats Download Patch File Download Diff File

27
flight/template/View.php
Unescape View File

@ -29,6 +29,11 @@ class View
private string $componentPrefix; private string $componentPrefix;
private string $componentsPath; private string $componentsPath;
private int $fetchDepth = 0;
/** @var array<string, bool> */
private array $styles = [];
/** @var array<string, bool> */
private array $scripts = [];
/** /**
* @param string $path Path to templates directory * @param string $path Path to templates directory
@ -119,6 +124,14 @@ class View
*/ */
public function fetch(string $file, ?array $data = null): string public function fetch(string $file, ?array $data = null): string
{ {
if ($this->fetchDepth === 0) {
$this->styles = [];
$this->scripts = [];
}
$this->fetchDepth++;
try {
$template = $this->getTemplate($file); $template = $this->getTemplate($file);
if (!$this->exists($file)) { if (!$this->exists($file)) {
@ -149,27 +162,24 @@ class View
$css = $component->css(); $css = $component->css();
$js = $component->js(); $js = $component->js();
static $styles = []; if ($css && !array_key_exists($template, $this->styles)) {
static $scripts = [];
if ($css && !array_key_exists($template, $styles)) {
$view .= <<<html $view .= <<<html
<style> <style>
$css $css
</style> </style>
html; html;
$styles[$template] = true; $this->styles[$template] = true;
} }
if ($js && !array_key_exists($template, $scripts)) { if ($js && !array_key_exists($template, $this->scripts)) {
$view .= <<<html $view .= <<<html
<script> <script>
$js $js
</script> </script>
html; html;
$scripts[$template] = true; $this->scripts[$template] = true;
} }
ob_end_clean(); ob_end_clean();
@ -223,6 +233,9 @@ class View
} }
return $view; return $view;
} finally {
$this->fetchDepth--;
}
} }
/** /**

236
tests/ViewTest.php
Unescape View File

@ -266,124 +266,124 @@ class ViewTest extends TestCase
public static function pagesDataProvider(): array public static function pagesDataProvider(): array
{ {
return [ return [
// [ [
// 'page-with-component-with-old-syntax', 'page-with-component-with-old-syntax',
// <<<'html' <<<'html'
// my-component my-component
// html, html,
// ], ],
// [ [
// 'page-with-component-with-new-syntax', 'page-with-component-with-new-syntax',
// <<<'html' <<<'html'
// my-component my-component
// html, html,
// ], ],
// [ [
// 'page-with-component-with-subcomponent', 'page-with-component-with-subcomponent',
// <<<'html' <<<'html'
// <div> <div>
// my-component-with-subcomponent my-component-with-subcomponent
// subcomponent subcomponent
// </div> </div>
// html, html,
// ], ],
// [ [
// 'page-with-multiple-components', 'page-with-multiple-components',
// <<<'html' <<<'html'
// <ul> <ul>
// <li>my-component</li> <li>my-component</li>
// <li>my-component</li> <li>my-component</li>
// </ul> </ul>
// html, html,
// ], ],
// [ [
// 'page-with-functional-component', 'page-with-functional-component',
// <<<'html' <<<'html'
// my-functional-component my-functional-component
// html, html,
// ], ],
// [ [
// 'page-with-class-component', 'page-with-class-component',
// <<<'html' <<<'html'
// my-class-component my-class-component
// html, html,
// ], ],
// [ [
// 'page-with-class-component-with-styles', 'page-with-class-component-with-styles',
// <<<'html' <<<'html'
// <span class="my-class-component-with-styles"> <span class="my-class-component-with-styles">
// my-class-component-with-styles my-class-component-with-styles
// </span> </span>
// <style> <style>
// .my-class-component-with-styles { .my-class-component-with-styles {
// color: red; color: red;
// } }
// </style> </style>
// html, html,
// ], ],
// [ [
// 'page-with-class-component-with-scripts', 'page-with-class-component-with-scripts',
// <<<'html' <<<'html'
// my-class-component-with-scripts my-class-component-with-scripts
// <script>console.log('my-class-component-with-scripts')</script> <script>console.log('my-class-component-with-scripts')</script>
// html, html,
// ], ],
// [ [
// 'page-with-class-component-that-extends-another-class-component', 'page-with-class-component-that-extends-another-class-component',
// <<<'html' <<<'html'
// another-class-component extended by my-class-component-that-extends-another-class-component another-class-component extended by my-class-component-that-extends-another-class-component
// html, html,
// ], ],
// [ [
// 'page-with-component-with-one-prop', 'page-with-component-with-one-prop',
// <<<'html' <<<'html'
// <html> <html>
// <body> <body>
// <h1>Hello, James</h1> <h1>Hello, James</h1>
// </body> </body>
// </html> </html>
// html, html,
// ['name' => 'James'], ['name' => 'James'],
// ], ],
// [ [
// 'page-with-component-with-one-prop', 'page-with-component-with-one-prop',
// <<<'html' <<<'html'
// <html> <html>
// <body> <body>
// <h1>Hello, Victoria</h1> <h1>Hello, Victoria</h1>
// </body> </body>
// </html> </html>
// html, html,
// ['name' => 'Victoria'], ['name' => 'Victoria'],
// ], ],
// [ [
// 'page-with-component-with-two-props', 'page-with-component-with-two-props',
// <<<'html' <<<'html'
// <html> <html>
// <body> <body>
// <h1>Hello, Astronaut Victoria</h1> <h1>Hello, Astronaut Victoria</h1>
// </body> </body>
// </html> </html>
// html, html,
// ['name' => 'Victoria', 'occupation' => 'Astronaut'], ['name' => 'Victoria', 'occupation' => 'Astronaut'],
// ], ],
// [ [
// 'page-with-three-different-components', 'page-with-three-different-components',
// <<<'html' <<<'html'
// my-component my-component
// my-functional-component my-functional-component
// my-class-component my-class-component
// html, html,
// ], ],
// [ [
// 'page-with-component-with-prop-which-value-contains-spaces-and-numbers', 'page-with-component-with-prop-which-value-contains-spaces-and-numbers',
// <<<'html' <<<'html'
// <h1>Hello, Constantine 1st the Great</h1> <h1>Hello, Constantine 1st the Great</h1>
// html, html,
// ['name' => 'Constantine 1st the Great'], ['name' => 'Constantine 1st the Great'],
// ], ],
[ [
'page-two-same-components-with-one-style-and-script-tag', 'page-two-same-components-with-one-style-and-script-tag',
<<<'html' <<<'html'

Write Preview
Loading…
Cancel
Save