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

Enforce the order of parameters to the load directive

Browse source
This commit is contained in:
Kijin Sung 2023-10-20 20:46:35 +09:00
parent ca5c96d02a
commit 9a98e9220d
2 changed files with 37 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

74
common/framework/Template.php
View file

@ -552,49 +552,21 @@ class Template
* Fortunately, there are only a handful of valid options for the type, * Fortunately, there are only a handful of valid options for the type,
* media, and index attributes. * media, and index attributes.
* *
* @param ...$args * @param string $path
* @param string $media_type
* @param int $index
* @param array|object $vars
* @return void * @return void
*/ */
protected function _v2_loadResource(...$args): void protected function _v2_loadResource(string $path, $media_type = null, $index = null, $vars = null): void
{ {
// Assign the path. // Assign the path.
$path = null;
if (count($args))
{
$path = array_shift($args);
}
if (empty($path)) if (empty($path))
{ {
trigger_error('Resource loading directive used with no path', \E_USER_WARNING); trigger_error('Resource loading directive used with no path', \E_USER_WARNING);
return; return;
} }
// Assign the remaining arguments to respective array keys.
$info = [];
while ($value = array_shift($args))
{
if (preg_match('#^([\'"])(head|body)\1$#', $value, $match))
{
$info['type'] = $match[2];
}
elseif (preg_match('#^([\'"])((?:screen|print)[^\'"]*)\1$#', $value, $match))
{
$info['media'] = $match[2];
}
elseif (preg_match('#^([\'"])([0-9]+)\1$#', $value, $match))
{
$info['index'] = $match[2];
}
elseif (ctype_digit($value))
{
$info['index'] = $value;
}
else
{
$info['vars'] = $value;
}
}
// Check whether the path is an internal or external link. // Check whether the path is an internal or external link.
$external = false; $external = false;
if (preg_match('#^\^#', $path)) if (preg_match('#^\^#', $path))
@ -610,8 +582,32 @@ class Template
$external = true; $external = true;
} }
// If any of the variables seems to be an array or object, it's $vars.
if (!is_scalar($media_type))
{
$vars = $media_type;
$media_type = null;
}
if (!is_scalar($index))
{
$vars = $index;
$index = null;
}
if (ctype_digit($media_type ?? ''))
{
$index = $media_type;
$media_type = null;
}
// Split the media type if it has a colon in it.
if (preg_match('#^(css|js):(.+)$#s', $media_type ?? '', $match))
{
$media_type = trim($match[2]);
$type = $match[1];
}
// Determine the type of resource. // Determine the type of resource.
if (!$external && str_starts_with($path, './common/js/plugins/')) elseif (!$external && str_starts_with($path, './common/js/plugins/'))
{ {
$type = 'jsplugin'; $type = 'jsplugin';
} }
@ -654,19 +650,19 @@ class Template
{ {
\Context::loadFile([ \Context::loadFile([
$path, $path,
$info['type'] ?? '', $media_type ?? '',
$external ? $this->source_type : '', $external ? $this->source_type : '',
isset($info['index']) ? intval($info['index']) : '', $index ? intval($index) : '',
]); ]);
} }
elseif ($type === 'css' || $type === 'scss' || $type === 'less') elseif ($type === 'css' || $type === 'scss' || $type === 'less')
{ {
\Context::loadFile([ \Context::loadFile([
$path, $path,
$info['media'] ?? '', $media_type ?? '',
$external ? $this->source_type : '', $external ? $this->source_type : '',
isset($info['index']) ? intval($info['index']) : '', $index ? intval($index) : '',
$info['vars'] ?? [], $vars ?? [],
]); ]);
} }
else else

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

@ -179,8 +179,8 @@ class TemplateParserV2Test extends \Codeception\Test\Unit
$this->assertEquals($target, $this->_parse($source)); $this->assertEquals($target, $this->_parse($source));
// Blade-style SCSS with media and variables // Blade-style SCSS with media and variables
$source = "@load('assets/hello.scss', 'print', \$vars)"; $source = "@load('assets/hello.scss', 'print', 0, \$vars)";
$target = "<?php \$this->_v2_loadResource('assets/hello.scss', 'print', \$__Context->vars); ?>"; $target = "<?php \$this->_v2_loadResource('assets/hello.scss', 'print', 0, \$__Context->vars); ?>";
$this->assertEquals($target, $this->_parse($source)); $this->assertEquals($target, $this->_parse($source));
$source = "@load ('../hello.css', 'screen')"; $source = "@load ('../hello.css', 'screen')";