fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 19:21:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Also apply scope conversion to short PHP tags

Browse source
This commit is contained in:
Kijin Sung 2023-10-20 21:03:31 +09:00
parent 55d91b9dc7
commit a284a1b072
2 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/framework/parsers/template/TemplateParser_v2.php
View file

@ -256,12 +256,19 @@ class TemplateParser_v2
protected function _convertPHPSections(string $content): string protected function _convertPHPSections(string $content): string
{ {
$callback = function($match) { $callback = function($match) {
if ($match[1] === '<?=')
{
$open = '<?php echo' . (preg_match('#^\s#', $match[2]) ? '' : ' ');
}
else
{
$open = '<?php' . (preg_match('#^\s#', $match[2]) ? '' : ' '); $open = '<?php' . (preg_match('#^\s#', $match[2]) ? '' : ' ');
}
$close = (preg_match('#\s$#', $match[2]) ? '' : ' ') . '?>'; $close = (preg_match('#\s$#', $match[2]) ? '' : ' ') . '?>';
return $open . self::_convertVariableScope($match[2]) . $close; return $open . self::_convertVariableScope($match[2]) . $close;
}; };
$content = preg_replace_callback('#(<\?php|<\?(?!=))(.+?)(\?>)#s', $callback, $content); $content = preg_replace_callback('#(<\?php|<\?=?)(.+?)(\?>)#s', $callback, $content);
$content = preg_replace_callback('#(\{@)(.+?)(\})#s', $callback, $content); $content = preg_replace_callback('#(\{@)(.+?)(\})#s', $callback, $content);
$content = preg_replace_callback('#(?<!@)(@php)\b(.+?)(?<!@)(@endphp)\b#s', $callback, $content); $content = preg_replace_callback('#(?<!@)(@php)\b(.+?)(?<!@)(@endphp)\b#s', $callback, $content);
return $content; return $content;

10
tests/unit/framework/parsers/TemplateParserV2Test.php
View file

@ -1036,6 +1036,16 @@ class TemplateParserV2Test extends \Codeception\Test\Unit
$target = '<?php $__Context->foo = 42; ?>'; $target = '<?php $__Context->foo = 42; ?>';
$this->assertEquals($target, $this->_parse($source)); $this->assertEquals($target, $this->_parse($source));
// Short PHP tags
$source = '<? foo($bar); ?>';
$target = '<?php foo($__Context->bar); ?>';
$this->assertEquals($target, $this->_parse($source));
// Short PHP echo tags
$source = '<?=$foo?>';
$target = '<?php echo $__Context->foo ?>';
$this->assertEquals($target, $this->_parse($source));
// XE-style {@ ... } notation // XE-style {@ ... } notation
$source = '{@ $foo = 42; }'; $source = '{@ $foo = 42; }';
$target = '<?php $__Context->foo = 42; ?>'; $target = '<?php $__Context->foo = 42; ?>';