github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-21 13:54:02 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor(legacy): enhance IF statement conversion with block context awareness

Browse source 
- Reorder conversion process to handle legacy blocks before IF statements, ensuring proper nested structure handling.
- Introduce new methods for converting IF statements with block context, improving compatibility with existing templates.
- Maintain backward compatibility while enhancing the conversion logic for legacy syntax.
This commit is contained in:
Yury Pikhtarev 2025-06-18 23:58:11 +04:00
commit b6c96c541c
No known key found for this signature in database
1 changed files with 66 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

71
src/Template/Extensions/LegacySyntaxExtension.php
View file

@ -55,13 +55,12 @@ class LegacySyntaxExtension extends AbstractExtension
// Convert legacy includes first (simplest)
$content = $this->convertIncludes($content);
// Convert legacy IF statements first - they have the most complex structure
// This ensures nested structures are properly handled
$content = $this->convertIfStatements($content);
// Convert legacy blocks (BEGIN/END)
// Convert legacy blocks (BEGIN/END) - this will also handle IF statements within block context
$content = $this->convertBlocks($content);
// Convert any remaining IF statements that are not within blocks
$content = $this->convertIfStatements($content);
// Convert legacy variables last
$content = $this->convertVariables($content);
@ -285,6 +284,9 @@ class LegacySyntaxExtension extends AbstractExtension
$currentBlockStack = array_merge($parentBlocks, [$blockName]);
$body = $this->convertBlocksRecursive($body, $currentBlockStack);
// Convert IF statements with block context BEFORE converting variables
$body = $this->convertIfStatementsWithContext($body, $currentBlockStack);
// Convert variables for this block level
$body = $this->convertBlockVariables($body, $blockName, $parentBlocks);
@ -342,6 +344,65 @@ class LegacySyntaxExtension extends AbstractExtension
return $content;
}
/**
* Convert IF statements with block context awareness
*/
private function convertIfStatementsWithContext(string $content, array $blockStack): string
{
$iterations = 0;
$maxIterations = 50;
do {
$previousContent = $content;
// Convert complete IF...ELSE...ENDIF structures with context
$content = preg_replace_callback('/<!-- IF ([^>]+?) -->((?:(?!<!-- (?:IF|ENDIF|ELSE)).)*?)<!-- ELSE(?:\s*\/[^>]*)? -->((?:(?!<!-- ENDIF).)*?)<!-- ENDIF(?:\s*\/[^>]*)? -->/s', function($matches) use ($blockStack) {
$condition = $this->convertConditionWithContext(trim($matches[1]), $blockStack);
$ifBody = $matches[2];
$elseBody = $matches[3];
return "{% if $condition %}$ifBody{% else %}$elseBody{% endif %}";
}, $content);
// Convert simple IF...ENDIF structures with context
$content = preg_replace_callback('/<!-- IF ([^>]+?) -->((?:(?!<!-- (?:IF|ENDIF)).)*?)<!-- ENDIF(?:\s*\/[^>]*)? -->/s', function($matches) use ($blockStack) {
$condition = $this->convertConditionWithContext(trim($matches[1]), $blockStack);
$body = $matches[2];
return "{% if $condition %}$body{% endif %}";
}, $content);
$iterations++;
} while ($content !== $previousContent && $iterations < $maxIterations);
return $content;
}
/**
* Convert condition with block context awareness
*/
private function convertConditionWithContext(string $condition, array $blockStack): string
{
$condition = trim($condition);
// If we're in a block context, convert block variables appropriately
if (!empty($blockStack)) {
$currentBlock = end($blockStack);
$fullBlockPath = implode('.', $blockStack);
// Convert variables like c.f.POSTS to f_item.POSTS when in f block
// This handles the pattern where the full path refers to the current block item
$condition = preg_replace_callback('/\b' . preg_quote($fullBlockPath) . '\.([A-Z0-9_]+)\b/', function($matches) use ($currentBlock) {
$varName = $matches[1];
return "{$currentBlock}_item.$varName";
}, $condition);
// Don't auto-convert standalone variables - let the main variable conversion handle them
// This prevents global variables like SHOW_LAST_TOPIC from being incorrectly converted to block variables
}
// Apply standard condition conversions
return $this->convertCondition($condition);
}
/**
* Convert legacy includes to Twig includes
*/