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

Automatically choose .html or .blade.php when template name has no extension

Browse source
This commit is contained in:
Kijin Sung 2023-10-15 02:45:26 +09:00
parent 44e1ed32a2
commit e0331798d9
1 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

37
common/framework/Template.php
View file

@ -75,7 +75,7 @@ class Template
// If paths were provided, initialize immediately.
if ($dirname && $filename)
{
$this->_setSourcePath($dirname, $filename, $extension ?? 'html');
$this->_setSourcePath($dirname, $filename, $extension ?? 'auto');
}
}
@ -87,7 +87,7 @@ class Template
* @param string $extension
* @return void
*/
protected function _setSourcePath(string $dirname, string $filename, string $extension = 'html'): void
protected function _setSourcePath(string $dirname, string $filename, string $extension = 'auto'): void
{
// Normalize the template path. Result will look like 'modules/foo/views/'
$dirname = trim(preg_replace('@^' . preg_quote(\RX_BASEDIR, '@') . '|\./@', '', strtr($dirname, ['\\' => '/', '//' => '/'])), '/') . '/';
@ -98,14 +98,43 @@ class Template
// Normalize the filename. Result will look like 'bar/example.html'
$filename = trim(strtr($filename, ['\\' => '/', '//' => '/']), '/');
$filename = preg_replace('/[\{\}\(\)\[\]<>\$\'"]/', '', $filename);
// If the filename doesn't have a typical extension and doesn't exist, try adding common extensions.
if (!preg_match('/\.(?:html?|php)$/', $filename) && !Storage::exists($this->absolute_dirname . $filename))
{
$filename .= '.' . $extension;
if ($extension !== 'auto')
{
$filename .= '.' . $extension;
}
elseif (Storage::exists($this->absolute_dirname . $filename . '.html'))
{
$filename .= '.html';
$this->exists = true;
}
elseif (Storage::exists($this->absolute_dirname . $filename . '.blade.php'))
{
$filename .= '.blade.php';
$this->exists = true;
}
else
{
$filename .= '.html';
}
}
// Set the remainder of properties.
$this->filename = $filename;
$this->absolute_path = $this->absolute_dirname . $filename;
$this->relative_path = $this->relative_dirname . $filename;
$this->exists = Storage::exists($this->absolute_path);
if ($this->exists === null)
{
$this->exists = Storage::exists($this->absolute_path);
}
if ($this->exists && preg_match('/\.blade\.php$/', $filename))
{
$this->config->version = 2;
$this->config->autoescape = true;
}
$this->_setCachePath();
}