fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-02 00:32:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Convert class and style builder into a method of Template class

Browse source
This commit is contained in:
Kijin Sung 2023-10-17 22:44:27 +09:00
parent 82b9107ca0
commit 55cafc5c33
6 changed files with 61 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

30
common/framework/Template.php
View file

@ -471,4 +471,34 @@ class Template
array_pop(self::$_loopvars);
}
}
/**
* Attribute builder for v2.
*
* @param string $attribute
* @param array $definition
* @return string
*/
protected function _v2_buildAttribute(string $attribute, array $definition = []): string
{
$delimiters = [
'class' => ' ',
'style' => '; ',
];
$values = [];
foreach ($definition as $key => $val)
{
if (is_int($key) && !empty($val))
{
$values[] = $val;
}
elseif ($val)
{
$values[] = $key;
}
}
return sprintf(' %s="%s"', $attribute, escape(implode($delimiters[$attribute], $values), false));
}
}

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

@ -805,20 +805,9 @@ class TemplateParser_v2
// Convert Blade-style @class and @style conditions.
$regexp = '#\s*(?<!@)@(class|style)\x20?(' . $parentheses . ')#';
$content = preg_replace_callback($regexp, function($match) {
$defs = self::_convertVariableScope($match[2]);
$delimiter = $match[1] === 'class' ? ' ' : '; ';
$tpl = '<?php (function(array $__defs) { ';
$tpl .= '$__values = []; ';
$tpl .= 'foreach ($__defs as $__key => $__val): ';
$tpl .= 'if (is_numeric($__key)): $__values[] = $__val; ';
$tpl .= 'elseif ($__val): $__values[] = $__key; ';
$tpl .= 'endif; endforeach; ';
$tpl .= 'if ($__values): ';
$tpl .= 'echo \' ' . $match[1] . '="\'; ';
$tpl .= 'echo htmlspecialchars(implode(\'' . $delimiter . '\', $__values), \ENT_QUOTES, \'UTF-8\', false); ';
$tpl .= 'echo \'"\'; ';
$tpl .= 'endif; })(' . $defs . '); ?>';
return self::_escapeVars($tpl);
$attribute = trim($match[1]);
$definitions = self::_convertVariableScope(substr($match[2], 1, strlen($match[2]) - 2));
return sprintf("<?php echo \$this->_v2_buildAttribute('%s', %s); ?>", $attribute, $definitions);
}, $content);
return $content;