diff --git a/.tmp_smoke_output.html b/.tmp_smoke_output.html new file mode 100644 index 0000000..b47907a --- /dev/null +++ b/.tmp_smoke_output.html @@ -0,0 +1,62 @@ + + + + + + Home + + + +
+

Bem-vindo ao Template Engine

+ + + +
+

Olá, JOÃO SILVA!

+

Email: joao@example.com

+

Role: admin

+
+ + + +
+

Usuários do Sistema

+ +
+ #0: Maria
+ Email: maria@example.com +
+ +
+ #1: Pedro
+ Email: pedro@example.com +
+ +
+ #2: Ana
+ Email: ana@example.com +
+ +
+
+ + diff --git a/README.md b/README.md index 3135a2e..b611ca3 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ __DIR__ . '/templates', @@ -82,6 +82,14 @@ import { UserCard } from "@components/UserCard"; Veja [SYNTAX.md](./SYNTAX.md) para documentação completa da sintaxe. +## Validação rápida + +```bash +find . -name '*.php' | xargs php -l +php examples/index.php +php examples/edge_matrix.php +``` + ## Estrutura do Projeto ``` diff --git a/autoload.php b/autoload.php index 7f0c689..dc788e7 100644 --- a/autoload.php +++ b/autoload.php @@ -6,7 +6,7 @@ */ spl_autoload_register(function ($class) { - $prefix = 'Beobles\\Core\\View\\'; + $prefix = 'Core\\View\\'; $baseDir = __DIR__ . '/src/Core/View/'; if (strpos($class, $prefix) !== 0) { diff --git a/examples/edge_matrix.php b/examples/edge_matrix.php new file mode 100644 index 0000000..dcdf23e --- /dev/null +++ b/examples/edge_matrix.php @@ -0,0 +1,138 @@ + $templatesDir, + 'cache_dir' => $cacheDir, + 'cache_enabled' => false, + 'auto_escape' => true, + 'debug' => true, +]); + +$writeTemplate = static function (string $name, string $content) use ($templatesDir): void { + file_put_contents($templatesDir . '/' . $name, $content); +}; + +$normalize = static function (string $value): string { + return trim((string) preg_replace('/\s+/', ' ', $value)); +}; + +$writeTemplate('partial.html', '[[{{ user.name }}]]'); + +$cases = [ + // Diretivas + [ + 'name' => 'directive_if_elseif_else', + 'template' => 'ONETWOOTHER', + 'data' => ['user' => ['level' => 2]], + 'expect' => 'TWO', + ], + [ + 'name' => 'directive_foreach_loop_meta', + 'template' => '{{ __loop.count }}-{{ index }}-{{ user.name }};', + 'data' => ['users' => [['name' => 'Ana'], ['name' => 'Beto']]], + 'expect' => '1-0-Ana;2-1-Beto;', + ], + [ + 'name' => 'directive_set', + 'template' => '{{ total }}', + 'data' => [], + 'expect' => '5', + ], + [ + 'name' => 'directive_include_with_data_expression', + 'template' => ' ["name" => user.name]] }} />', + 'data' => ['user' => ['name' => 'Carla']], + 'expect' => '[[Carla]]', + ], + [ + 'name' => 'directive_block_passthrough', + 'template' => 'conteudo', + 'data' => [], + 'expect' => 'conteudo', + ], + + // Filtros de string + ['name' => 'filter_uppercase_utf8', 'template' => '{{ value | uppercase }}', 'data' => ['value' => 'João'], 'expect' => 'JOÃO'], + ['name' => 'filter_lowercase_utf8', 'template' => '{{ value | lowercase }}', 'data' => ['value' => 'AÇÃO'], 'expect' => 'ação'], + ['name' => 'filter_ucfirst_utf8', 'template' => '{{ value | ucfirst }}', 'data' => ['value' => 'joão'], 'expect' => 'João'], + ['name' => 'filter_trim', 'template' => '{{ value | trim }}', 'data' => ['value' => ' x '], 'expect' => 'x'], + ['name' => 'filter_truncate', 'template' => '{{ value | truncate(4, "..") }}', 'data' => ['value' => 'abcdef'], 'expect' => 'abcd..'], + ['name' => 'filter_slug', 'template' => '{{ value | slug }}', 'data' => ['value' => 'Ação de Teste!'], 'expect' => 'acao-de-teste'], + ['name' => 'filter_reverse_utf8', 'template' => '{{ value | reverse }}', 'data' => ['value' => 'João'], 'expect' => 'oãoJ'], + + // Filtros numéricos/data + ['name' => 'filter_currency', 'template' => '{{ value | currency("BRL") }}', 'data' => ['value' => 1234.5], 'expect' => 'R$ 1.234,50'], + ['name' => 'filter_number_format', 'template' => '{{ value | number_format(2) }}', 'data' => ['value' => 1234.5], 'expect' => '1.234,50'], + ['name' => 'filter_abs', 'template' => '{{ value | abs }}', 'data' => ['value' => -10], 'expect' => '10'], + ['name' => 'filter_date', 'template' => '{{ value | date("Y-m-d") }}', 'data' => ['value' => '2024-01-02'], 'expect' => '2024-01-02'], + + // Filtros de array + ['name' => 'filter_count', 'template' => '{{ value | count }}', 'data' => ['value' => [1, 2, 3]], 'expect' => '3'], + ['name' => 'filter_first', 'template' => '{{ value | first }}', 'data' => ['value' => [10, 20]], 'expect' => '10'], + ['name' => 'filter_last', 'template' => '{{ value | last }}', 'data' => ['value' => [10, 20]], 'expect' => '20'], + ['name' => 'filter_join_nested_values', 'template' => '{! value | join(" | ") !}', 'data' => ['value' => ['a', ['k' => 'v'], true]], 'expectContains' => 'a | {"k":"v"} | 1'], + ['name' => 'filter_json', 'template' => '{! value | json !}', 'data' => ['value' => ['a' => 1]], 'expectContains' => '"a": 1'], +]; + +$failures = []; + +foreach ($cases as $case) { + $templateFile = $case['name'] . '.html'; + $writeTemplate($templateFile, $case['template']); + + try { + $output = $engine->render($templateFile, $case['data']); + } catch (\Throwable $e) { + $failures[] = $case['name'] . ': exception inesperada -> ' . $e->getMessage(); + continue; + } + + $normalizedOutput = $normalize($output); + if (array_key_exists('expect', $case)) { + $expected = $normalize((string) $case['expect']); + if ($normalizedOutput !== $expected) { + $failures[] = $case['name'] . ": esperado '{$expected}', obtido '{$normalizedOutput}'"; + } + continue; + } + + if (array_key_exists('expectContains', $case)) { + $expectedContains = (string) $case['expectContains']; + if (strpos($normalizedOutput, $expectedContains) === false) { + $failures[] = $case['name'] . ": saída não contém '{$expectedContains}', obtido '{$normalizedOutput}'"; + } + } +} + +if ($failures !== []) { + fwrite(STDERR, "Falhas na matriz de borda:\n"); + foreach ($failures as $failure) { + fwrite(STDERR, "- {$failure}\n"); + } + exit(1); +} + +echo "OK: matriz de diretivas/filtros passou com " . count($cases) . " cenários.\n"; diff --git a/examples/index.php b/examples/index.php index 39253a0..9392a5e 100644 --- a/examples/index.php +++ b/examples/index.php @@ -2,7 +2,7 @@ require_once __DIR__ . '/../autoload.php'; -use Beobles\Core\View\Engine; +use Core\View\Engine; // Criar engine $engine = new Engine([ diff --git a/src/Core/View/Abstract/AbstractDirective.php b/src/Core/View/Abstract/AbstractDirective.php index 6bde27f..529c943 100644 --- a/src/Core/View/Abstract/AbstractDirective.php +++ b/src/Core/View/Abstract/AbstractDirective.php @@ -1,6 +1,6 @@ splitByPipe($expression); $base = trim(array_shift($parts) ?? 'null'); if (preg_match('/^[A-Za-z_][A-Za-z0-9_]*$/', $base) === 1) { @@ -164,6 +164,51 @@ private function compileExpression(string $expression): string return $compiled; } + /** @return array */ + private function splitByPipe(string $expression): array + { + $parts = []; + $current = ''; + $length = strlen($expression); + $parenDepth = 0; + $inSingle = false; + $inDouble = false; + + for ($i = 0; $i < $length; $i++) { + $char = $expression[$i]; + + if ($char === "'" && !$inDouble) { + $inSingle = !$inSingle; + $current .= $char; + continue; + } + + if ($char === '"' && !$inSingle) { + $inDouble = !$inDouble; + $current .= $char; + continue; + } + + if (!$inSingle && !$inDouble) { + if ($char === '(') { + $parenDepth++; + } elseif ($char === ')') { + $parenDepth = max(0, $parenDepth - 1); + } elseif ($char === '|' && $parenDepth === 0) { + $parts[] = $current; + $current = ''; + continue; + } + } + + $current .= $char; + } + + $parts[] = $current; + + return $parts; + } + private function transformDotNotation(string $expression): string { return preg_replace_callback( diff --git a/src/Core/View/Components/ComponentRegistry.php b/src/Core/View/Components/ComponentRegistry.php index f7a1e70..30b8135 100644 --- a/src/Core/View/Components/ComponentRegistry.php +++ b/src/Core/View/Components/ComponentRegistry.php @@ -1,8 +1,8 @@ middlewarePipeline->process( ['template' => $templatePath, 'data' => $data], - function (array $context) use ($templatePath, $data, $start): string { + function (array $context) use ($start): string { + $effectiveTemplatePath = isset($context['template']) ? (string) $context['template'] : ''; + $effectiveData = isset($context['data']) && is_array($context['data']) ? $context['data'] : []; + try { - $absolutePath = $this->resolveTemplatePath($templatePath); + $absolutePath = $this->resolveTemplatePath($effectiveTemplatePath); if (!is_file($absolutePath)) { - throw new ViewException("Template not found: {$templatePath}"); + throw new ViewException("Template not found: {$effectiveTemplatePath}"); } - $compiledCode = $this->compileTemplate($absolutePath, $templatePath); + $compiledCode = $this->compileTemplate($absolutePath, $effectiveTemplatePath); - $runtimeData = array_merge($this->environment->getGlobals(), $data); + $runtimeData = array_merge($this->environment->getGlobals(), $effectiveData); foreach ($runtimeData as $name => $value) { $this->scopeStack->set((string) $name, $value); } return $this->renderer->render($compiledCode, $runtimeData, $this); } catch (\Throwable $e) { - throw new ViewException("Error rendering template '{$templatePath}': " . $e->getMessage(), 0, $e); + throw new ViewException("Error rendering template '{$effectiveTemplatePath}': " . $e->getMessage(), 0, $e); } } ); @@ -183,7 +186,11 @@ public function clearCache(): void private function compileTemplate(string $absolutePath, string $templatePath): string { - $source = (string) file_get_contents($absolutePath); + $source = file_get_contents($absolutePath); + if ($source === false) { + throw new ViewException("Cannot read template file: {$absolutePath}"); + } + $merged = $this->layoutManager->merge($absolutePath, $source); $this->templateValidator->validate($merged); diff --git a/src/Core/View/Environment.php b/src/Core/View/Environment.php index dc5736a..d0ce098 100644 --- a/src/Core/View/Environment.php +++ b/src/Core/View/Environment.php @@ -1,6 +1,6 @@ ", "&"], - ["\\\\", "\\n", "\\r", "\\t", "\\f", "\\b", "\\\"", "\\'", "\\x3C", "\\x3E", "\\x26"], + ["\\", "\n", "\r", "\t", "\f", "\b", "\"", "'", "<", ">", "&", "/"], + ["\\\\", "\\n", "\\r", "\\t", "\\f", "\\b", "\\\"", "\\'", "\\x3C", "\\x3E", "\\x26", "\\x2F"], $value ); } diff --git a/src/Core/View/Escape/UriEscaper.php b/src/Core/View/Escape/UriEscaper.php index 81a8b59..f6a3973 100644 --- a/src/Core/View/Escape/UriEscaper.php +++ b/src/Core/View/Escape/UriEscaper.php @@ -1,6 +1,6 @@ fn($v) => is_countable($v) ? count($v) : 0, 'first' => fn($v) => is_array($v) ? ($v[array_key_first($v)] ?? null) : null, 'last' => fn($v) => is_array($v) ? ($v[array_key_last($v)] ?? null) : null, - 'join' => fn($v, $sep = ', ') => is_array($v) ? implode((string) $sep, $v) : (string) $v, - 'json' => fn($v) => json_encode($v, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE), + 'join' => fn($v, $sep = ', ') => is_array($v) ? implode((string) $sep, array_map([self::class, 'stringify'], $v)) : (string) $v, + 'json' => fn($v) => json_encode($v, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_PARTIAL_OUTPUT_ON_ERROR) ?: '', ]; } + + private static function stringify(mixed $value): string + { + if (is_string($value)) { + return $value; + } + + if (is_bool($value)) { + return $value ? '1' : '0'; + } + + if ($value === null) { + return ''; + } + + if (is_scalar($value)) { + return (string) $value; + } + + $json = json_encode($value, JSON_UNESCAPED_UNICODE | JSON_PARTIAL_OUTPUT_ON_ERROR); + return is_string($json) ? $json : ''; + } } diff --git a/src/Core/View/Filters/DateFilters.php b/src/Core/View/Filters/DateFilters.php index 216e721..c3576f3 100644 --- a/src/Core/View/Filters/DateFilters.php +++ b/src/Core/View/Filters/DateFilters.php @@ -1,13 +1,16 @@ fn($v, $format = 'd/m/Y') => date((string) $format, is_numeric($v) ? (int) $v : strtotime((string) $v)), + 'date' => function ($v, $format = 'd/m/Y'): string { + $timestamp = is_numeric($v) ? (int) $v : strtotime((string) $v); + return date((string) $format, $timestamp !== false ? $timestamp : time()); + }, ]; } } diff --git a/src/Core/View/Filters/FilterRegistry.php b/src/Core/View/Filters/FilterRegistry.php index 76c3205..d3f864d 100644 --- a/src/Core/View/Filters/FilterRegistry.php +++ b/src/Core/View/Filters/FilterRegistry.php @@ -1,8 +1,8 @@ register('reverse', fn($v) => is_array($v) ? array_reverse($v) : strrev((string) $v)); + $this->register('reverse', fn($v) => is_array($v) ? array_reverse($v) : self::reverseString((string) $v)); $this->register('raw', fn($v) => $v); $this->register('escape', fn($v) => htmlspecialchars((string) $v, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8')); } + + private static function reverseString(string $value): string + { + if ($value === '') { + return ''; + } + + if (function_exists('mb_strlen') && function_exists('mb_substr')) { + $length = mb_strlen($value, 'UTF-8'); + $reversed = ''; + for ($i = $length - 1; $i >= 0; $i--) { + $char = mb_substr($value, $i, 1, 'UTF-8'); + $reversed .= $char === false ? '' : $char; + } + + return $reversed; + } + + return strrev($value); + } } diff --git a/src/Core/View/Filters/NumberFilters.php b/src/Core/View/Filters/NumberFilters.php index cca992c..d3599b8 100644 --- a/src/Core/View/Filters/NumberFilters.php +++ b/src/Core/View/Filters/NumberFilters.php @@ -1,6 +1,6 @@ fn($v) => strtoupper((string) $v), - 'lowercase' => fn($v) => strtolower((string) $v), - 'ucfirst' => fn($v) => ucfirst((string) $v), + 'uppercase' => fn($v) => self::toUpper((string) $v), + 'lowercase' => fn($v) => self::toLower((string) $v), + 'ucfirst' => fn($v) => self::mbUcfirst((string) $v), 'trim' => fn($v) => trim((string) $v), - 'truncate' => fn($v, $len = 50, $suffix = '...') => strlen((string) $v) > (int) $len ? substr((string) $v, 0, (int) $len) . $suffix : (string) $v, - 'slug' => function ($v) { - $v = strtolower((string) $v); - $v = preg_replace('/[^a-z0-9]+/', '-', $v); - return trim((string) $v, '-'); + 'truncate' => fn($v, $len = 50, $suffix = '...') => self::truncate((string) $v, (int) $len, (string) $suffix), + 'slug' => function ($v): string { + $v = self::toLower((string) $v); + if (function_exists('iconv')) { + $transliterated = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $v); + if (is_string($transliterated) && $transliterated !== '') { + $v = $transliterated; + } + } + $v = preg_replace('/[^a-z0-9]+/', '-', $v) ?? ''; + return trim($v, '-'); }, ]; } + + private static function truncate(string $value, int $length, string $suffix): string + { + if ($length < 0) { + $length = 0; + } + + if (self::strLength($value) <= $length) { + return $value; + } + + return self::strSlice($value, 0, $length) . $suffix; + } + + private static function toUpper(string $value): string + { + if (function_exists('mb_strtoupper')) { + return mb_strtoupper($value, 'UTF-8'); + } + + return strtoupper($value); + } + + private static function toLower(string $value): string + { + if (function_exists('mb_strtolower')) { + return mb_strtolower($value, 'UTF-8'); + } + + return strtolower($value); + } + + private static function mbUcfirst(string $value): string + { + if ($value === '') { + return ''; + } + + $firstChar = self::strSlice($value, 0, 1); + $remaining = self::strSlice($value, 1); + if ($firstChar === '') { + return ''; + } + + return self::toUpper($firstChar) . $remaining; + } + + private static function strLength(string $value): int + { + if (function_exists('mb_strlen')) { + return mb_strlen($value, 'UTF-8'); + } + + return strlen($value); + } + + private static function strSlice(string $value, int $start, ?int $length = null): string + { + if (function_exists('mb_substr')) { + $result = mb_substr($value, $start, $length, 'UTF-8'); + return $result === false ? '' : $result; + } + + $result = $length === null ? substr($value, $start) : substr($value, $start, $length); + return $result === false ? '' : $result; + } } diff --git a/src/Core/View/Layout/BlockStack.php b/src/Core/View/Layout/BlockStack.php index eb8bdc3..f81a602 100644 --- a/src/Core/View/Layout/BlockStack.php +++ b/src/Core/View/Layout/BlockStack.php @@ -1,6 +1,6 @@ layoutResolver->stripExtendsStatement($content); } - $parentContent = (string) file_get_contents($parentPath); + $parentContent = file_get_contents($parentPath); + if ($parentContent === false) { + return $this->layoutResolver->stripExtendsStatement($content); + } $merged = preg_replace_callback( '/(.*?)<\/Block>/si', diff --git a/src/Core/View/Layout/LayoutResolver.php b/src/Core/View/Layout/LayoutResolver.php index 83738e5..34063f1 100644 --- a/src/Core/View/Layout/LayoutResolver.php +++ b/src/Core/View/Layout/LayoutResolver.php @@ -1,6 +1,6 @@ 0) { + $mustacheDepth--; + $pos += 2; + $column += 2; + continue; + } + } + $char = $content[$pos]; - if ($char === "'" && !$inDouble) { + if ($mustacheDepth === 0 && $char === "'" && !$inDouble) { $inSingle = !$inSingle; - } elseif ($char === '"' && !$inSingle) { + } elseif ($mustacheDepth === 0 && $char === '"' && !$inSingle) { $inDouble = !$inDouble; - } elseif ($char === '>' && !$inSingle && !$inDouble) { + } elseif ($char === '>' && !$inSingle && !$inDouble && $mustacheDepth === 0) { $pos++; $column++; break; diff --git a/src/Core/View/Middleware/CacheMiddleware.php b/src/Core/View/Middleware/CacheMiddleware.php index fd40f25..2c05d02 100644 --- a/src/Core/View/Middleware/CacheMiddleware.php +++ b/src/Core/View/Middleware/CacheMiddleware.php @@ -1,8 +1,8 @@ resolvePhpBinary(); $output = []; $status = 0; - @exec(escapeshellcmd($phpBinary) . ' -l ' . escapeshellarg($compiledFile) . ' 2>&1', $output, $status); + exec(escapeshellarg($phpBinary) . ' -l ' . escapeshellarg($compiledFile) . ' 2>&1', $output, $status); if ($status !== 0) { - throw new SyntaxException('Compiled template syntax error: ' . implode("\n", $output)); + $syntaxLines = array_filter($output, static function (string $line): bool { + return (bool) preg_match('/(?:Parse|Fatal) error|syntax error|Errors parsing/i', $line); + }); + + if ($syntaxLines !== []) { + throw new SyntaxException('Compiled template syntax error: ' . implode("\n", array_values($syntaxLines))); + } + } + } + + private function resolvePhpBinary(): string + { + $candidates = []; + + if (defined('PHP_BINARY') && is_string(PHP_BINARY) && PHP_BINARY !== '') { + $candidates[] = PHP_BINARY; + } + + if (defined('PHP_BINDIR') && is_string(PHP_BINDIR) && PHP_BINDIR !== '') { + $candidates[] = rtrim(PHP_BINDIR, '/\\') . DIRECTORY_SEPARATOR . 'php'; + if (DIRECTORY_SEPARATOR === '\\') { + $candidates[] = rtrim(PHP_BINDIR, '/\\') . DIRECTORY_SEPARATOR . 'php.exe'; + } } + + foreach ($candidates as $candidate) { + $base = strtolower(basename($candidate)); + $looksLikePhpCli = str_starts_with($base, 'php') && !str_ends_with($base, '.dll'); + if ($looksLikePhpCli && is_file($candidate) && is_executable($candidate)) { + return $candidate; + } + } + + return 'php'; } } diff --git a/src/Core/View/Scope/Scope.php b/src/Core/View/Scope/Scope.php index 61e990e..431578c 100644 --- a/src/Core/View/Scope/Scope.php +++ b/src/Core/View/Scope/Scope.php @@ -1,6 +1,6 @@ isPathInsideTemplatesDir($realCandidate, $realTemplateDir)) { throw new ViewException('Template path traversal is not allowed: ' . $path); } return $realCandidate; } + + private function isPathInsideTemplatesDir(string $realCandidate, string $realTemplateDir): bool + { + $normalizedTemplateDir = rtrim($realTemplateDir, DIRECTORY_SEPARATOR); + $normalizedCandidate = rtrim($realCandidate, DIRECTORY_SEPARATOR); + + if ($normalizedCandidate === $normalizedTemplateDir) { + return true; + } + + return str_starts_with($realCandidate, $normalizedTemplateDir . DIRECTORY_SEPARATOR); + } } diff --git a/src/Core/View/Validation/SyntaxValidator.php b/src/Core/View/Validation/SyntaxValidator.php index 1fbacd1..70f37c0 100644 --- a/src/Core/View/Validation/SyntaxValidator.php +++ b/src/Core/View/Validation/SyntaxValidator.php @@ -1,8 +1,8 @@ /i', $template); - if ($ifOpen !== $ifClose) { + if ($ifOpen === false || $ifClose === false || $ifOpen !== $ifClose) { throw new SyntaxException('Unbalanced tags in template'); } $foreachOpen = preg_match_all('//i', $template); - if ($foreachOpen !== $foreachClose) { + if ($foreachOpen === false || $foreachClose === false || $foreachOpen !== $foreachClose) { throw new SyntaxException('Unbalanced tags in template'); } } diff --git a/src/Core/View/Validation/TemplateValidator.php b/src/Core/View/Validation/TemplateValidator.php index 6557790..b632c59 100644 --- a/src/Core/View/Validation/TemplateValidator.php +++ b/src/Core/View/Validation/TemplateValidator.php @@ -1,6 +1,6 @@