mirror of
https://github.com/smarty-php/smarty.git
synced 2026-08-09 23:11:30 +02:00
Compare commits
11
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
  Simon WisselinkandGitHub
|
1f4c0d4b11 | ||
|
Simon WisselinkandGitHub
|
e809746541 | ||
|
Simon WisselinkandGitHub
|
1d95c5c948 | ||
|
Simon WisselinkandGitHub
|
8a2ed9446a | ||
 Simon Wisselink
|
39dad96601 | ||
|
Simon Wisselink
|
c47756b489 | ||
|
Simon Wisselink
|
047b73d4a1 | ||
|
Simon Wisselink
|
cabcafc7ea | ||
|
Simon Wisselink
|
a72f83d989 | ||
|
Simon Wisselink
|
9e2399b020 | ||
|
Simon Wisselink
|
169cd924df |
@@ -1,60 +0,0 @@
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- '*'
|
||||
|
||||
name: CD
|
||||
|
||||
jobs:
|
||||
release:
|
||||
if: ${{ startsWith(github.ref_name, '5.') }}
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
env:
|
||||
PHP_EXTENSIONS: dom, json, libxml, mbstring, pdo_sqlite, soap, xml, xmlwriter
|
||||
|
||||
steps:
|
||||
- name: checkout code
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Install PHP with extensions
|
||||
uses: shivammathur/setup-php@v2
|
||||
with:
|
||||
php-version: 8.1
|
||||
extensions: ${{ env.PHP_EXTENSIONS }}
|
||||
|
||||
- name: Install dependencies
|
||||
uses: php-actions/composer@v6
|
||||
|
||||
- name: Run make
|
||||
run: make
|
||||
|
||||
- name: create release assets
|
||||
run: |
|
||||
mkdir release
|
||||
git archive release
|
||||
cd release
|
||||
make
|
||||
cd ..
|
||||
tar -cvzf release.tar.gz release
|
||||
|
||||
- name: create release
|
||||
uses: actions/create-release@v1
|
||||
id: create_release
|
||||
with:
|
||||
draft: false
|
||||
prerelease: false
|
||||
release_name: ${{ steps.version.outputs.version }}
|
||||
tag_name: ${{ github.ref }}
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ github.token }}
|
||||
|
||||
- name: upload artifacts
|
||||
uses: actions/upload-release-asset@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ github.token }}
|
||||
with:
|
||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||
asset_path: ./release.tar.gz
|
||||
asset_name: release.tar.gz
|
||||
asset_content_type: application/gzip
|
||||
@@ -48,7 +48,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Override PHP ini values for JIT compiler
|
||||
if: matrix.compiler == 'jit'
|
||||
@@ -62,20 +62,11 @@ jobs:
|
||||
extensions: ${{ env.PHP_EXTENSIONS }}
|
||||
ini-values: ${{ env.PHP_INI_VALUES }}
|
||||
|
||||
- name: Cache Composer packages
|
||||
id: composer-cache
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: vendor
|
||||
key: smartyv5-${{ runner.os }}-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
|
||||
restore-keys: |
|
||||
smartyv5-${{ runner.os }}-php-${{ matrix.php-version }}-
|
||||
|
||||
- name: Install dependencies
|
||||
uses: php-actions/composer@v6
|
||||
|
||||
- name: Run make
|
||||
run: make
|
||||
run: make -B
|
||||
|
||||
- name: Run tests with phpunit
|
||||
run: php ./vendor/phpunit/phpunit/phpunit
|
||||
|
||||
@@ -5,7 +5,3 @@ phpunit*
|
||||
.phpunit.result.cache
|
||||
/vendor/*
|
||||
/composer.lock
|
||||
/src/Lexer/ConfigfileLexer.php
|
||||
/src/Lexer/TemplateLexer.php
|
||||
/src/Parser/ConfigfileParser.php
|
||||
/src/Parser/TemplateParser.php
|
||||
|
||||
@@ -5,6 +5,12 @@
|
||||
- review ->(step|total|first|last|do_else|key|show|iteration|index)
|
||||
- review ->tpl_vars, ->config_vars, ->value
|
||||
|
||||
- Re-introduce merge_compiled_includes and the {include inline} attribute?
|
||||
|
||||
## Output buffering
|
||||
- Fix ob_ output buffering commands being scattered around the codebase
|
||||
|
||||
|
||||
## Review public static vars
|
||||
- such as _CHARSET and _IS_WINDOWS
|
||||
|
||||
@@ -18,11 +24,6 @@
|
||||
- Consider phasing out $smarty.block.child as this reverses the inheritance hierarchy and might cause infinite loops
|
||||
when combined with $smarty.block.parent
|
||||
|
||||
## Output buffering
|
||||
- Fix ob_ output buffering commands being scattered around the codebase
|
||||
|
||||
## Event handlers
|
||||
- startRenderCallbacks/endRenderCallbacks should be moved to a central eventdispatcher instead of being (un)registered on templates
|
||||
|
||||
## Plugin system
|
||||
- fix template security checks in one place in compiler
|
||||
|
||||
+2
-8
@@ -48,12 +48,6 @@
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^8.5 || ^7.5",
|
||||
"smarty/smarty-lexer": "^4.0.1"
|
||||
},
|
||||
"repositories": [
|
||||
{
|
||||
"type": "vcs",
|
||||
"url": "https://github.com/smarty-php/smarty-lexer"
|
||||
}
|
||||
]
|
||||
"smarty/smarty-lexer": "dev-master"
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
$smarty = new \Smarty\Smarty;
|
||||
//$smarty->force_compile = true;
|
||||
|
||||
$smarty->debugging = true;
|
||||
$smarty->caching = true;
|
||||
$smarty->cache_lifetime = 120;
|
||||
|
||||
@@ -7,18 +7,8 @@ use Smarty\Smarty;
|
||||
use Smarty\Template;
|
||||
use Smarty\Template\Cached;
|
||||
|
||||
/**
|
||||
* Smarty Internal Plugin
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
|
||||
/**
|
||||
* Cache Handler API
|
||||
*
|
||||
|
||||
|
||||
* @author Rodney Rehm
|
||||
*/
|
||||
abstract class Base
|
||||
@@ -77,25 +67,6 @@ abstract class Base
|
||||
*/
|
||||
abstract public function retrieveCachedContent(Template $_template);
|
||||
|
||||
/**
|
||||
* Return cached content
|
||||
*
|
||||
* @param Template $_template template object
|
||||
*
|
||||
* @return null|string
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getCachedContent(Template $_template)
|
||||
{
|
||||
if ($this->process($_template)) {
|
||||
ob_start();
|
||||
$unifunc = $_template->getCached()->unifunc;
|
||||
$unifunc($_template);
|
||||
return ob_get_clean();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Empty cache
|
||||
*
|
||||
|
||||
@@ -62,7 +62,7 @@ class File extends Base
|
||||
$_filepath[ 4 ] . $_filepath[ 5 ] . DIRECTORY_SEPARATOR;
|
||||
}
|
||||
$cached->filepath .= $_filepath;
|
||||
$basename = $source->handler->getBasename($source);
|
||||
$basename = $source->getBasename();
|
||||
if (!empty($basename)) {
|
||||
$cached->filepath .= '.' . $basename;
|
||||
}
|
||||
@@ -105,7 +105,7 @@ class File extends Base
|
||||
Cached $cached = null,
|
||||
$update = false
|
||||
) {
|
||||
$_smarty_tpl->getCached()->valid = false;
|
||||
$_smarty_tpl->getCached()->setValid(false);
|
||||
if ($update && defined('HHVM_VERSION')) {
|
||||
eval('?>' . file_get_contents($_smarty_tpl->getCached()->filepath));
|
||||
return true;
|
||||
|
||||
@@ -100,21 +100,10 @@ class ExtendsTag extends Inheritance {
|
||||
* @throws \Smarty\Exception
|
||||
*/
|
||||
private function compileEndChild(\Smarty\Compiler\Template $compiler, $template = null) {
|
||||
$inlineUids = '';
|
||||
if (isset($template) && $compiler->getSmarty()->merge_compiled_includes) {
|
||||
$code = $compiler->compileTag('include', [$template, ['scope' => 'parent']]);
|
||||
|
||||
// @TODO this relies on the generated code to have a certain format and is sure to break someday
|
||||
if (preg_match('/(,\s*\'[a-z0-9]+\',\s*\'content.*\')/', $code, $match)) {
|
||||
$inlineUids = $match[1];
|
||||
}
|
||||
}
|
||||
$compiler->getParser()->template_postfix[] = new \Smarty\ParseTree\Tag(
|
||||
$compiler->getParser(),
|
||||
'<?php $_smarty_tpl->getInheritance()->endChild($_smarty_tpl' .
|
||||
(isset($template) ?
|
||||
", {$template}{$inlineUids}" :
|
||||
'') . ");\n?>"
|
||||
(isset($template) ? ", {$template}" : '') . ");\n?>"
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -100,11 +100,6 @@ class IncludeTag extends Base {
|
||||
$fullResourceName = $match[1] . $fullResourceName . $match[1];
|
||||
}
|
||||
}
|
||||
if (empty($match[5])) {
|
||||
$variable_template = true;
|
||||
}
|
||||
} else {
|
||||
$variable_template = true;
|
||||
}
|
||||
// scope setup
|
||||
$_scope = isset($_attr['scope']) ? $this->convertScope($_attr['scope']) : 0;
|
||||
@@ -118,16 +113,6 @@ class IncludeTag extends Base {
|
||||
$_caching = \Smarty\Template::CACHING_NOCACHE_CODE;
|
||||
}
|
||||
|
||||
// flag if included template code should be merged into caller
|
||||
$merge_compiled_includes = ($compiler->getSmarty()->merge_compiled_includes || $_attr['inline'] === true) &&
|
||||
!$compiler->getTemplate()->getSource()->handler->recompiled;
|
||||
if ($merge_compiled_includes) {
|
||||
// variable template name ?
|
||||
if ($variable_template) {
|
||||
$merge_compiled_includes = false;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* if the {include} tag provides individual parameter for caching or compile_id
|
||||
* the subtemplate must not be included into the common cache file and is treated like
|
||||
@@ -157,10 +142,6 @@ class IncludeTag extends Base {
|
||||
$_cache_id = '$_smarty_tpl->cache_id';
|
||||
}
|
||||
|
||||
// if subtemplate will be called in nocache mode do not merge
|
||||
if ($compiler->getTemplate()->caching && $call_nocache) {
|
||||
$merge_compiled_includes = false;
|
||||
}
|
||||
// assign attribute
|
||||
if (isset($_attr['assign'])) {
|
||||
// output will be stored in a smarty variable instead of being displayed
|
||||
@@ -175,30 +156,7 @@ class IncludeTag extends Base {
|
||||
}
|
||||
}
|
||||
$has_compiled_template = false;
|
||||
if ($merge_compiled_includes) {
|
||||
$c_id = $compiler->getTemplate()->compile_id;
|
||||
// we must observe different compile_id and caching
|
||||
$t_hash = sha1($c_id . ($_caching ? '--caching' : '--nocaching'));
|
||||
|
||||
$compiler->getSmarty()->setAllowAmbiguousResources(true);
|
||||
$tpl = $compiler->getSmarty()->createTemplate(
|
||||
trim($fullResourceName, '"\''),
|
||||
$compiler->getTemplate()->cache_id,
|
||||
$c_id,
|
||||
$compiler->getTemplate(),
|
||||
$_caching
|
||||
);
|
||||
|
||||
$uid = $tpl->getSource()->type . $tpl->getSource()->uid;
|
||||
if (!isset($compiler->getParentCompiler()->mergedSubTemplatesData[$uid][$t_hash])) {
|
||||
$has_compiled_template = $this->compileInlineTemplate($compiler, $tpl, $t_hash);
|
||||
} else {
|
||||
$has_compiled_template = true;
|
||||
}
|
||||
|
||||
$compiler->getSmarty()->setAllowAmbiguousResources(false);
|
||||
|
||||
}
|
||||
// delete {include} standard attributes
|
||||
unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']);
|
||||
// remaining attributes must be assigned as smarty variable
|
||||
@@ -211,27 +169,6 @@ class IncludeTag extends Base {
|
||||
}
|
||||
$_vars = 'array(' . join(',', $_pairs) . ')';
|
||||
}
|
||||
if ($has_compiled_template && !$call_nocache) {
|
||||
$_output = "<?php\n";
|
||||
if (!empty($_attr) && $_caching === \Smarty\Template::CACHING_NOCACHE_CODE && $compiler->getTemplate()->caching) {
|
||||
$_vars_nc = "foreach ($_vars as \$ik => \$iv) {\n";
|
||||
$_vars_nc .= "\$_smarty_tpl->assign(\$ik, \$iv);\n";
|
||||
$_vars_nc .= "}\n";
|
||||
$_output .= substr($compiler->processNocacheCode('<?php ' . $_vars_nc . "?>\n"), 6, -3);
|
||||
}
|
||||
if (isset($_assign)) {
|
||||
$_output .= "ob_start();\n";
|
||||
}
|
||||
$_output .= "\$_smarty_tpl->renderSubTemplate({$fullResourceName}, {$_cache_id}, \$_smarty_tpl->compile_id, " .
|
||||
"{$_caching}, {$_cache_lifetime}, {$_vars}, " .
|
||||
"'{$compiler->getParentCompiler()->mergedSubTemplatesData[$uid][$t_hash]['uid']}', " .
|
||||
"'{$compiler->getParentCompiler()->mergedSubTemplatesData[$uid][$t_hash]['func']}', (int) {$_scope});\n";
|
||||
if (isset($_assign)) {
|
||||
$_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean(), false, {$_scope});\n";
|
||||
}
|
||||
$_output .= "?>";
|
||||
return $_output;
|
||||
}
|
||||
if ($call_nocache) {
|
||||
$compiler->tag_nocache = true;
|
||||
}
|
||||
@@ -241,7 +178,7 @@ class IncludeTag extends Base {
|
||||
$_output .= "ob_start();\n";
|
||||
}
|
||||
$_output .= "\$_smarty_tpl->renderSubTemplate({$fullResourceName}, $_cache_id, \$_smarty_tpl->compile_id, " .
|
||||
"$_caching, $_cache_lifetime, $_vars, null, null, (int) {$_scope});\n";
|
||||
"$_caching, $_cache_lifetime, $_vars, (int) {$_scope});\n";
|
||||
if (isset($_assign)) {
|
||||
$_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean(), false, {$_scope});\n";
|
||||
}
|
||||
@@ -249,69 +186,4 @@ class IncludeTag extends Base {
|
||||
return $_output;
|
||||
}
|
||||
|
||||
/**
|
||||
* Compile inline sub template
|
||||
*
|
||||
* @param \Smarty\Compiler\Template $compiler
|
||||
* @param \Smarty\Template $tpl
|
||||
* @param string $t_hash
|
||||
*
|
||||
* @return bool
|
||||
* @throws \Exception
|
||||
* @throws \Smarty\Exception
|
||||
*/
|
||||
private function compileInlineTemplate(
|
||||
Template $compiler,
|
||||
\Smarty\Template $tpl,
|
||||
$t_hash
|
||||
) {
|
||||
$tplSource = $tpl->getSource();
|
||||
$uid = $tplSource->type . $tplSource->uid;
|
||||
if ($tplSource->exists) {
|
||||
$compiler->getParentCompiler()->mergedSubTemplatesData[$uid][$t_hash]['uid'] = $tplSource->uid;
|
||||
$tpl->getCompiled(true)->nocache_hash = $compiler->getParentCompiler()->getTemplate()->getCompiled()->nocache_hash;
|
||||
// save unique function name
|
||||
$compiler->getParentCompiler()->mergedSubTemplatesData[$uid][$t_hash]['func'] =
|
||||
$tpl->getCompiled()->unifunc = 'content_' . str_replace(['.', ','], '_', uniqid('', true));
|
||||
// make sure whole chain gets compiled
|
||||
$tpl->mustCompile = true;
|
||||
$compiler->getParentCompiler()->mergedSubTemplatesData[$uid][$t_hash]['nocache_hash'] =
|
||||
$tpl->getCompiled()->nocache_hash;
|
||||
if ($tplSource->type === 'file') {
|
||||
$sourceInfo = $tplSource->filepath;
|
||||
} else {
|
||||
$basename = $tplSource->handler->getBasename($tplSource);
|
||||
$sourceInfo = $tplSource->type . ':' .
|
||||
($basename ? $basename : $tplSource->name);
|
||||
}
|
||||
// get compiled code
|
||||
$compiled_code = "<?php\n\n";
|
||||
$compiled_code .= $compiler->cStyleComment(" Start inline template \"{$sourceInfo}\" =============================") . "\n";
|
||||
$compiled_code .= "function {$tpl->getCompiled()->unifunc} (\\Smarty\\Template \$_smarty_tpl) {\n";
|
||||
$compiled_code .= "?>\n" . $tpl->getCompiler()->compileTemplateSource($tpl, $compiler->getParentCompiler());
|
||||
$compiled_code .= "<?php\n";
|
||||
$compiled_code .= "}\n?>\n";
|
||||
$compiled_code .= $tpl->getSmarty()->runPostFilters($tpl->getCompiler()->blockOrFunctionCode, $tpl);
|
||||
$compiled_code .= "<?php\n\n";
|
||||
$compiled_code .= $compiler->cStyleComment(" End inline template \"{$sourceInfo}\" =============================") . "\n";
|
||||
$compiled_code .= '?>';
|
||||
|
||||
// unset($tpl->compiler); // @TODO removed this.
|
||||
|
||||
if ($tpl->getCompiled()->getNocacheCode()) {
|
||||
// replace nocache_hash
|
||||
$compiled_code =
|
||||
str_replace(
|
||||
"{$tpl->getCompiled()->nocache_hash}",
|
||||
$compiler->getTemplate()->getCompiled()->nocache_hash,
|
||||
$compiled_code
|
||||
);
|
||||
$compiler->getTemplate()->getCompiled()->setNocacheCode(true);
|
||||
}
|
||||
$compiler->getParentCompiler()->mergedSubTemplatesCode[$tpl->getCompiled()->unifunc] = $compiled_code;
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,7 +62,8 @@ class CodeFrame
|
||||
str_replace('*/', '* /', $this->_template->getSource()->filepath)
|
||||
);
|
||||
$output .= "/* @var \\Smarty\\Template \$_smarty_tpl */\n";
|
||||
$dec = "\$_smarty_tpl->isFresh(" . var_export($properties, true) . ',' . ($cache ? 'true' : 'false') . ')';
|
||||
$dec = "\$_smarty_tpl->" . ($cache ? "getCached()" : "getCompiled()");
|
||||
$dec .= "->isFresh(\$_smarty_tpl, " . var_export($properties, true) . ')';
|
||||
$output .= "if ({$dec}) {\n";
|
||||
$output .= "function {$properties['unifunc']} (\\Smarty\\Template \$_smarty_tpl) {\n";
|
||||
if (!$cache && !empty($compiler->tpl_function)) {
|
||||
|
||||
@@ -352,7 +352,7 @@ class Template extends BaseCompiler {
|
||||
*
|
||||
* @param \Smarty\Template $template template object to compile
|
||||
*
|
||||
* @return bool true if compiling succeeded, false if it failed
|
||||
* @return string code
|
||||
* @throws Exception
|
||||
*/
|
||||
public function compileTemplate(\Smarty\Template $template) {
|
||||
@@ -400,7 +400,7 @@ class Template extends BaseCompiler {
|
||||
$this->has_variable_string = false;
|
||||
$this->prefix_code = [];
|
||||
// add file dependency
|
||||
if ($this->smarty->merge_compiled_includes || $this->template->getSource()->handler->checkTimestamps()) {
|
||||
if ($this->template->getSource()->handler->checkTimestamps()) {
|
||||
$this->parent_compiler->getTemplate()->getCompiled()->file_dependency[$this->template->getSource()->uid] =
|
||||
[
|
||||
$this->template->getSource()->filepath,
|
||||
|
||||
@@ -203,7 +203,6 @@ class Debug extends Data
|
||||
$debObj = new \Smarty\Smarty();
|
||||
// copy the working dirs from application
|
||||
$debObj->setCompileDir($smarty->getCompileDir());
|
||||
$debObj->force_compile = false;
|
||||
$debObj->compile_check = \Smarty::COMPILECHECK_ON;
|
||||
$debObj->security_policy = null;
|
||||
$debObj->debugging = false;
|
||||
|
||||
@@ -0,0 +1,707 @@
|
||||
<?php
|
||||
|
||||
namespace Smarty\Lexer;
|
||||
|
||||
/**
|
||||
* Smarty Internal Plugin ConfigfileLexer
|
||||
*
|
||||
* This is the lexer to break the config file source into tokens
|
||||
* @package Smarty
|
||||
* @subpackage Config
|
||||
* @author Uwe Tews
|
||||
*/
|
||||
/**
|
||||
* ConfigfileLexer
|
||||
*
|
||||
* This is the config file lexer.
|
||||
* It is generated from the ConfigfileLexer.plex file
|
||||
*
|
||||
* @package Smarty
|
||||
* @subpackage Compiler
|
||||
* @author Uwe Tews
|
||||
*/
|
||||
class ConfigfileLexer
|
||||
{
|
||||
/**
|
||||
* Source
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
public $data;
|
||||
/**
|
||||
* Source length
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
public $dataLength = null;
|
||||
/**
|
||||
* byte counter
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
public $counter;
|
||||
/**
|
||||
* token number
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
public $token;
|
||||
/**
|
||||
* token value
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
public $value;
|
||||
/**
|
||||
* current line
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
public $line;
|
||||
/**
|
||||
* state number
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
public $state = 1;
|
||||
/**
|
||||
* Smarty object
|
||||
*
|
||||
* @var Smarty
|
||||
*/
|
||||
public $smarty = null;
|
||||
/**
|
||||
* compiler object
|
||||
*
|
||||
* @var \Smarty\Compiler\Configfile
|
||||
*/
|
||||
private $compiler = null;
|
||||
/**
|
||||
* copy of config_booleanize
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
private $configBooleanize = false;
|
||||
/**
|
||||
* trace file
|
||||
*
|
||||
* @var resource
|
||||
*/
|
||||
public $yyTraceFILE;
|
||||
/**
|
||||
* trace prompt
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
public $yyTracePrompt;
|
||||
/**
|
||||
* state names
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE');
|
||||
|
||||
/**
|
||||
* storage for assembled token patterns
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $yy_global_pattern1 = null;
|
||||
private $yy_global_pattern2 = null;
|
||||
private $yy_global_pattern3 = null;
|
||||
private $yy_global_pattern4 = null;
|
||||
private $yy_global_pattern5 = null;
|
||||
private $yy_global_pattern6 = null;
|
||||
|
||||
/**
|
||||
* token names
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public $smarty_token_names = array( // Text for parser error messages
|
||||
);
|
||||
|
||||
/**
|
||||
* constructor
|
||||
*
|
||||
* @param string $data template source
|
||||
* @param \Smarty\Compiler\Configfile $compiler
|
||||
*/
|
||||
public function __construct($data, \Smarty\Compiler\Configfile $compiler)
|
||||
{
|
||||
$this->data = $data . "\n"; //now all lines are \n-terminated
|
||||
$this->dataLength = strlen($data);
|
||||
$this->counter = 0;
|
||||
if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
|
||||
$this->counter += strlen($match[0]);
|
||||
}
|
||||
$this->line = 1;
|
||||
$this->compiler = $compiler;
|
||||
$this->smarty = $compiler->smarty;
|
||||
$this->configBooleanize = $this->smarty->config_booleanize;
|
||||
}
|
||||
|
||||
public function replace ($input) {
|
||||
return $input;
|
||||
}
|
||||
|
||||
public function PrintTrace()
|
||||
{
|
||||
$this->yyTraceFILE = fopen('php://output', 'w');
|
||||
$this->yyTracePrompt = '<br>';
|
||||
}
|
||||
|
||||
|
||||
|
||||
private $_yy_state = 1;
|
||||
private $_yy_stack = array();
|
||||
|
||||
public function yylex()
|
||||
{
|
||||
return $this->{'yylex' . $this->_yy_state}();
|
||||
}
|
||||
|
||||
public function yypushstate($state)
|
||||
{
|
||||
if ($this->yyTraceFILE) {
|
||||
fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
|
||||
}
|
||||
array_push($this->_yy_stack, $this->_yy_state);
|
||||
$this->_yy_state = $state;
|
||||
if ($this->yyTraceFILE) {
|
||||
fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
|
||||
}
|
||||
}
|
||||
|
||||
public function yypopstate()
|
||||
{
|
||||
if ($this->yyTraceFILE) {
|
||||
fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
|
||||
}
|
||||
$this->_yy_state = array_pop($this->_yy_stack);
|
||||
if ($this->yyTraceFILE) {
|
||||
fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public function yybegin($state)
|
||||
{
|
||||
$this->_yy_state = $state;
|
||||
if ($this->yyTraceFILE) {
|
||||
fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
public function yylex1()
|
||||
{
|
||||
if (!isset($this->yy_global_pattern1)) {
|
||||
$this->yy_global_pattern1 = $this->replace("/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/isS");
|
||||
}
|
||||
if (!isset($this->dataLength)) {
|
||||
$this->dataLength = strlen($this->data);
|
||||
}
|
||||
if ($this->counter >= $this->dataLength) {
|
||||
return false; // end of input
|
||||
}
|
||||
|
||||
do {
|
||||
if (preg_match($this->yy_global_pattern1,$this->data, $yymatches, 0, $this->counter)) {
|
||||
if (!isset($yymatches[ 0 ][1])) {
|
||||
$yymatches = preg_grep("/(.|\s)+/", $yymatches);
|
||||
} else {
|
||||
$yymatches = array_filter($yymatches);
|
||||
}
|
||||
if (empty($yymatches)) {
|
||||
throw new Exception('Error: lexing failed because a rule matched' .
|
||||
' an empty string. Input "' . substr($this->data,
|
||||
$this->counter, 5) . '... state START');
|
||||
}
|
||||
next($yymatches); // skip global match
|
||||
$this->token = key($yymatches); // token number
|
||||
$this->value = current($yymatches); // token value
|
||||
$r = $this->{'yy_r1_' . $this->token}();
|
||||
if ($r === null) {
|
||||
$this->counter += strlen($this->value);
|
||||
$this->line += substr_count($this->value, "\n");
|
||||
// accept this token
|
||||
return true;
|
||||
} elseif ($r === true) {
|
||||
// we have changed state
|
||||
// process this token in the new state
|
||||
return $this->yylex();
|
||||
} elseif ($r === false) {
|
||||
$this->counter += strlen($this->value);
|
||||
$this->line += substr_count($this->value, "\n");
|
||||
if ($this->counter >= $this->dataLength) {
|
||||
return false; // end of input
|
||||
}
|
||||
// skip this token
|
||||
continue;
|
||||
} } else {
|
||||
throw new Exception('Unexpected input at line' . $this->line .
|
||||
': ' . $this->data[$this->counter]);
|
||||
}
|
||||
break;
|
||||
} while (true);
|
||||
|
||||
} // end function
|
||||
|
||||
|
||||
const START = 1;
|
||||
public function yy_r1_1()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_COMMENTSTART;
|
||||
$this->yypushstate(self::COMMENT);
|
||||
}
|
||||
public function yy_r1_2()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_OPENB;
|
||||
$this->yypushstate(self::SECTION);
|
||||
}
|
||||
public function yy_r1_3()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_CLOSEB;
|
||||
}
|
||||
public function yy_r1_4()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_EQUAL;
|
||||
$this->yypushstate(self::VALUE);
|
||||
}
|
||||
public function yy_r1_5()
|
||||
{
|
||||
|
||||
return false;
|
||||
}
|
||||
public function yy_r1_6()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_NEWLINE;
|
||||
}
|
||||
public function yy_r1_7()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_ID;
|
||||
}
|
||||
public function yy_r1_8()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_OTHER;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public function yylex2()
|
||||
{
|
||||
if (!isset($this->yy_global_pattern2)) {
|
||||
$this->yy_global_pattern2 = $this->replace("/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS");
|
||||
}
|
||||
if (!isset($this->dataLength)) {
|
||||
$this->dataLength = strlen($this->data);
|
||||
}
|
||||
if ($this->counter >= $this->dataLength) {
|
||||
return false; // end of input
|
||||
}
|
||||
|
||||
do {
|
||||
if (preg_match($this->yy_global_pattern2,$this->data, $yymatches, 0, $this->counter)) {
|
||||
if (!isset($yymatches[ 0 ][1])) {
|
||||
$yymatches = preg_grep("/(.|\s)+/", $yymatches);
|
||||
} else {
|
||||
$yymatches = array_filter($yymatches);
|
||||
}
|
||||
if (empty($yymatches)) {
|
||||
throw new Exception('Error: lexing failed because a rule matched' .
|
||||
' an empty string. Input "' . substr($this->data,
|
||||
$this->counter, 5) . '... state VALUE');
|
||||
}
|
||||
next($yymatches); // skip global match
|
||||
$this->token = key($yymatches); // token number
|
||||
$this->value = current($yymatches); // token value
|
||||
$r = $this->{'yy_r2_' . $this->token}();
|
||||
if ($r === null) {
|
||||
$this->counter += strlen($this->value);
|
||||
$this->line += substr_count($this->value, "\n");
|
||||
// accept this token
|
||||
return true;
|
||||
} elseif ($r === true) {
|
||||
// we have changed state
|
||||
// process this token in the new state
|
||||
return $this->yylex();
|
||||
} elseif ($r === false) {
|
||||
$this->counter += strlen($this->value);
|
||||
$this->line += substr_count($this->value, "\n");
|
||||
if ($this->counter >= $this->dataLength) {
|
||||
return false; // end of input
|
||||
}
|
||||
// skip this token
|
||||
continue;
|
||||
} } else {
|
||||
throw new Exception('Unexpected input at line' . $this->line .
|
||||
': ' . $this->data[$this->counter]);
|
||||
}
|
||||
break;
|
||||
} while (true);
|
||||
|
||||
} // end function
|
||||
|
||||
|
||||
const VALUE = 2;
|
||||
public function yy_r2_1()
|
||||
{
|
||||
|
||||
return false;
|
||||
}
|
||||
public function yy_r2_2()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_FLOAT;
|
||||
$this->yypopstate();
|
||||
}
|
||||
public function yy_r2_3()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_INT;
|
||||
$this->yypopstate();
|
||||
}
|
||||
public function yy_r2_4()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_QUOTES;
|
||||
$this->yypushstate(self::TRIPPLE);
|
||||
}
|
||||
public function yy_r2_5()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_SINGLE_QUOTED_STRING;
|
||||
$this->yypopstate();
|
||||
}
|
||||
public function yy_r2_6()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_DOUBLE_QUOTED_STRING;
|
||||
$this->yypopstate();
|
||||
}
|
||||
public function yy_r2_7()
|
||||
{
|
||||
|
||||
if (!$this->configBooleanize || !in_array(strtolower($this->value), array('true', 'false', 'on', 'off', 'yes', 'no')) ) {
|
||||
$this->yypopstate();
|
||||
$this->yypushstate(self::NAKED_STRING_VALUE);
|
||||
return true; //reprocess in new state
|
||||
} else {
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_BOOL;
|
||||
$this->yypopstate();
|
||||
}
|
||||
}
|
||||
public function yy_r2_8()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
|
||||
$this->yypopstate();
|
||||
}
|
||||
public function yy_r2_9()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
|
||||
$this->value = '';
|
||||
$this->yypopstate();
|
||||
}
|
||||
|
||||
|
||||
|
||||
public function yylex3()
|
||||
{
|
||||
if (!isset($this->yy_global_pattern3)) {
|
||||
$this->yy_global_pattern3 = $this->replace("/\G([^\n]+?(?=[ \t\r]*\n))/isS");
|
||||
}
|
||||
if (!isset($this->dataLength)) {
|
||||
$this->dataLength = strlen($this->data);
|
||||
}
|
||||
if ($this->counter >= $this->dataLength) {
|
||||
return false; // end of input
|
||||
}
|
||||
|
||||
do {
|
||||
if (preg_match($this->yy_global_pattern3,$this->data, $yymatches, 0, $this->counter)) {
|
||||
if (!isset($yymatches[ 0 ][1])) {
|
||||
$yymatches = preg_grep("/(.|\s)+/", $yymatches);
|
||||
} else {
|
||||
$yymatches = array_filter($yymatches);
|
||||
}
|
||||
if (empty($yymatches)) {
|
||||
throw new Exception('Error: lexing failed because a rule matched' .
|
||||
' an empty string. Input "' . substr($this->data,
|
||||
$this->counter, 5) . '... state NAKED_STRING_VALUE');
|
||||
}
|
||||
next($yymatches); // skip global match
|
||||
$this->token = key($yymatches); // token number
|
||||
$this->value = current($yymatches); // token value
|
||||
$r = $this->{'yy_r3_' . $this->token}();
|
||||
if ($r === null) {
|
||||
$this->counter += strlen($this->value);
|
||||
$this->line += substr_count($this->value, "\n");
|
||||
// accept this token
|
||||
return true;
|
||||
} elseif ($r === true) {
|
||||
// we have changed state
|
||||
// process this token in the new state
|
||||
return $this->yylex();
|
||||
} elseif ($r === false) {
|
||||
$this->counter += strlen($this->value);
|
||||
$this->line += substr_count($this->value, "\n");
|
||||
if ($this->counter >= $this->dataLength) {
|
||||
return false; // end of input
|
||||
}
|
||||
// skip this token
|
||||
continue;
|
||||
} } else {
|
||||
throw new Exception('Unexpected input at line' . $this->line .
|
||||
': ' . $this->data[$this->counter]);
|
||||
}
|
||||
break;
|
||||
} while (true);
|
||||
|
||||
} // end function
|
||||
|
||||
|
||||
const NAKED_STRING_VALUE = 3;
|
||||
public function yy_r3_1()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
|
||||
$this->yypopstate();
|
||||
}
|
||||
|
||||
|
||||
|
||||
public function yylex4()
|
||||
{
|
||||
if (!isset($this->yy_global_pattern4)) {
|
||||
$this->yy_global_pattern4 = $this->replace("/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS");
|
||||
}
|
||||
if (!isset($this->dataLength)) {
|
||||
$this->dataLength = strlen($this->data);
|
||||
}
|
||||
if ($this->counter >= $this->dataLength) {
|
||||
return false; // end of input
|
||||
}
|
||||
|
||||
do {
|
||||
if (preg_match($this->yy_global_pattern4,$this->data, $yymatches, 0, $this->counter)) {
|
||||
if (!isset($yymatches[ 0 ][1])) {
|
||||
$yymatches = preg_grep("/(.|\s)+/", $yymatches);
|
||||
} else {
|
||||
$yymatches = array_filter($yymatches);
|
||||
}
|
||||
if (empty($yymatches)) {
|
||||
throw new Exception('Error: lexing failed because a rule matched' .
|
||||
' an empty string. Input "' . substr($this->data,
|
||||
$this->counter, 5) . '... state COMMENT');
|
||||
}
|
||||
next($yymatches); // skip global match
|
||||
$this->token = key($yymatches); // token number
|
||||
$this->value = current($yymatches); // token value
|
||||
$r = $this->{'yy_r4_' . $this->token}();
|
||||
if ($r === null) {
|
||||
$this->counter += strlen($this->value);
|
||||
$this->line += substr_count($this->value, "\n");
|
||||
// accept this token
|
||||
return true;
|
||||
} elseif ($r === true) {
|
||||
// we have changed state
|
||||
// process this token in the new state
|
||||
return $this->yylex();
|
||||
} elseif ($r === false) {
|
||||
$this->counter += strlen($this->value);
|
||||
$this->line += substr_count($this->value, "\n");
|
||||
if ($this->counter >= $this->dataLength) {
|
||||
return false; // end of input
|
||||
}
|
||||
// skip this token
|
||||
continue;
|
||||
} } else {
|
||||
throw new Exception('Unexpected input at line' . $this->line .
|
||||
': ' . $this->data[$this->counter]);
|
||||
}
|
||||
break;
|
||||
} while (true);
|
||||
|
||||
} // end function
|
||||
|
||||
|
||||
const COMMENT = 4;
|
||||
public function yy_r4_1()
|
||||
{
|
||||
|
||||
return false;
|
||||
}
|
||||
public function yy_r4_2()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
|
||||
}
|
||||
public function yy_r4_3()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_NEWLINE;
|
||||
$this->yypopstate();
|
||||
}
|
||||
|
||||
|
||||
|
||||
public function yylex5()
|
||||
{
|
||||
if (!isset($this->yy_global_pattern5)) {
|
||||
$this->yy_global_pattern5 = $this->replace("/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/isS");
|
||||
}
|
||||
if (!isset($this->dataLength)) {
|
||||
$this->dataLength = strlen($this->data);
|
||||
}
|
||||
if ($this->counter >= $this->dataLength) {
|
||||
return false; // end of input
|
||||
}
|
||||
|
||||
do {
|
||||
if (preg_match($this->yy_global_pattern5,$this->data, $yymatches, 0, $this->counter)) {
|
||||
if (!isset($yymatches[ 0 ][1])) {
|
||||
$yymatches = preg_grep("/(.|\s)+/", $yymatches);
|
||||
} else {
|
||||
$yymatches = array_filter($yymatches);
|
||||
}
|
||||
if (empty($yymatches)) {
|
||||
throw new Exception('Error: lexing failed because a rule matched' .
|
||||
' an empty string. Input "' . substr($this->data,
|
||||
$this->counter, 5) . '... state SECTION');
|
||||
}
|
||||
next($yymatches); // skip global match
|
||||
$this->token = key($yymatches); // token number
|
||||
$this->value = current($yymatches); // token value
|
||||
$r = $this->{'yy_r5_' . $this->token}();
|
||||
if ($r === null) {
|
||||
$this->counter += strlen($this->value);
|
||||
$this->line += substr_count($this->value, "\n");
|
||||
// accept this token
|
||||
return true;
|
||||
} elseif ($r === true) {
|
||||
// we have changed state
|
||||
// process this token in the new state
|
||||
return $this->yylex();
|
||||
} elseif ($r === false) {
|
||||
$this->counter += strlen($this->value);
|
||||
$this->line += substr_count($this->value, "\n");
|
||||
if ($this->counter >= $this->dataLength) {
|
||||
return false; // end of input
|
||||
}
|
||||
// skip this token
|
||||
continue;
|
||||
} } else {
|
||||
throw new Exception('Unexpected input at line' . $this->line .
|
||||
': ' . $this->data[$this->counter]);
|
||||
}
|
||||
break;
|
||||
} while (true);
|
||||
|
||||
} // end function
|
||||
|
||||
|
||||
const SECTION = 5;
|
||||
public function yy_r5_1()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_DOT;
|
||||
}
|
||||
public function yy_r5_2()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_SECTION;
|
||||
$this->yypopstate();
|
||||
}
|
||||
|
||||
|
||||
public function yylex6()
|
||||
{
|
||||
if (!isset($this->yy_global_pattern6)) {
|
||||
$this->yy_global_pattern6 = $this->replace("/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/isS");
|
||||
}
|
||||
if (!isset($this->dataLength)) {
|
||||
$this->dataLength = strlen($this->data);
|
||||
}
|
||||
if ($this->counter >= $this->dataLength) {
|
||||
return false; // end of input
|
||||
}
|
||||
|
||||
do {
|
||||
if (preg_match($this->yy_global_pattern6,$this->data, $yymatches, 0, $this->counter)) {
|
||||
if (!isset($yymatches[ 0 ][1])) {
|
||||
$yymatches = preg_grep("/(.|\s)+/", $yymatches);
|
||||
} else {
|
||||
$yymatches = array_filter($yymatches);
|
||||
}
|
||||
if (empty($yymatches)) {
|
||||
throw new Exception('Error: lexing failed because a rule matched' .
|
||||
' an empty string. Input "' . substr($this->data,
|
||||
$this->counter, 5) . '... state TRIPPLE');
|
||||
}
|
||||
next($yymatches); // skip global match
|
||||
$this->token = key($yymatches); // token number
|
||||
$this->value = current($yymatches); // token value
|
||||
$r = $this->{'yy_r6_' . $this->token}();
|
||||
if ($r === null) {
|
||||
$this->counter += strlen($this->value);
|
||||
$this->line += substr_count($this->value, "\n");
|
||||
// accept this token
|
||||
return true;
|
||||
} elseif ($r === true) {
|
||||
// we have changed state
|
||||
// process this token in the new state
|
||||
return $this->yylex();
|
||||
} elseif ($r === false) {
|
||||
$this->counter += strlen($this->value);
|
||||
$this->line += substr_count($this->value, "\n");
|
||||
if ($this->counter >= $this->dataLength) {
|
||||
return false; // end of input
|
||||
}
|
||||
// skip this token
|
||||
continue;
|
||||
} } else {
|
||||
throw new Exception('Unexpected input at line' . $this->line .
|
||||
': ' . $this->data[$this->counter]);
|
||||
}
|
||||
break;
|
||||
} while (true);
|
||||
|
||||
} // end function
|
||||
|
||||
|
||||
const TRIPPLE = 6;
|
||||
public function yy_r6_1()
|
||||
{
|
||||
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_QUOTES_END;
|
||||
$this->yypopstate();
|
||||
$this->yypushstate(self::START);
|
||||
}
|
||||
public function yy_r6_2()
|
||||
{
|
||||
|
||||
$to = strlen($this->data);
|
||||
preg_match("/\"\"\"[ \t\r]*[\n#;]/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
|
||||
if (isset($match[0][1])) {
|
||||
$to = $match[0][1];
|
||||
} else {
|
||||
$this->compiler->trigger_config_file_error ('missing or misspelled literal closing tag');
|
||||
}
|
||||
$this->value = substr($this->data,$this->counter,$to-$this->counter);
|
||||
$this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_TEXT;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,972 @@
|
||||
<?php
|
||||
|
||||
// line 12 "src/Parser/ConfigfileParser.y"
|
||||
|
||||
|
||||
namespace Smarty\Parser;
|
||||
|
||||
use \Smarty\Lexer\ConfigfileLexer as Lexer;
|
||||
use \Smarty\Compiler\Configfile as Configfile;
|
||||
|
||||
/**
|
||||
* Smarty Internal Plugin Configfileparse
|
||||
*
|
||||
* This is the config file parser.
|
||||
* It is generated from the ConfigfileParser.y file
|
||||
* @package Smarty
|
||||
* @subpackage Compiler
|
||||
* @author Uwe Tews
|
||||
*/
|
||||
class ConfigfileParser
|
||||
{
|
||||
// line 31 "src/Parser/ConfigfileParser.y"
|
||||
|
||||
/**
|
||||
* result status
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
public $successful = true;
|
||||
/**
|
||||
* return value
|
||||
*
|
||||
* @var mixed
|
||||
*/
|
||||
public $retvalue = 0;
|
||||
/**
|
||||
* @var
|
||||
*/
|
||||
public $yymajor;
|
||||
/**
|
||||
* lexer object
|
||||
*
|
||||
* @var Lexer
|
||||
*/
|
||||
private $lex;
|
||||
/**
|
||||
* internal error flag
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
private $internalError = false;
|
||||
/**
|
||||
* compiler object
|
||||
*
|
||||
* @var Configfile
|
||||
*/
|
||||
public $compiler = null;
|
||||
/**
|
||||
* smarty object
|
||||
*
|
||||
* @var Smarty
|
||||
*/
|
||||
public $smarty = null;
|
||||
/**
|
||||
* copy of config_overwrite property
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
private $configOverwrite = false;
|
||||
/**
|
||||
* copy of config_read_hidden property
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
private $configReadHidden = false;
|
||||
/**
|
||||
* helper map
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
private static $escapes_single = array('\\' => '\\',
|
||||
'\'' => '\'');
|
||||
|
||||
/**
|
||||
* constructor
|
||||
*
|
||||
* @param Lexer $lex
|
||||
* @param Configfile $compiler
|
||||
*/
|
||||
public function __construct(Lexer $lex, Configfile $compiler)
|
||||
{
|
||||
$this->lex = $lex;
|
||||
$this->smarty = $compiler->getSmarty();
|
||||
$this->compiler = $compiler;
|
||||
$this->configOverwrite = $this->smarty->config_overwrite;
|
||||
$this->configReadHidden = $this->smarty->config_read_hidden;
|
||||
}
|
||||
|
||||
/**
|
||||
* parse optional boolean keywords
|
||||
*
|
||||
* @param string $str
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
private function parse_bool($str)
|
||||
{
|
||||
$str = strtolower($str);
|
||||
if (in_array($str, array('on', 'yes', 'true'))) {
|
||||
$res = true;
|
||||
} else {
|
||||
$res = false;
|
||||
}
|
||||
return $res;
|
||||
}
|
||||
|
||||
/**
|
||||
* parse single quoted string
|
||||
* remove outer quotes
|
||||
* unescape inner quotes
|
||||
*
|
||||
* @param string $qstr
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
private static function parse_single_quoted_string($qstr)
|
||||
{
|
||||
$escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
|
||||
|
||||
$ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE);
|
||||
|
||||
$str = '';
|
||||
foreach ($ss as $s) {
|
||||
if (strlen($s) === 2 && $s[0] === '\\') {
|
||||
if (isset(self::$escapes_single[$s[1]])) {
|
||||
$s = self::$escapes_single[$s[1]];
|
||||
}
|
||||
}
|
||||
$str .= $s;
|
||||
}
|
||||
return $str;
|
||||
}
|
||||
|
||||
/**
|
||||
* parse double quoted string
|
||||
*
|
||||
* @param string $qstr
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
private static function parse_double_quoted_string($qstr)
|
||||
{
|
||||
$inner_str = substr($qstr, 1, strlen($qstr) - 2);
|
||||
return stripcslashes($inner_str);
|
||||
}
|
||||
|
||||
/**
|
||||
* parse triple quoted string
|
||||
*
|
||||
* @param string $qstr
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
private static function parse_tripple_double_quoted_string($qstr)
|
||||
{
|
||||
return stripcslashes($qstr);
|
||||
}
|
||||
|
||||
/**
|
||||
* set a config variable in target array
|
||||
*
|
||||
* @param array $var
|
||||
* @param array $target_array
|
||||
*/
|
||||
private function set_var(array $var, array &$target_array)
|
||||
{
|
||||
$key = $var['key'];
|
||||
$value = $var['value'];
|
||||
|
||||
if ($this->configOverwrite || !isset($target_array['vars'][$key])) {
|
||||
$target_array['vars'][$key] = $value;
|
||||
} else {
|
||||
settype($target_array['vars'][$key], 'array');
|
||||
$target_array['vars'][$key][] = $value;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* add config variable to global vars
|
||||
*
|
||||
* @param array $vars
|
||||
*/
|
||||
private function add_global_vars(array $vars)
|
||||
{
|
||||
if (!isset($this->compiler->config_data['vars'])) {
|
||||
$this->compiler->config_data['vars'] = array();
|
||||
}
|
||||
foreach ($vars as $var) {
|
||||
$this->set_var($var, $this->compiler->config_data);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* add config variable to section
|
||||
*
|
||||
* @param string $section_name
|
||||
* @param array $vars
|
||||
*/
|
||||
private function add_section_vars($section_name, array $vars)
|
||||
{
|
||||
if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
|
||||
$this->compiler->config_data['sections'][$section_name]['vars'] = array();
|
||||
}
|
||||
foreach ($vars as $var) {
|
||||
$this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
|
||||
}
|
||||
}
|
||||
|
||||
const TPC_OPENB = 1;
|
||||
const TPC_SECTION = 2;
|
||||
const TPC_CLOSEB = 3;
|
||||
const TPC_DOT = 4;
|
||||
const TPC_ID = 5;
|
||||
const TPC_EQUAL = 6;
|
||||
const TPC_FLOAT = 7;
|
||||
const TPC_INT = 8;
|
||||
const TPC_BOOL = 9;
|
||||
const TPC_SINGLE_QUOTED_STRING = 10;
|
||||
const TPC_DOUBLE_QUOTED_STRING = 11;
|
||||
const TPC_TRIPPLE_QUOTES = 12;
|
||||
const TPC_TRIPPLE_TEXT = 13;
|
||||
const TPC_TRIPPLE_QUOTES_END = 14;
|
||||
const TPC_NAKED_STRING = 15;
|
||||
const TPC_OTHER = 16;
|
||||
const TPC_NEWLINE = 17;
|
||||
const TPC_COMMENTSTART = 18;
|
||||
const YY_NO_ACTION = 60;
|
||||
const YY_ACCEPT_ACTION = 59;
|
||||
const YY_ERROR_ACTION = 58;
|
||||
|
||||
const YY_SZ_ACTTAB = 39;
|
||||
public static $yy_action = array(
|
||||
24, 25, 26, 27, 28, 12, 15, 23, 31, 32,
|
||||
59, 8, 9, 3, 21, 22, 33, 13, 33, 13,
|
||||
14, 10, 18, 16, 30, 11, 17, 20, 34, 7,
|
||||
5, 1, 2, 29, 4, 19, 52, 35, 6,
|
||||
);
|
||||
public static $yy_lookahead = array(
|
||||
7, 8, 9, 10, 11, 12, 5, 27, 15, 16,
|
||||
20, 21, 25, 23, 25, 26, 17, 18, 17, 18,
|
||||
2, 25, 4, 13, 14, 1, 15, 24, 17, 22,
|
||||
3, 23, 23, 14, 6, 2, 28, 17, 3,
|
||||
);
|
||||
const YY_SHIFT_USE_DFLT = -8;
|
||||
const YY_SHIFT_MAX = 19;
|
||||
public static $yy_shift_ofst = array(
|
||||
-8, 1, 1, 1, -7, -1, -1, 24, -8, -8,
|
||||
-8, 18, 10, 11, 27, 28, 19, 20, 33, 35,
|
||||
);
|
||||
const YY_REDUCE_USE_DFLT = -21;
|
||||
const YY_REDUCE_MAX = 10;
|
||||
public static $yy_reduce_ofst = array(
|
||||
-10, -11, -11, -11, -20, -13, -4, 3, 7, 8,
|
||||
9,
|
||||
);
|
||||
public static $yyExpectedTokens = array(
|
||||
array(),
|
||||
array(5, 17, 18, ),
|
||||
array(5, 17, 18, ),
|
||||
array(5, 17, 18, ),
|
||||
array(7, 8, 9, 10, 11, 12, 15, 16, ),
|
||||
array(17, 18, ),
|
||||
array(17, 18, ),
|
||||
array(1, ),
|
||||
array(),
|
||||
array(),
|
||||
array(),
|
||||
array(2, 4, ),
|
||||
array(13, 14, ),
|
||||
array(15, 17, ),
|
||||
array(3, ),
|
||||
array(6, ),
|
||||
array(14, ),
|
||||
array(17, ),
|
||||
array(2, ),
|
||||
array(3, ),
|
||||
array(),
|
||||
array(),
|
||||
array(),
|
||||
array(),
|
||||
array(),
|
||||
array(),
|
||||
array(),
|
||||
array(),
|
||||
array(),
|
||||
array(),
|
||||
array(),
|
||||
array(),
|
||||
array(),
|
||||
array(),
|
||||
array(),
|
||||
array(),
|
||||
);
|
||||
public static $yy_default = array(
|
||||
44, 40, 41, 37, 58, 58, 58, 36, 39, 44,
|
||||
44, 58, 58, 58, 58, 58, 58, 58, 58, 58,
|
||||
38, 42, 43, 45, 46, 47, 48, 49, 50, 51,
|
||||
52, 53, 54, 55, 56, 57,
|
||||
);
|
||||
const YYNOCODE = 29;
|
||||
const YYSTACKDEPTH = 100;
|
||||
const YYNSTATE = 36;
|
||||
const YYNRULE = 22;
|
||||
const YYERRORSYMBOL = 19;
|
||||
const YYERRSYMDT = 'yy0';
|
||||
const YYFALLBACK = 0;
|
||||
public static $yyFallback = array(
|
||||
);
|
||||
public function Trace($TraceFILE, $zTracePrompt)
|
||||
{
|
||||
if (!$TraceFILE) {
|
||||
$zTracePrompt = 0;
|
||||
} elseif (!$zTracePrompt) {
|
||||
$TraceFILE = 0;
|
||||
}
|
||||
$this->yyTraceFILE = $TraceFILE;
|
||||
$this->yyTracePrompt = $zTracePrompt;
|
||||
}
|
||||
|
||||
public function PrintTrace()
|
||||
{
|
||||
$this->yyTraceFILE = fopen('php://output', 'w');
|
||||
$this->yyTracePrompt = '<br>';
|
||||
}
|
||||
|
||||
public $yyTraceFILE;
|
||||
public $yyTracePrompt;
|
||||
public $yyidx; /* Index of top element in stack */
|
||||
public $yyerrcnt; /* Shifts left before out of the error */
|
||||
public $yystack = array(); /* The parser's stack */
|
||||
|
||||
public $yyTokenName = array(
|
||||
'$', 'OPENB', 'SECTION', 'CLOSEB',
|
||||
'DOT', 'ID', 'EQUAL', 'FLOAT',
|
||||
'INT', 'BOOL', 'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING',
|
||||
'TRIPPLE_QUOTES', 'TRIPPLE_TEXT', 'TRIPPLE_QUOTES_END', 'NAKED_STRING',
|
||||
'OTHER', 'NEWLINE', 'COMMENTSTART', 'error',
|
||||
'start', 'global_vars', 'sections', 'var_list',
|
||||
'section', 'newline', 'var', 'value',
|
||||
);
|
||||
|
||||
public static $yyRuleName = array(
|
||||
'start ::= global_vars sections',
|
||||
'global_vars ::= var_list',
|
||||
'sections ::= sections section',
|
||||
'sections ::=',
|
||||
'section ::= OPENB SECTION CLOSEB newline var_list',
|
||||
'section ::= OPENB DOT SECTION CLOSEB newline var_list',
|
||||
'var_list ::= var_list newline',
|
||||
'var_list ::= var_list var',
|
||||
'var_list ::=',
|
||||
'var ::= ID EQUAL value',
|
||||
'value ::= FLOAT',
|
||||
'value ::= INT',
|
||||
'value ::= BOOL',
|
||||
'value ::= SINGLE_QUOTED_STRING',
|
||||
'value ::= DOUBLE_QUOTED_STRING',
|
||||
'value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END',
|
||||
'value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END',
|
||||
'value ::= NAKED_STRING',
|
||||
'value ::= OTHER',
|
||||
'newline ::= NEWLINE',
|
||||
'newline ::= COMMENTSTART NEWLINE',
|
||||
'newline ::= COMMENTSTART NAKED_STRING NEWLINE',
|
||||
);
|
||||
|
||||
public function tokenName($tokenType)
|
||||
{
|
||||
if ($tokenType === 0) {
|
||||
return 'End of Input';
|
||||
}
|
||||
if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
|
||||
return $this->yyTokenName[$tokenType];
|
||||
} else {
|
||||
return 'Unknown';
|
||||
}
|
||||
}
|
||||
|
||||
public static function yy_destructor($yymajor, $yypminor)
|
||||
{
|
||||
switch ($yymajor) {
|
||||
default: break; /* If no destructor action specified: do nothing */
|
||||
}
|
||||
}
|
||||
|
||||
public function yy_pop_parser_stack()
|
||||
{
|
||||
if (empty($this->yystack)) {
|
||||
return;
|
||||
}
|
||||
$yytos = array_pop($this->yystack);
|
||||
if ($this->yyTraceFILE && $this->yyidx >= 0) {
|
||||
fwrite($this->yyTraceFILE,
|
||||
$this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
|
||||
"\n");
|
||||
}
|
||||
$yymajor = $yytos->major;
|
||||
self::yy_destructor($yymajor, $yytos->minor);
|
||||
$this->yyidx--;
|
||||
|
||||
return $yymajor;
|
||||
}
|
||||
|
||||
public function __destruct()
|
||||
{
|
||||
while ($this->yystack !== Array()) {
|
||||
$this->yy_pop_parser_stack();
|
||||
}
|
||||
if (is_resource($this->yyTraceFILE)) {
|
||||
fclose($this->yyTraceFILE);
|
||||
}
|
||||
}
|
||||
|
||||
public function yy_get_expected_tokens($token)
|
||||
{
|
||||
static $res3 = array();
|
||||
static $res4 = array();
|
||||
$state = $this->yystack[$this->yyidx]->stateno;
|
||||
$expected = self::$yyExpectedTokens[$state];
|
||||
if (isset($res3[$state][$token])) {
|
||||
if ($res3[$state][$token]) {
|
||||
return $expected;
|
||||
}
|
||||
} else {
|
||||
if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
|
||||
return $expected;
|
||||
}
|
||||
}
|
||||
$stack = $this->yystack;
|
||||
$yyidx = $this->yyidx;
|
||||
do {
|
||||
$yyact = $this->yy_find_shift_action($token);
|
||||
if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
|
||||
// reduce action
|
||||
$done = 0;
|
||||
do {
|
||||
if ($done++ === 100) {
|
||||
$this->yyidx = $yyidx;
|
||||
$this->yystack = $stack;
|
||||
// too much recursion prevents proper detection
|
||||
// so give up
|
||||
return array_unique($expected);
|
||||
}
|
||||
$yyruleno = $yyact - self::YYNSTATE;
|
||||
$this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
|
||||
$nextstate = $this->yy_find_reduce_action(
|
||||
$this->yystack[$this->yyidx]->stateno,
|
||||
self::$yyRuleInfo[$yyruleno][0]);
|
||||
if (isset(self::$yyExpectedTokens[$nextstate])) {
|
||||
$expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
|
||||
if (isset($res4[$nextstate][$token])) {
|
||||
if ($res4[$nextstate][$token]) {
|
||||
$this->yyidx = $yyidx;
|
||||
$this->yystack = $stack;
|
||||
return array_unique($expected);
|
||||
}
|
||||
} else {
|
||||
if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
|
||||
$this->yyidx = $yyidx;
|
||||
$this->yystack = $stack;
|
||||
return array_unique($expected);
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($nextstate < self::YYNSTATE) {
|
||||
// we need to shift a non-terminal
|
||||
$this->yyidx++;
|
||||
$x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
|
||||
$x->stateno = $nextstate;
|
||||
$x->major = self::$yyRuleInfo[$yyruleno][0];
|
||||
$this->yystack[$this->yyidx] = $x;
|
||||
continue 2;
|
||||
} elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
|
||||
$this->yyidx = $yyidx;
|
||||
$this->yystack = $stack;
|
||||
// the last token was just ignored, we can't accept
|
||||
// by ignoring input, this is in essence ignoring a
|
||||
// syntax error!
|
||||
return array_unique($expected);
|
||||
} elseif ($nextstate === self::YY_NO_ACTION) {
|
||||
$this->yyidx = $yyidx;
|
||||
$this->yystack = $stack;
|
||||
// input accepted, but not shifted (I guess)
|
||||
return $expected;
|
||||
} else {
|
||||
$yyact = $nextstate;
|
||||
}
|
||||
} while (true);
|
||||
}
|
||||
break;
|
||||
} while (true);
|
||||
$this->yyidx = $yyidx;
|
||||
$this->yystack = $stack;
|
||||
|
||||
return array_unique($expected);
|
||||
}
|
||||
|
||||
public function yy_is_expected_token($token)
|
||||
{
|
||||
static $res = array();
|
||||
static $res2 = array();
|
||||
if ($token === 0) {
|
||||
return true; // 0 is not part of this
|
||||
}
|
||||
$state = $this->yystack[$this->yyidx]->stateno;
|
||||
if (isset($res[$state][$token])) {
|
||||
if ($res[$state][$token]) {
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
$stack = $this->yystack;
|
||||
$yyidx = $this->yyidx;
|
||||
do {
|
||||
$yyact = $this->yy_find_shift_action($token);
|
||||
if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
|
||||
// reduce action
|
||||
$done = 0;
|
||||
do {
|
||||
if ($done++ === 100) {
|
||||
$this->yyidx = $yyidx;
|
||||
$this->yystack = $stack;
|
||||
// too much recursion prevents proper detection
|
||||
// so give up
|
||||
return true;
|
||||
}
|
||||
$yyruleno = $yyact - self::YYNSTATE;
|
||||
$this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
|
||||
$nextstate = $this->yy_find_reduce_action(
|
||||
$this->yystack[$this->yyidx]->stateno,
|
||||
self::$yyRuleInfo[$yyruleno][0]);
|
||||
if (isset($res2[$nextstate][$token])) {
|
||||
if ($res2[$nextstate][$token]) {
|
||||
$this->yyidx = $yyidx;
|
||||
$this->yystack = $stack;
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) {
|
||||
$this->yyidx = $yyidx;
|
||||
$this->yystack = $stack;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
if ($nextstate < self::YYNSTATE) {
|
||||
// we need to shift a non-terminal
|
||||
$this->yyidx++;
|
||||
$x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
|
||||
$x->stateno = $nextstate;
|
||||
$x->major = self::$yyRuleInfo[$yyruleno][0];
|
||||
$this->yystack[$this->yyidx] = $x;
|
||||
continue 2;
|
||||
} elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
|
||||
$this->yyidx = $yyidx;
|
||||
$this->yystack = $stack;
|
||||
if (!$token) {
|
||||
// end of input: this is valid
|
||||
return true;
|
||||
}
|
||||
// the last token was just ignored, we can't accept
|
||||
// by ignoring input, this is in essence ignoring a
|
||||
// syntax error!
|
||||
return false;
|
||||
} elseif ($nextstate === self::YY_NO_ACTION) {
|
||||
$this->yyidx = $yyidx;
|
||||
$this->yystack = $stack;
|
||||
// input accepted, but not shifted (I guess)
|
||||
return true;
|
||||
} else {
|
||||
$yyact = $nextstate;
|
||||
}
|
||||
} while (true);
|
||||
}
|
||||
break;
|
||||
} while (true);
|
||||
$this->yyidx = $yyidx;
|
||||
$this->yystack = $stack;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public function yy_find_shift_action($iLookAhead)
|
||||
{
|
||||
$stateno = $this->yystack[$this->yyidx]->stateno;
|
||||
|
||||
/* if ($this->yyidx < 0) return self::YY_NO_ACTION; */
|
||||
if (!isset(self::$yy_shift_ofst[$stateno])) {
|
||||
// no shift actions
|
||||
return self::$yy_default[$stateno];
|
||||
}
|
||||
$i = self::$yy_shift_ofst[$stateno];
|
||||
if ($i === self::YY_SHIFT_USE_DFLT) {
|
||||
return self::$yy_default[$stateno];
|
||||
}
|
||||
if ($iLookAhead === self::YYNOCODE) {
|
||||
return self::YY_NO_ACTION;
|
||||
}
|
||||
$i += $iLookAhead;
|
||||
if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
|
||||
self::$yy_lookahead[$i] != $iLookAhead) {
|
||||
if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
|
||||
&& ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
|
||||
if ($this->yyTraceFILE) {
|
||||
fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'FALLBACK ' .
|
||||
$this->yyTokenName[$iLookAhead] . ' => ' .
|
||||
$this->yyTokenName[$iFallback] . "\n");
|
||||
}
|
||||
|
||||
return $this->yy_find_shift_action($iFallback);
|
||||
}
|
||||
|
||||
return self::$yy_default[$stateno];
|
||||
} else {
|
||||
return self::$yy_action[$i];
|
||||
}
|
||||
}
|
||||
|
||||
public function yy_find_reduce_action($stateno, $iLookAhead)
|
||||
{
|
||||
/* $stateno = $this->yystack[$this->yyidx]->stateno; */
|
||||
|
||||
if (!isset(self::$yy_reduce_ofst[$stateno])) {
|
||||
return self::$yy_default[$stateno];
|
||||
}
|
||||
$i = self::$yy_reduce_ofst[$stateno];
|
||||
if ($i === self::YY_REDUCE_USE_DFLT) {
|
||||
return self::$yy_default[$stateno];
|
||||
}
|
||||
if ($iLookAhead === self::YYNOCODE) {
|
||||
return self::YY_NO_ACTION;
|
||||
}
|
||||
$i += $iLookAhead;
|
||||
if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
|
||||
self::$yy_lookahead[$i] != $iLookAhead) {
|
||||
return self::$yy_default[$stateno];
|
||||
} else {
|
||||
return self::$yy_action[$i];
|
||||
}
|
||||
}
|
||||
|
||||
public function yy_shift($yyNewState, $yyMajor, $yypMinor)
|
||||
{
|
||||
$this->yyidx++;
|
||||
if ($this->yyidx >= self::YYSTACKDEPTH) {
|
||||
$this->yyidx--;
|
||||
if ($this->yyTraceFILE) {
|
||||
fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
|
||||
}
|
||||
while ($this->yyidx >= 0) {
|
||||
$this->yy_pop_parser_stack();
|
||||
}
|
||||
// line 245 "src/Parser/ConfigfileParser.y"
|
||||
|
||||
$this->internalError = true;
|
||||
$this->compiler->trigger_config_file_error('Stack overflow in configfile parser');
|
||||
|
||||
return;
|
||||
}
|
||||
$yytos = (object) ['stateno' => null, 'major' => null, 'minor' => null];
|
||||
$yytos->stateno = $yyNewState;
|
||||
$yytos->major = $yyMajor;
|
||||
$yytos->minor = $yypMinor;
|
||||
$this->yystack[] = $yytos;
|
||||
if ($this->yyTraceFILE && $this->yyidx > 0) {
|
||||
fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt,
|
||||
$yyNewState);
|
||||
fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
|
||||
for ($i = 1; $i <= $this->yyidx; $i++) {
|
||||
fprintf($this->yyTraceFILE, " %s",
|
||||
$this->yyTokenName[$this->yystack[$i]->major]);
|
||||
}
|
||||
fwrite($this->yyTraceFILE,"\n");
|
||||
}
|
||||
}
|
||||
|
||||
public static $yyRuleInfo = array(
|
||||
array( 0 => 20, 1 => 2 ),
|
||||
array( 0 => 21, 1 => 1 ),
|
||||
array( 0 => 22, 1 => 2 ),
|
||||
array( 0 => 22, 1 => 0 ),
|
||||
array( 0 => 24, 1 => 5 ),
|
||||
array( 0 => 24, 1 => 6 ),
|
||||
array( 0 => 23, 1 => 2 ),
|
||||
array( 0 => 23, 1 => 2 ),
|
||||
array( 0 => 23, 1 => 0 ),
|
||||
array( 0 => 26, 1 => 3 ),
|
||||
array( 0 => 27, 1 => 1 ),
|
||||
array( 0 => 27, 1 => 1 ),
|
||||
array( 0 => 27, 1 => 1 ),
|
||||
array( 0 => 27, 1 => 1 ),
|
||||
array( 0 => 27, 1 => 1 ),
|
||||
array( 0 => 27, 1 => 3 ),
|
||||
array( 0 => 27, 1 => 2 ),
|
||||
array( 0 => 27, 1 => 1 ),
|
||||
array( 0 => 27, 1 => 1 ),
|
||||
array( 0 => 25, 1 => 1 ),
|
||||
array( 0 => 25, 1 => 2 ),
|
||||
array( 0 => 25, 1 => 3 ),
|
||||
);
|
||||
|
||||
public static $yyReduceMap = array(
|
||||
0 => 0,
|
||||
2 => 0,
|
||||
3 => 0,
|
||||
19 => 0,
|
||||
20 => 0,
|
||||
21 => 0,
|
||||
1 => 1,
|
||||
4 => 4,
|
||||
5 => 5,
|
||||
6 => 6,
|
||||
7 => 7,
|
||||
8 => 8,
|
||||
9 => 9,
|
||||
10 => 10,
|
||||
11 => 11,
|
||||
12 => 12,
|
||||
13 => 13,
|
||||
14 => 14,
|
||||
15 => 15,
|
||||
16 => 16,
|
||||
17 => 17,
|
||||
18 => 17,
|
||||
);
|
||||
// line 251 "src/Parser/ConfigfileParser.y"
|
||||
public function yy_r0(){
|
||||
$this->_retvalue = null;
|
||||
}
|
||||
// line 256 "src/Parser/ConfigfileParser.y"
|
||||
public function yy_r1(){
|
||||
$this->add_global_vars($this->yystack[$this->yyidx + 0]->minor);
|
||||
$this->_retvalue = null;
|
||||
}
|
||||
// line 270 "src/Parser/ConfigfileParser.y"
|
||||
public function yy_r4(){
|
||||
$this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
|
||||
$this->_retvalue = null;
|
||||
}
|
||||
// line 275 "src/Parser/ConfigfileParser.y"
|
||||
public function yy_r5(){
|
||||
if ($this->configReadHidden) {
|
||||
$this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
|
||||
}
|
||||
$this->_retvalue = null;
|
||||
}
|
||||
// line 283 "src/Parser/ConfigfileParser.y"
|
||||
public function yy_r6(){
|
||||
$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
|
||||
}
|
||||
// line 287 "src/Parser/ConfigfileParser.y"
|
||||
public function yy_r7(){
|
||||
$this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, array($this->yystack[$this->yyidx + 0]->minor));
|
||||
}
|
||||
// line 291 "src/Parser/ConfigfileParser.y"
|
||||
public function yy_r8(){
|
||||
$this->_retvalue = array();
|
||||
}
|
||||
// line 297 "src/Parser/ConfigfileParser.y"
|
||||
public function yy_r9(){
|
||||
$this->_retvalue = array('key' => $this->yystack[$this->yyidx + -2]->minor, 'value' => $this->yystack[$this->yyidx + 0]->minor);
|
||||
}
|
||||
// line 302 "src/Parser/ConfigfileParser.y"
|
||||
public function yy_r10(){
|
||||
$this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
|
||||
}
|
||||
// line 306 "src/Parser/ConfigfileParser.y"
|
||||
public function yy_r11(){
|
||||
$this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
|
||||
}
|
||||
// line 310 "src/Parser/ConfigfileParser.y"
|
||||
public function yy_r12(){
|
||||
$this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
|
||||
}
|
||||
// line 314 "src/Parser/ConfigfileParser.y"
|
||||
public function yy_r13(){
|
||||
$this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
|
||||
}
|
||||
// line 318 "src/Parser/ConfigfileParser.y"
|
||||
public function yy_r14(){
|
||||
$this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
|
||||
}
|
||||
// line 322 "src/Parser/ConfigfileParser.y"
|
||||
public function yy_r15(){
|
||||
$this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor);
|
||||
}
|
||||
// line 326 "src/Parser/ConfigfileParser.y"
|
||||
public function yy_r16(){
|
||||
$this->_retvalue = '';
|
||||
}
|
||||
// line 330 "src/Parser/ConfigfileParser.y"
|
||||
public function yy_r17(){
|
||||
$this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
|
||||
}
|
||||
|
||||
private $_retvalue;
|
||||
|
||||
public function yy_reduce($yyruleno)
|
||||
{
|
||||
if ($this->yyTraceFILE && $yyruleno >= 0
|
||||
&& $yyruleno < count(self::$yyRuleName)) {
|
||||
fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
|
||||
$this->yyTracePrompt, $yyruleno,
|
||||
self::$yyRuleName[$yyruleno]);
|
||||
}
|
||||
|
||||
$this->_retvalue = $yy_lefthand_side = null;
|
||||
if (isset(self::$yyReduceMap[$yyruleno])) {
|
||||
// call the action
|
||||
$this->_retvalue = null;
|
||||
$this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
|
||||
$yy_lefthand_side = $this->_retvalue;
|
||||
}
|
||||
$yygoto = self::$yyRuleInfo[$yyruleno][0];
|
||||
$yysize = self::$yyRuleInfo[$yyruleno][1];
|
||||
$this->yyidx -= $yysize;
|
||||
for ($i = $yysize; $i; $i--) {
|
||||
// pop all of the right-hand side parameters
|
||||
array_pop($this->yystack);
|
||||
}
|
||||
$yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
|
||||
if ($yyact < self::YYNSTATE) {
|
||||
if (!$this->yyTraceFILE && $yysize) {
|
||||
$this->yyidx++;
|
||||
$x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
|
||||
$x->stateno = $yyact;
|
||||
$x->major = $yygoto;
|
||||
$x->minor = $yy_lefthand_side;
|
||||
$this->yystack[$this->yyidx] = $x;
|
||||
} else {
|
||||
$this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
|
||||
}
|
||||
} elseif ($yyact === self::YYNSTATE + self::YYNRULE + 1) {
|
||||
$this->yy_accept();
|
||||
}
|
||||
}
|
||||
|
||||
public function yy_parse_failed()
|
||||
{
|
||||
if ($this->yyTraceFILE) {
|
||||
fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
|
||||
} while ($this->yyidx >= 0) {
|
||||
$this->yy_pop_parser_stack();
|
||||
}
|
||||
}
|
||||
|
||||
public function yy_syntax_error($yymajor, $TOKEN)
|
||||
{
|
||||
// line 238 "src/Parser/ConfigfileParser.y"
|
||||
|
||||
$this->internalError = true;
|
||||
$this->yymajor = $yymajor;
|
||||
$this->compiler->trigger_config_file_error();
|
||||
}
|
||||
|
||||
public function yy_accept()
|
||||
{
|
||||
if ($this->yyTraceFILE) {
|
||||
fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
|
||||
} while ($this->yyidx >= 0) {
|
||||
$this->yy_pop_parser_stack();
|
||||
}
|
||||
// line 231 "src/Parser/ConfigfileParser.y"
|
||||
|
||||
$this->successful = !$this->internalError;
|
||||
$this->internalError = false;
|
||||
$this->retvalue = $this->_retvalue;
|
||||
}
|
||||
|
||||
public function doParse($yymajor, $yytokenvalue)
|
||||
{
|
||||
$yyerrorhit = 0; /* True if yymajor has invoked an error */
|
||||
|
||||
if ($this->yyidx === null || $this->yyidx < 0) {
|
||||
$this->yyidx = 0;
|
||||
$this->yyerrcnt = -1;
|
||||
$x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
|
||||
$x->stateno = 0;
|
||||
$x->major = 0;
|
||||
$this->yystack = array();
|
||||
$this->yystack[] = $x;
|
||||
}
|
||||
$yyendofinput = ($yymajor==0);
|
||||
|
||||
if ($this->yyTraceFILE) {
|
||||
fprintf($this->yyTraceFILE, "%sInput %s\n",
|
||||
$this->yyTracePrompt, $this->yyTokenName[$yymajor]);
|
||||
}
|
||||
|
||||
do {
|
||||
$yyact = $this->yy_find_shift_action($yymajor);
|
||||
if ($yymajor < self::YYERRORSYMBOL &&
|
||||
!$this->yy_is_expected_token($yymajor)) {
|
||||
// force a syntax error
|
||||
$yyact = self::YY_ERROR_ACTION;
|
||||
}
|
||||
if ($yyact < self::YYNSTATE) {
|
||||
$this->yy_shift($yyact, $yymajor, $yytokenvalue);
|
||||
$this->yyerrcnt--;
|
||||
if ($yyendofinput && $this->yyidx >= 0) {
|
||||
$yymajor = 0;
|
||||
} else {
|
||||
$yymajor = self::YYNOCODE;
|
||||
}
|
||||
} elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
|
||||
$this->yy_reduce($yyact - self::YYNSTATE);
|
||||
} elseif ($yyact === self::YY_ERROR_ACTION) {
|
||||
if ($this->yyTraceFILE) {
|
||||
fprintf($this->yyTraceFILE, "%sSyntax Error!\n",
|
||||
$this->yyTracePrompt);
|
||||
}
|
||||
if (self::YYERRORSYMBOL) {
|
||||
if ($this->yyerrcnt < 0) {
|
||||
$this->yy_syntax_error($yymajor, $yytokenvalue);
|
||||
}
|
||||
$yymx = $this->yystack[$this->yyidx]->major;
|
||||
if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) {
|
||||
if ($this->yyTraceFILE) {
|
||||
fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
|
||||
$this->yyTracePrompt, $this->yyTokenName[$yymajor]);
|
||||
}
|
||||
$this->yy_destructor($yymajor, $yytokenvalue);
|
||||
$yymajor = self::YYNOCODE;
|
||||
} else {
|
||||
while ($this->yyidx >= 0 &&
|
||||
$yymx !== self::YYERRORSYMBOL &&
|
||||
($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
|
||||
){
|
||||
$this->yy_pop_parser_stack();
|
||||
}
|
||||
if ($this->yyidx < 0 || $yymajor==0) {
|
||||
$this->yy_destructor($yymajor, $yytokenvalue);
|
||||
$this->yy_parse_failed();
|
||||
$yymajor = self::YYNOCODE;
|
||||
} elseif ($yymx !== self::YYERRORSYMBOL) {
|
||||
$u2 = 0;
|
||||
$this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
|
||||
}
|
||||
}
|
||||
$this->yyerrcnt = 3;
|
||||
$yyerrorhit = 1;
|
||||
} else {
|
||||
if ($this->yyerrcnt <= 0) {
|
||||
$this->yy_syntax_error($yymajor, $yytokenvalue);
|
||||
}
|
||||
$this->yyerrcnt = 3;
|
||||
$this->yy_destructor($yymajor, $yytokenvalue);
|
||||
if ($yyendofinput) {
|
||||
$this->yy_parse_failed();
|
||||
}
|
||||
$yymajor = self::YYNOCODE;
|
||||
}
|
||||
} else {
|
||||
$this->yy_accept();
|
||||
$yymajor = self::YYNOCODE;
|
||||
}
|
||||
} while ($yymajor !== self::YYNOCODE && $this->yyidx >= 0);
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+50
-65
@@ -2,12 +2,14 @@
|
||||
|
||||
namespace Smarty\Resource;
|
||||
|
||||
use Smarty\Exception;
|
||||
use Smarty\Smarty;
|
||||
use Smarty\Template;
|
||||
use Smarty\Template\Source;
|
||||
|
||||
/**
|
||||
* Smarty Resource Plugin
|
||||
* Base implementation for resource plugins
|
||||
* @method process(\Smarty\Template $_smarty_tpl)
|
||||
* @author Rodney Rehm
|
||||
*/
|
||||
abstract class BasePlugin
|
||||
@@ -41,15 +43,25 @@ abstract class BasePlugin
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Load Resource Handler
|
||||
*
|
||||
* @param \Smarty $smarty smarty object
|
||||
* @param string $type name of the resource
|
||||
*
|
||||
* @return BasePlugin Resource Handler
|
||||
*@throws \Smarty\Exception
|
||||
*/
|
||||
/**
|
||||
* Check if resource must check time stamps when loading compiled or cached templates.
|
||||
* Resources like 'extends' which use source components my disable timestamp checks on own resource.
|
||||
* @return bool
|
||||
*/
|
||||
public function checkTimestamps()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Load Resource Handler
|
||||
*
|
||||
* @param Smarty $smarty smarty object
|
||||
* @param string $type name of the resource
|
||||
*
|
||||
* @return BasePlugin Resource Handler
|
||||
* @throws Exception
|
||||
*/
|
||||
public static function load(Smarty $smarty, $type)
|
||||
{
|
||||
// try smarty's cache
|
||||
@@ -108,77 +120,50 @@ abstract class BasePlugin
|
||||
return array($name, $type);
|
||||
}
|
||||
|
||||
/**
|
||||
* initialize Source Object for given resource
|
||||
* wrapper for backward compatibility to versions < 3.1.22
|
||||
* Either [$_template] or [$smarty, $template_resource] must be specified
|
||||
*
|
||||
* @param \Smarty\Template $_template template object
|
||||
* @param \Smarty $smarty smarty object
|
||||
* @param string $template_resource resource identifier
|
||||
*
|
||||
* @return \Smarty\Template\Source Source Object
|
||||
* @throws \Smarty\Exception
|
||||
*/
|
||||
public static function source(
|
||||
\Smarty\Template $_template = null,
|
||||
\Smarty\Smarty $smarty = null,
|
||||
$template_resource = null
|
||||
) {
|
||||
return \Smarty\Template\Source::load($_template, $smarty, $template_resource);
|
||||
}
|
||||
|
||||
/**
|
||||
* Load template's source into current template object
|
||||
*
|
||||
* @param \Smarty\Template\Source $source source object
|
||||
* @param Source $source source object
|
||||
*
|
||||
* @return string template source
|
||||
* @throws \Smarty\Exception if source cannot be loaded
|
||||
*/
|
||||
abstract public function getContent(\Smarty\Template\Source $source);
|
||||
abstract public function getContent(Source $source);
|
||||
|
||||
/**
|
||||
* populate Source Object with meta data from Resource
|
||||
*
|
||||
* @param \Smarty\Template\Source $source source object
|
||||
* @param \Smarty\Template $_template template object
|
||||
*/
|
||||
abstract public function populate(\Smarty\Template\Source $source, \Smarty\Template $_template = null);
|
||||
/**
|
||||
* populate Source Object with metadata from Resource
|
||||
*
|
||||
* @param Source $source source object
|
||||
* @param Template|null $_template template object
|
||||
*/
|
||||
abstract public function populate(Source $source, \Smarty\Template $_template = null);
|
||||
|
||||
/**
|
||||
* populate Source Object with timestamp and exists from Resource
|
||||
*
|
||||
* @param \Smarty\Template\Source $source source object
|
||||
* @param Source $source source object
|
||||
*/
|
||||
public function populateTimestamp(\Smarty\Template\Source $source)
|
||||
public function populateTimestamp(Source $source)
|
||||
{
|
||||
// intentionally left blank
|
||||
}
|
||||
|
||||
/*
|
||||
* Check if resource must check time stamps when when loading complied or cached templates.
|
||||
* Resources like 'extends' which use source components my disable timestamp checks on own resource.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
/**
|
||||
* Determine basename for compiled filename
|
||||
*
|
||||
* @param \Smarty\Template\Source $source source object
|
||||
*
|
||||
* @return string resource's basename
|
||||
*/
|
||||
public function getBasename(\Smarty\Template\Source $source)
|
||||
{
|
||||
return basename(preg_replace('![^\w]+!', '_', $source->name));
|
||||
}
|
||||
/*
|
||||
* Check if resource must check time stamps when when loading complied or cached templates.
|
||||
* Resources like 'extends' which use source components my disable timestamp checks on own resource.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
/**
|
||||
* Determine basename for compiled filename
|
||||
*
|
||||
* @param \Smarty\Template\Source $source source object
|
||||
*
|
||||
* @return string resource's basename
|
||||
*/
|
||||
public function getBasename(\Smarty\Template\Source $source)
|
||||
{
|
||||
return basename(preg_replace('![^\w]+!', '_', $source->name));
|
||||
}
|
||||
|
||||
/**
|
||||
* @return bool
|
||||
*/
|
||||
public function checkTimestamps()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,19 +8,9 @@ use Smarty\Template\Source;
|
||||
|
||||
/**
|
||||
* Smarty Internal Plugin Resource Extends
|
||||
*
|
||||
|
||||
|
||||
* Implements the file system as resource for Smarty which {extend}s a chain of template files templates
|
||||
* @author Uwe Tews
|
||||
* @author Rodney Rehm
|
||||
*/
|
||||
|
||||
/**
|
||||
* Smarty Internal Plugin Resource Extends
|
||||
* Implements the file system as resource for Smarty which {extend}s a chain of template files templates
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
class ExtendsPlugin extends BasePlugin
|
||||
{
|
||||
|
||||
@@ -9,9 +9,7 @@
|
||||
|
||||
namespace Smarty\Resource;
|
||||
|
||||
use Smarty\Smarty;
|
||||
use Smarty\Template;
|
||||
use Smarty\Template\Compiled;
|
||||
|
||||
/**
|
||||
* Smarty Resource Plugin
|
||||
@@ -38,35 +36,6 @@ abstract class RecompiledPlugin extends BasePlugin {
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* compile template from source
|
||||
*
|
||||
* @param Template $_smarty_tpl do not change variable name, is used by compiled template
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function process(Template $_smarty_tpl) {
|
||||
$compiled = $_smarty_tpl->getCompiled();
|
||||
$compiled->file_dependency = [];
|
||||
$compiled->includes = [];
|
||||
$compiled->nocache_hash = null;
|
||||
$compiled->unifunc = null;
|
||||
$level = ob_get_level();
|
||||
ob_start();
|
||||
// call compiler
|
||||
try {
|
||||
eval('?>' . $_smarty_tpl->getCompiler()->compileTemplate($_smarty_tpl));
|
||||
} catch (\Exception $e) {
|
||||
while (ob_get_level() > $level) {
|
||||
ob_end_clean();
|
||||
}
|
||||
throw $e;
|
||||
}
|
||||
ob_get_clean();
|
||||
$compiled->timestamp = time();
|
||||
$compiled->exists = true;
|
||||
}
|
||||
|
||||
/*
|
||||
* Disable timestamp checks for recompiled resource.
|
||||
*
|
||||
|
||||
@@ -40,13 +40,6 @@ class CaptureRuntime {
|
||||
*/
|
||||
private $namedBuffer = [];
|
||||
|
||||
/**
|
||||
* Flag if callbacks are registered
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
private $isRegistered = false;
|
||||
|
||||
/**
|
||||
* Open capture section
|
||||
*
|
||||
@@ -56,9 +49,9 @@ class CaptureRuntime {
|
||||
* @param string $append variable name
|
||||
*/
|
||||
public function open(Template $_template, $buffer, $assign, $append) {
|
||||
if (!$this->isRegistered) {
|
||||
$this->register($_template);
|
||||
}
|
||||
|
||||
$this->registerCallbacks($_template);
|
||||
|
||||
$this->captureStack[] = [
|
||||
$buffer,
|
||||
$assign,
|
||||
@@ -73,7 +66,15 @@ class CaptureRuntime {
|
||||
*
|
||||
* @param \Smarty\Template $_template
|
||||
*/
|
||||
private function register(Template $_template) {
|
||||
private function registerCallbacks(Template $_template) {
|
||||
|
||||
foreach ($_template->startRenderCallbacks as $callback) {
|
||||
if (is_array($callback) && get_class($callback[0]) == self::class) {
|
||||
// already registered
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
$_template->startRenderCallbacks[] = [
|
||||
$this,
|
||||
'startRender',
|
||||
@@ -83,7 +84,6 @@ class CaptureRuntime {
|
||||
'endRender',
|
||||
];
|
||||
$this->startRender($_template);
|
||||
$this->isRegistered = true;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -85,8 +85,6 @@ class InheritanceRuntime {
|
||||
ob_start();
|
||||
}
|
||||
++$this->inheritanceLevel;
|
||||
// $tpl->startRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateStart');
|
||||
// $tpl->endRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateEnd');
|
||||
}
|
||||
// if state was waiting for parent change state to parent
|
||||
if ($this->state === 2) {
|
||||
@@ -100,13 +98,11 @@ class InheritanceRuntime {
|
||||
*
|
||||
* @param \Smarty\Template $tpl
|
||||
* @param null|string $template optional name of inheritance parent template
|
||||
* @param null|string $uid uid of inline template
|
||||
* @param null|string $func function call name of inline template
|
||||
*
|
||||
* @throws \Exception
|
||||
* @throws \Smarty\Exception
|
||||
*/
|
||||
public function endChild(Template $tpl, $template = null, $uid = null, $func = null) {
|
||||
public function endChild(Template $tpl, $template = null) {
|
||||
--$this->inheritanceLevel;
|
||||
if (!$this->inheritanceLevel) {
|
||||
ob_end_clean();
|
||||
@@ -118,10 +114,7 @@ class InheritanceRuntime {
|
||||
$tpl->cache_id,
|
||||
$tpl->compile_id,
|
||||
$tpl->caching ? \Smarty\Template::CACHING_NOCACHE_CODE : 0,
|
||||
$tpl->cache_lifetime,
|
||||
[],
|
||||
$uid,
|
||||
$func
|
||||
$tpl->cache_lifetime
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -151,7 +144,7 @@ class InheritanceRuntime {
|
||||
while ($block->child && $block->child->child && $block->tplIndex <= $block->child->tplIndex) {
|
||||
$block->child = $block->child->child;
|
||||
}
|
||||
$this->process($tpl, $block);
|
||||
$this->processBlock($tpl, $block);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -163,7 +156,7 @@ class InheritanceRuntime {
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
private function process(
|
||||
private function processBlock(
|
||||
Template $tpl,
|
||||
\Smarty\Runtime\Block $block,
|
||||
\Smarty\Runtime\Block $parent = null
|
||||
@@ -181,7 +174,7 @@ class InheritanceRuntime {
|
||||
if ($block->callsChild || !isset($block->child) || ($block->child->hide && !isset($block->child->child))) {
|
||||
$this->callBlock($block, $tpl);
|
||||
} else {
|
||||
$this->process($tpl, $block->child, $block);
|
||||
$this->processBlock($tpl, $block->child, $block);
|
||||
}
|
||||
if ($block->prepend && isset($parent)) {
|
||||
$this->callParent($tpl, $block, '{block prepend}');
|
||||
@@ -191,7 +184,7 @@ class InheritanceRuntime {
|
||||
) {
|
||||
$this->callBlock($block, $tpl);
|
||||
} else {
|
||||
$this->process($tpl, $block->child, $block);
|
||||
$this->processBlock($tpl, $block->child, $block);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -209,7 +202,7 @@ class InheritanceRuntime {
|
||||
*/
|
||||
public function callChild(Template $tpl, \Smarty\Runtime\Block $block) {
|
||||
if (isset($block->child)) {
|
||||
$this->process($tpl, $block->child, $block);
|
||||
$this->processBlock($tpl, $block->child, $block);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+49
-191
@@ -56,13 +56,6 @@ class Template extends TemplateBase {
|
||||
*/
|
||||
public $template_resource = null;
|
||||
|
||||
/**
|
||||
* flag if compiled template is invalid and must be (re)compiled
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
public $mustCompile = null;
|
||||
|
||||
/**
|
||||
* Template ID
|
||||
*
|
||||
@@ -70,13 +63,6 @@ class Template extends TemplateBase {
|
||||
*/
|
||||
public $templateId = null;
|
||||
|
||||
/**
|
||||
* Flag which is set while rending a cache file
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
public $isRenderingCache = false;
|
||||
|
||||
/**
|
||||
* Callbacks called before rendering template
|
||||
*
|
||||
@@ -161,7 +147,7 @@ class Template extends TemplateBase {
|
||||
* @throws \Exception
|
||||
* @throws \Smarty\Exception
|
||||
*/
|
||||
public function render($no_output_filter = true, $display = null) {
|
||||
private function render($no_output_filter = true, $display = null) {
|
||||
if ($this->smarty->debugging) {
|
||||
$this->smarty->getDebug()->start_template($this, $display);
|
||||
}
|
||||
@@ -172,23 +158,38 @@ class Template extends TemplateBase {
|
||||
($this->_isSubTpl() ? " in '{$this->parent->template_resource}'" : '')
|
||||
);
|
||||
}
|
||||
|
||||
// disable caching for evaluated code
|
||||
if ($this->getSource()->handler->recompiled) {
|
||||
$this->caching = \Smarty\Smarty::CACHING_OFF;
|
||||
}
|
||||
// read from cache or render
|
||||
if ($this->caching === \Smarty\Smarty::CACHING_LIFETIME_CURRENT || $this->caching === \Smarty\Smarty::CACHING_LIFETIME_SAVED) {
|
||||
if ($this->getCached()->cache_id !== $this->cache_id || $this->getCached()->compile_id !== $this->compile_id) {
|
||||
$this->getCached(true);
|
||||
}
|
||||
$this->getCached()->render($this, $no_output_filter);
|
||||
} else {
|
||||
$compiled = $this->getCompiled();
|
||||
if ($compiled->compile_id !== $this->compile_id) {
|
||||
$compiled = $this->getCompiled(true);
|
||||
}
|
||||
$compiled->render($this);
|
||||
|
||||
foreach ($this->startRenderCallbacks as $callback) {
|
||||
call_user_func($callback, $this);
|
||||
}
|
||||
|
||||
try {
|
||||
|
||||
// read from cache or render
|
||||
if ($this->caching === \Smarty\Smarty::CACHING_LIFETIME_CURRENT || $this->caching === \Smarty\Smarty::CACHING_LIFETIME_SAVED) {
|
||||
if ($this->getCached()->cache_id !== $this->cache_id || $this->getCached()->compile_id !== $this->compile_id) {
|
||||
$this->getCached(true);
|
||||
}
|
||||
$this->getCached()->render($this, $no_output_filter);
|
||||
} else {
|
||||
$compiled = $this->getCompiled();
|
||||
if ($compiled->compile_id !== $this->compile_id) {
|
||||
$compiled = $this->getCompiled(true);
|
||||
}
|
||||
$compiled->render($this);
|
||||
}
|
||||
|
||||
} finally {
|
||||
foreach ($this->endRenderCallbacks as $callback) {
|
||||
call_user_func($callback, $this);
|
||||
}
|
||||
}
|
||||
|
||||
// display or fetch
|
||||
if ($display) {
|
||||
if ($this->caching && $this->smarty->cache_modified_check) {
|
||||
@@ -240,8 +241,6 @@ class Template extends TemplateBase {
|
||||
* @param integer $caching cache mode
|
||||
* @param integer $cache_lifetime lifetime of cache data
|
||||
* @param array $extra_vars passed parameter template variables
|
||||
* @param null $uid file dependency uid
|
||||
* @param null $content_func function name
|
||||
* @param int|null $scope
|
||||
*
|
||||
* @throws Exception
|
||||
@@ -252,9 +251,7 @@ class Template extends TemplateBase {
|
||||
$compile_id,
|
||||
$caching,
|
||||
$cache_lifetime,
|
||||
array $extra_vars,
|
||||
$uid = null,
|
||||
$content_func = null,
|
||||
array $extra_vars = [],
|
||||
int $scope = null
|
||||
) {
|
||||
|
||||
@@ -270,22 +267,10 @@ class Template extends TemplateBase {
|
||||
|
||||
// recursive call ?
|
||||
if ($tpl->getTemplateId() !== $this->getTemplateId()) {
|
||||
|
||||
if (isset($uid) && $this->getCompiled()->file_dependency) {
|
||||
// for inline templates we can get all resource information from file dependency
|
||||
[$filepath, $timestamp, $type] = $this->getCompiled()->file_dependency[$uid];
|
||||
$source = new Source($this->getSmarty(), $filepath, $type, $filepath);
|
||||
$source->filepath = $filepath;
|
||||
$source->timestamp = $timestamp;
|
||||
$source->exists = true;
|
||||
$source->uid = $uid;
|
||||
$tpl->setSource($source);
|
||||
} else {
|
||||
$tpl->setSource(Source::load($tpl));
|
||||
$tpl->getCompiled(true); // @TODO this unset($tpl->compiled), there might be a bug here
|
||||
}
|
||||
$tpl->setSource(Source::load($tpl));
|
||||
$tpl->getCompiled(true);
|
||||
if ($caching !== \Smarty\Template::CACHING_NOCACHE_CODE) {
|
||||
$tpl->getCached(true); // @TODO this unset($tpl->cached), there might be a bug here
|
||||
$tpl->getCached(true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -300,20 +285,8 @@ class Template extends TemplateBase {
|
||||
$this->getCached()->hashes[$tpl->getCompiled()->nocache_hash] = true;
|
||||
}
|
||||
}
|
||||
if (isset($uid)) {
|
||||
$smarty = $this->getSmarty();
|
||||
if ($smarty->debugging) {
|
||||
$smarty->getDebug()->start_template($tpl);
|
||||
$smarty->getDebug()->start_render($tpl);
|
||||
}
|
||||
$tpl->getRenderedTemplateCode($content_func);
|
||||
if ($smarty->debugging) {
|
||||
$smarty->getDebug()->end_template($tpl);
|
||||
$smarty->getDebug()->end_render($tpl);
|
||||
}
|
||||
} else {
|
||||
$tpl->render();
|
||||
}
|
||||
|
||||
$tpl->render();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -326,91 +299,19 @@ class Template extends TemplateBase {
|
||||
}
|
||||
|
||||
public function assign($tpl_var, $value = null, $nocache = false, $scope = null) {
|
||||
return parent::assign($tpl_var, $value, $nocache || $this->isRenderingCache, $scope);
|
||||
}
|
||||
|
||||
/**
|
||||
* This function is executed automatically when a compiled or cached template file is included
|
||||
* - Decode saved properties from compiled template and cache files
|
||||
* - Check if compiled or cache file is valid
|
||||
*
|
||||
* @param array $properties special template properties
|
||||
* @param bool $cache flag if called from cache file
|
||||
*
|
||||
* @return bool flag if compiled or cache file is valid
|
||||
* @throws \Smarty\Exception
|
||||
*/
|
||||
public function isFresh($properties, $cache = false) {
|
||||
// on cache resources other than file check version stored in cache code
|
||||
if (!isset($properties['version']) || \Smarty\Smarty::SMARTY_VERSION !== $properties['version']) {
|
||||
if ($cache) {
|
||||
$this->getSmarty()->clearAllCache();
|
||||
} else {
|
||||
$this->getSmarty()->clearCompiledTemplate();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
$is_valid = true;
|
||||
if (!empty($properties['file_dependency'])
|
||||
&& ((!$cache && $this->compile_check) || $this->compile_check === \Smarty\Smarty::COMPILECHECK_ON)
|
||||
) {
|
||||
// check file dependencies at compiled code
|
||||
foreach ($properties['file_dependency'] as $_file_to_check) {
|
||||
if ($_file_to_check[2] === 'file' || $_file_to_check[2] === 'php') {
|
||||
if ($this->getSource()->filepath === $_file_to_check[0]) {
|
||||
// do not recheck current template
|
||||
continue;
|
||||
//$mtime = $this->getSource()->getTimeStamp();
|
||||
} else {
|
||||
// file and php types can be checked without loading the respective resource handlers
|
||||
$mtime = is_file($_file_to_check[0]) ? filemtime($_file_to_check[0]) : false;
|
||||
}
|
||||
} else {
|
||||
$handler = \Smarty\Resource\BasePlugin::load($this->getSmarty(), $_file_to_check[2]);
|
||||
if ($handler->checkTimestamps()) {
|
||||
$source = Source::load($this, $this->getSmarty(), $_file_to_check[0]);
|
||||
$mtime = $source->getTimeStamp();
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if ($mtime === false || $mtime > $_file_to_check[1]) {
|
||||
$is_valid = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($cache) {
|
||||
// CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc
|
||||
if ($this->caching === \Smarty\Smarty::CACHING_LIFETIME_SAVED && $properties['cache_lifetime'] >= 0
|
||||
&& (time() > ($this->getCached()->timestamp + $properties['cache_lifetime']))
|
||||
) {
|
||||
$is_valid = false;
|
||||
}
|
||||
$this->getCached()->cache_lifetime = $properties['cache_lifetime'];
|
||||
$this->getCached()->valid = $is_valid;
|
||||
$generatedFile = $this->getCached();
|
||||
} else {
|
||||
$this->mustCompile = !$is_valid;
|
||||
$generatedFile = $this->getCompiled();
|
||||
$generatedFile->includes = $properties['includes'] ?? [];
|
||||
}
|
||||
if ($is_valid) {
|
||||
$generatedFile->unifunc = $properties['unifunc'];
|
||||
$generatedFile->setNocacheCode($properties['has_nocache_code']);
|
||||
$generatedFile->file_dependency = $properties['file_dependency'];
|
||||
}
|
||||
return $is_valid && !function_exists($properties['unifunc']);
|
||||
return parent::assign($tpl_var, $value, $nocache, $scope);
|
||||
}
|
||||
|
||||
/**
|
||||
* Compiles the template
|
||||
* If the template is not evaluated the compiled template is saved on disk
|
||||
*
|
||||
* @TODO only used in compileAll and 1 unit test: can we move this and make compileAndWrite private?
|
||||
*
|
||||
* @throws \Exception
|
||||
*/
|
||||
public function compileTemplateSource() {
|
||||
return $this->getCompiled()->compileTemplateSource($this);
|
||||
return $this->getCompiled()->compileAndWrite($this);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -420,7 +321,7 @@ class Template extends TemplateBase {
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getCachedContent() {
|
||||
return $this->getCached()->handler->getCachedContent($this);
|
||||
return $this->getCached()->getContent($this);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -429,6 +330,8 @@ class Template extends TemplateBase {
|
||||
* @param string $content
|
||||
*
|
||||
* @return bool
|
||||
*
|
||||
* @TODO this method is only used in unit tests that (mostly) try to test CacheResources.
|
||||
*/
|
||||
public function writeCachedContent($content) {
|
||||
if ($this->getSource()->handler->recompiled || !$this->caching
|
||||
@@ -495,7 +398,7 @@ class Template extends TemplateBase {
|
||||
return $this->cached;
|
||||
}
|
||||
|
||||
public function isCachingEnabled(): bool {
|
||||
private function isCachingEnabled(): bool {
|
||||
return $this->caching && !$this->getSource()->handler->recompiled;
|
||||
}
|
||||
|
||||
@@ -523,14 +426,6 @@ class Template extends TemplateBase {
|
||||
$this->inheritance = $inheritanceRuntime;
|
||||
}
|
||||
|
||||
/**
|
||||
* Unload event callbacks
|
||||
*/
|
||||
private function _cleanUp() {
|
||||
$this->startRenderCallbacks = [];
|
||||
$this->endRenderCallbacks = [];
|
||||
}
|
||||
|
||||
/**
|
||||
* Return Compiler object
|
||||
*/
|
||||
@@ -573,7 +468,7 @@ class Template extends TemplateBase {
|
||||
* @return bool
|
||||
* @throws \Smarty\Exception
|
||||
*/
|
||||
public function mustCompile() {
|
||||
public function mustCompile(): bool {
|
||||
if (!$this->getSource()->exists) {
|
||||
if ($this->_isSubTpl()) {
|
||||
$parent_resource = " in '{$this->parent->template_resource}'";
|
||||
@@ -582,13 +477,12 @@ class Template extends TemplateBase {
|
||||
}
|
||||
throw new Exception("Unable to load template {$this->getSource()->type} '{$this->getSource()->name}'{$parent_resource}");
|
||||
}
|
||||
if ($this->mustCompile === null) {
|
||||
$this->mustCompile = $this->smarty->force_compile
|
||||
|| $this->getSource()->handler->recompiled
|
||||
|| !$this->getCompiled()->exists
|
||||
|| ($this->compile_check && $this->getCompiled()->getTimeStamp() < $this->getSource()->getTimeStamp());
|
||||
}
|
||||
return $this->mustCompile;
|
||||
|
||||
// @TODO move this logic to Compiled
|
||||
return $this->smarty->force_compile
|
||||
|| $this->getSource()->handler->recompiled
|
||||
|| !$this->getCompiled()->exists
|
||||
|| ($this->compile_check && $this->getCompiled()->getTimeStamp() < $this->getSource()->getTimeStamp());
|
||||
}
|
||||
|
||||
private function getCodeFrameCompiler(): Compiler\CodeFrame {
|
||||
@@ -745,7 +639,6 @@ class Template extends TemplateBase {
|
||||
$result = $this->render(false, $function);
|
||||
|
||||
// Restore the template to its previous state
|
||||
$this->_cleanUp();
|
||||
$this->tpl_vars = $savedTplVars;
|
||||
$this->config_vars = $savedConfigVars;
|
||||
}
|
||||
@@ -773,41 +666,6 @@ class Template extends TemplateBase {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* get rendered template content by calling compiled or cached template code
|
||||
*
|
||||
* @param string $unifunc function with template code
|
||||
*
|
||||
* @throws \Exception
|
||||
*/
|
||||
public function getRenderedTemplateCode($unifunc) {
|
||||
$level = ob_get_level();
|
||||
try {
|
||||
if (empty($unifunc) || !function_exists($unifunc)) {
|
||||
throw new \Smarty\Exception("Invalid compiled template for '{$this->template_resource}'");
|
||||
}
|
||||
if ($this->startRenderCallbacks) {
|
||||
foreach ($this->startRenderCallbacks as $callback) {
|
||||
call_user_func($callback, $this);
|
||||
}
|
||||
}
|
||||
$unifunc($this);
|
||||
foreach ($this->endRenderCallbacks as $callback) {
|
||||
call_user_func($callback, $this);
|
||||
}
|
||||
$this->isRenderingCache = false;
|
||||
} catch (\Exception $e) {
|
||||
$this->isRenderingCache = false;
|
||||
while (ob_get_level() > $level) {
|
||||
ob_end_clean();
|
||||
}
|
||||
if (isset($this->getSmarty()->security_policy)) {
|
||||
$this->getSmarty()->security_policy->endTemplate();
|
||||
}
|
||||
throw $e;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Config|Source|null
|
||||
*/
|
||||
|
||||
+86
-37
@@ -5,6 +5,7 @@ namespace Smarty\Template;
|
||||
use Smarty\Exception;
|
||||
use Smarty\Template;
|
||||
use Smarty\Template\Cacheresource\Base;
|
||||
use Smarty\Template\Compiler\CodeFrame;
|
||||
|
||||
/**
|
||||
* Represents a cached version of a template or config file.
|
||||
@@ -17,14 +18,7 @@ class Cached extends GeneratedPhpFile {
|
||||
*
|
||||
* @var boolean
|
||||
*/
|
||||
public $valid = null;
|
||||
|
||||
/**
|
||||
* @return bool|null
|
||||
*/
|
||||
public function getValid(): ?bool {
|
||||
return $this->valid;
|
||||
}
|
||||
private $valid = null;
|
||||
|
||||
/**
|
||||
* @param bool|null $valid
|
||||
@@ -89,11 +83,6 @@ class Cached extends GeneratedPhpFile {
|
||||
*/
|
||||
public $content = null;
|
||||
|
||||
private function renderTemplateCode(Template $_template) {
|
||||
$_template->isRenderingCache = true;
|
||||
$_template->getRenderedTemplateCode($this->unifunc);
|
||||
}
|
||||
|
||||
/**
|
||||
* create Cached Object container
|
||||
*
|
||||
@@ -118,21 +107,25 @@ class Cached extends GeneratedPhpFile {
|
||||
* @throws \Exception
|
||||
*/
|
||||
public function render(Template $_template, $no_output_filter = true) {
|
||||
if ($this->isCached($_template)) {
|
||||
if ($_template->getSmarty()->debugging) {
|
||||
$_template->getSmarty()->getDebug()->start_cache($_template);
|
||||
}
|
||||
|
||||
if (!$this->isCached($_template)) {
|
||||
$this->updateCache($_template, $no_output_filter);
|
||||
} else {
|
||||
if (!$this->processed) {
|
||||
$this->process($_template);
|
||||
}
|
||||
$this->renderTemplateCode($_template);
|
||||
if ($_template->getSmarty()->debugging) {
|
||||
$_template->getSmarty()->getDebug()->end_cache($_template);
|
||||
}
|
||||
return;
|
||||
} else {
|
||||
$this->updateCache($_template, $no_output_filter);
|
||||
}
|
||||
|
||||
if ($_template->getSmarty()->debugging) {
|
||||
$_template->getSmarty()->getDebug()->start_cache($_template);
|
||||
}
|
||||
|
||||
$this->getRenderedTemplateCode($_template, $this->unifunc);
|
||||
|
||||
if ($_template->getSmarty()->debugging) {
|
||||
$_template->getSmarty()->getDebug()->end_cache($_template);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -223,11 +216,7 @@ class Cached extends GeneratedPhpFile {
|
||||
if ($this->handler->process($_template, $this, $update) === false) {
|
||||
$this->valid = false;
|
||||
}
|
||||
if ($this->valid) {
|
||||
$this->processed = true;
|
||||
} else {
|
||||
$this->processed = false;
|
||||
}
|
||||
$this->processed = $this->valid;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -283,23 +272,26 @@ class Cached extends GeneratedPhpFile {
|
||||
* @throws \Smarty\Exception
|
||||
*/
|
||||
private function updateCache(Template $_template, $no_output_filter) {
|
||||
|
||||
ob_start();
|
||||
|
||||
$_template->getCompiled()->render($_template);
|
||||
|
||||
if ($_template->getSmarty()->debugging) {
|
||||
$_template->getSmarty()->getDebug()->start_cache($_template);
|
||||
}
|
||||
|
||||
$this->removeNoCacheHash($_template, $no_output_filter);
|
||||
$compile_check = (int)$_template->compile_check;
|
||||
$_template->compile_check = \Smarty\Smarty::COMPILECHECK_OFF;
|
||||
|
||||
if ($_template->_isSubTpl()) {
|
||||
// @TODO why is this needed?
|
||||
$_template->getCompiled()->unifunc = $_template->parent->getCompiled()->unifunc;
|
||||
}
|
||||
if (!$_template->getCached()->processed) {
|
||||
$_template->getCached()->process($_template, true);
|
||||
|
||||
if (!$this->processed) {
|
||||
$this->process($_template, true);
|
||||
}
|
||||
$_template->compile_check = $compile_check;
|
||||
$this->renderTemplateCode($_template);
|
||||
|
||||
if ($_template->getSmarty()->debugging) {
|
||||
$_template->getSmarty()->getDebug()->end_cache($_template);
|
||||
}
|
||||
@@ -367,8 +359,9 @@ class Cached extends GeneratedPhpFile {
|
||||
) {
|
||||
$content = $_template->getSmarty()->runOutputFilters($content, $_template);
|
||||
}
|
||||
// write cache file content
|
||||
$_template->writeCachedContent($content);
|
||||
|
||||
$codeframe = (new \Smarty\Compiler\CodeFrame($_template))->create($content, '', true);
|
||||
$this->writeCache($_template, $codeframe);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -385,4 +378,60 @@ class Cached extends GeneratedPhpFile {
|
||||
$this->source = $source;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the generated content
|
||||
*
|
||||
* @param Template $template
|
||||
*
|
||||
* @return string|null
|
||||
* @throws \Exception
|
||||
*/
|
||||
public function getContent(Template $template) {
|
||||
ob_start();
|
||||
$this->render($template);
|
||||
return ob_get_clean();
|
||||
}
|
||||
|
||||
/**
|
||||
* This function is executed automatically when a generated file is included
|
||||
* - Decode saved properties
|
||||
* - Check if file is valid
|
||||
*
|
||||
* @param Template $_template
|
||||
* @param array $properties special template properties
|
||||
*
|
||||
* @return bool flag if compiled or cache file is valid
|
||||
* @throws Exception
|
||||
*/
|
||||
public function isFresh(Template $_template, array $properties): bool {
|
||||
|
||||
// on cache resources other than file check version stored in cache code
|
||||
if (\Smarty\Smarty::SMARTY_VERSION !== $properties['version']) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$is_valid = true;
|
||||
|
||||
if (!empty($properties['file_dependency']) && ($_template->compile_check === \Smarty\Smarty::COMPILECHECK_ON)) {
|
||||
$is_valid = $this->checkFileDependencies($properties['file_dependency'], $_template);
|
||||
}
|
||||
|
||||
// CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc
|
||||
if ($_template->caching === \Smarty\Smarty::CACHING_LIFETIME_SAVED && $properties['cache_lifetime'] >= 0
|
||||
&& (time() > ($this->timestamp + $properties['cache_lifetime']))
|
||||
) {
|
||||
$is_valid = false;
|
||||
}
|
||||
|
||||
$this->cache_lifetime = $properties['cache_lifetime'];
|
||||
$this->setValid($is_valid);
|
||||
|
||||
if ($is_valid) {
|
||||
$this->unifunc = $properties['unifunc'];
|
||||
$this->setNocacheCode($properties['has_nocache_code']);
|
||||
$this->file_dependency = $properties['file_dependency'];
|
||||
}
|
||||
return $is_valid && !function_exists($properties['unifunc']);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+111
-53
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace Smarty\Template;
|
||||
|
||||
use Smarty\Exception;
|
||||
use Smarty\Template;
|
||||
|
||||
/**
|
||||
@@ -25,6 +26,10 @@ class Compiled extends GeneratedPhpFile {
|
||||
* @var int[]
|
||||
*/
|
||||
public $includes = [];
|
||||
/**
|
||||
* @var bool
|
||||
*/
|
||||
private $isValid = false;
|
||||
|
||||
/**
|
||||
* get a Compiled Object of this source
|
||||
@@ -65,11 +70,10 @@ class Compiled extends GeneratedPhpFile {
|
||||
$this->filepath .= (int)$smarty->config_read_hidden + (int)$smarty->config_booleanize * 2 +
|
||||
(int)$smarty->config_overwrite * 4;
|
||||
} else {
|
||||
$this->filepath .= (int)$smarty->merge_compiled_includes + (int)$smarty->escape_html * 2 +
|
||||
(($smarty->merge_compiled_includes && $source->type === 'extends') ? 4 : 0);
|
||||
$this->filepath .= (int)$smarty->escape_html * 2;
|
||||
}
|
||||
$this->filepath .= '.' . $source->type;
|
||||
$basename = $source->handler->getBasename($source);
|
||||
$basename = $source->getBasename();
|
||||
if (!empty($basename)) {
|
||||
$this->filepath .= '.' . $basename;
|
||||
}
|
||||
@@ -101,17 +105,20 @@ class Compiled extends GeneratedPhpFile {
|
||||
$_template->getSmarty()->getDebug()->start_render($_template);
|
||||
}
|
||||
if (!$this->processed) {
|
||||
$this->process($_template);
|
||||
$this->compileAndLoad($_template);
|
||||
}
|
||||
|
||||
// @TODO Can't Cached handle this? Maybe introduce an event to decouple.
|
||||
$_template->getCached()->file_dependency =
|
||||
array_merge($_template->getCached()->file_dependency, $this->file_dependency);
|
||||
|
||||
$_template->getRenderedTemplateCode($this->unifunc);
|
||||
$this->getRenderedTemplateCode($_template, $this->unifunc);
|
||||
|
||||
// @TODO Can't Cached handle this? Maybe introduce an event to decouple and remove the $_template->caching property.
|
||||
if ($_template->caching && $this->getNocacheCode()) {
|
||||
$_template->getCached()->hashes[$this->nocache_hash] = true;
|
||||
}
|
||||
|
||||
if ($_template->getSmarty()->debugging) {
|
||||
$_template->getSmarty()->getDebug()->end_render($_template);
|
||||
}
|
||||
@@ -124,33 +131,49 @@ class Compiled extends GeneratedPhpFile {
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
private function process(Template $_smarty_tpl) {
|
||||
$source = $_smarty_tpl->getSource();
|
||||
$smarty = $_smarty_tpl->getSmarty();
|
||||
if ($source->handler->recompiled) {
|
||||
$source->handler->process($_smarty_tpl);
|
||||
} else {
|
||||
if (!$this->exists || $smarty->force_compile
|
||||
|| ($_smarty_tpl->compile_check && $source->getTimeStamp() > $this->getTimeStamp())
|
||||
) {
|
||||
$this->compileTemplateSource($_smarty_tpl);
|
||||
$compileCheck = $_smarty_tpl->compile_check;
|
||||
$_smarty_tpl->compile_check = \Smarty\Smarty::COMPILECHECK_OFF;
|
||||
$this->loadCompiledTemplate($_smarty_tpl);
|
||||
$_smarty_tpl->compile_check = $compileCheck;
|
||||
} else {
|
||||
$_smarty_tpl->mustCompile = true;
|
||||
@include $this->filepath;
|
||||
if ($_smarty_tpl->mustCompile) {
|
||||
$this->compileTemplateSource($_smarty_tpl);
|
||||
$compileCheck = $_smarty_tpl->compile_check;
|
||||
$_smarty_tpl->compile_check = \Smarty\Smarty::COMPILECHECK_OFF;
|
||||
$this->loadCompiledTemplate($_smarty_tpl);
|
||||
$_smarty_tpl->compile_check = $compileCheck;
|
||||
}
|
||||
}
|
||||
$this->processed = true;
|
||||
private function compileAndLoad(Template $_smarty_tpl) {
|
||||
|
||||
if ($_smarty_tpl->getSource()->handler->recompiled) {
|
||||
$this->recompile($_smarty_tpl);
|
||||
return;
|
||||
}
|
||||
|
||||
if ($this->exists && !$_smarty_tpl->getSmarty()->force_compile
|
||||
&& !($_smarty_tpl->compile_check && $_smarty_tpl->getSource()->getTimeStamp() > $this->getTimeStamp())
|
||||
) {
|
||||
$this->loadCompiledTemplate($_smarty_tpl);
|
||||
}
|
||||
|
||||
if (!$this->isValid) {
|
||||
$this->compileAndWrite($_smarty_tpl);
|
||||
$this->loadCompiledTemplate($_smarty_tpl);
|
||||
}
|
||||
|
||||
$this->processed = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* compile template from source
|
||||
*
|
||||
* @param Template $_smarty_tpl do not change variable name, is used by compiled template
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
private function recompile(Template $_smarty_tpl) {
|
||||
$level = ob_get_level();
|
||||
ob_start();
|
||||
// call compiler
|
||||
try {
|
||||
eval('?>' . $this->doCompile($_smarty_tpl));
|
||||
} catch (\Exception $e) {
|
||||
while (ob_get_level() > $level) {
|
||||
ob_end_clean();
|
||||
}
|
||||
throw $e;
|
||||
}
|
||||
ob_get_clean();
|
||||
$this->timestamp = time();
|
||||
$this->exists = true;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -160,11 +183,7 @@ class Compiled extends GeneratedPhpFile {
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function compileTemplateSource(Template $_template) {
|
||||
$this->file_dependency = [];
|
||||
$this->includes = [];
|
||||
$this->nocache_hash = null;
|
||||
$this->unifunc = null;
|
||||
public function compileAndWrite(Template $_template) {
|
||||
// compile locking
|
||||
if ($saved_timestamp = (!$_template->getSource()->handler->recompiled && is_file($this->filepath))) {
|
||||
$saved_timestamp = $this->getTimeStamp();
|
||||
@@ -173,7 +192,7 @@ class Compiled extends GeneratedPhpFile {
|
||||
// compile locking
|
||||
try {
|
||||
// call compiler
|
||||
$this->write($_template, $_template->getCompiler()->compileTemplate($_template));
|
||||
$this->write($_template, $this->doCompile($_template));
|
||||
} catch (\Exception $e) {
|
||||
// restore old timestamp in case of error
|
||||
if ($saved_timestamp && is_file($this->filepath)) {
|
||||
@@ -183,6 +202,22 @@ class Compiled extends GeneratedPhpFile {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Do the actual compiling.
|
||||
*
|
||||
* @param Template $_smarty_tpl
|
||||
*
|
||||
* @return string
|
||||
* @throws Exception
|
||||
*/
|
||||
private function doCompile(Template $_smarty_tpl): string {
|
||||
$this->file_dependency = [];
|
||||
$this->includes = [];
|
||||
$this->nocache_hash = null;
|
||||
$this->unifunc = null;
|
||||
return $_smarty_tpl->getCompiler()->compileTemplate($_smarty_tpl);
|
||||
}
|
||||
|
||||
/**
|
||||
* Write compiled code by handler
|
||||
*
|
||||
@@ -192,7 +227,7 @@ class Compiled extends GeneratedPhpFile {
|
||||
* @return bool success
|
||||
* @throws \Smarty\Exception
|
||||
*/
|
||||
public function write(Template $_template, $code) {
|
||||
private function write(Template $_template, $code) {
|
||||
if (!$_template->getSource()->handler->recompiled) {
|
||||
if ($_template->getSmarty()->writeFile($this->filepath, $code) === true) {
|
||||
$this->timestamp = $this->exists = is_file($this->filepath);
|
||||
@@ -206,27 +241,15 @@ class Compiled extends GeneratedPhpFile {
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Read compiled content from handler
|
||||
*
|
||||
* @param Template $_template template object
|
||||
*
|
||||
* @return string content
|
||||
*/
|
||||
public function read(Template $_template) {
|
||||
if (!$_template->getSource()->handler->recompiled) {
|
||||
return file_get_contents($this->filepath);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Load fresh compiled template by including the PHP file
|
||||
* HHVM requires a workaround because of a PHP incompatibility
|
||||
*
|
||||
* @param \Smarty\Template $_smarty_tpl do not change variable name, is used by compiled template
|
||||
* @param Template $_smarty_tpl do not change/remove variable name, is used by compiled template
|
||||
*
|
||||
*/
|
||||
private function loadCompiledTemplate(Template $_smarty_tpl) {
|
||||
|
||||
if (function_exists('opcache_invalidate')
|
||||
&& (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1)
|
||||
) {
|
||||
@@ -239,6 +262,41 @@ class Compiled extends GeneratedPhpFile {
|
||||
} else {
|
||||
include $this->filepath;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* This function is executed automatically when a compiled or cached template file is included
|
||||
* - Decode saved properties from compiled template and cache files
|
||||
* - Check if compiled or cache file is valid
|
||||
*
|
||||
* @param Template $_template
|
||||
* @param array $properties special template properties
|
||||
*
|
||||
* @return bool flag if compiled or cache file is valid
|
||||
* @throws Exception
|
||||
*/
|
||||
public function isFresh(Template $_template, array $properties): bool {
|
||||
|
||||
// on cache resources other than file check version stored in cache code
|
||||
if (\Smarty\Smarty::SMARTY_VERSION !== $properties['version']) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$is_valid = true;
|
||||
if (!empty($properties['file_dependency']) && $_template->compile_check) {
|
||||
$is_valid = $this->checkFileDependencies($properties['file_dependency'], $_template);
|
||||
}
|
||||
|
||||
$this->isValid = $is_valid;
|
||||
$this->includes = $properties['includes'] ?? [];
|
||||
|
||||
if ($is_valid) {
|
||||
$this->unifunc = $properties['unifunc'];
|
||||
$this->setNocacheCode($properties['has_nocache_code']);
|
||||
$this->file_dependency = $properties['file_dependency'];
|
||||
}
|
||||
return $is_valid && !function_exists($properties['unifunc']);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -2,8 +2,12 @@
|
||||
|
||||
namespace Smarty\Template;
|
||||
|
||||
use Smarty\Exception;
|
||||
use Smarty\Template;
|
||||
|
||||
/**
|
||||
* Base class for generated PHP files, such as compiled and cached versions of templates and config files.
|
||||
*
|
||||
* @author Rodney Rehm
|
||||
*/
|
||||
abstract class GeneratedPhpFile {
|
||||
@@ -41,7 +45,7 @@ abstract class GeneratedPhpFile {
|
||||
*
|
||||
* @var boolean
|
||||
*/
|
||||
public $processed = false;
|
||||
protected $processed = false;
|
||||
|
||||
/**
|
||||
* unique function name for compiled template code
|
||||
@@ -90,4 +94,60 @@ abstract class GeneratedPhpFile {
|
||||
$this->has_nocache_code = $has_nocache_code;
|
||||
}
|
||||
|
||||
/**
|
||||
* get rendered template content by calling compiled or cached template code
|
||||
*
|
||||
* @param string $unifunc function with template code
|
||||
*
|
||||
* @throws \Exception
|
||||
*/
|
||||
protected function getRenderedTemplateCode(\Smarty\Template $_template, $unifunc) {
|
||||
$level = ob_get_level();
|
||||
try {
|
||||
if (empty($unifunc) || !function_exists($unifunc)) {
|
||||
throw new \Smarty\Exception("Invalid compiled template for '{$this->filepath}'");
|
||||
}
|
||||
$unifunc($_template);
|
||||
} catch (\Exception $e) {
|
||||
while (ob_get_level() > $level) {
|
||||
ob_end_clean();
|
||||
}
|
||||
|
||||
throw $e;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $file_dependency
|
||||
* @param Template $_template
|
||||
*
|
||||
* @return bool
|
||||
* @throws Exception
|
||||
*/
|
||||
protected function checkFileDependencies($file_dependency, Template $_template): bool {
|
||||
// check file dependencies at compiled code
|
||||
foreach ($file_dependency as $_file_to_check) {
|
||||
if ($_file_to_check[2] === 'file') {
|
||||
if ($_template->getSource()->filepath === $_file_to_check[0]) {
|
||||
// do not recheck current template
|
||||
continue;
|
||||
}
|
||||
// file and php types can be checked without loading the respective resource handlers
|
||||
$mtime = is_file($_file_to_check[0]) ? filemtime($_file_to_check[0]) : false;
|
||||
} else {
|
||||
$handler = \Smarty\Resource\BasePlugin::load($_template->getSmarty(), $_file_to_check[2]);
|
||||
if ($handler->checkTimestamps()) {
|
||||
$source = Source::load($_template, $_template->getSmarty(), $_file_to_check[0]);
|
||||
$mtime = $source->getTimeStamp();
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if ($mtime === false || $mtime > $_file_to_check[1]) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -234,4 +234,14 @@ class Source {
|
||||
return $this->smarty;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine basename for compiled filename
|
||||
*
|
||||
* @return string resource's basename
|
||||
*/
|
||||
public function getBasename()
|
||||
{
|
||||
return $this->handler->getBasename($this);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -353,25 +353,32 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
|
||||
$this->smarty->clearAllCache();
|
||||
// create and cache templates
|
||||
$tpl = $this->smarty->createTemplate('helloworld.tpl');
|
||||
$tpl->writeCachedContent('hello world');
|
||||
$tpl->writeCachedContent('something else 1');
|
||||
$tpl2 = $this->smarty->createTemplate('helloworld.tpl', null, 'bar');
|
||||
$tpl2->writeCachedContent('hello world');
|
||||
$tpl2->writeCachedContent('something else 2');
|
||||
$tpl3 = $this->smarty->createTemplate('helloworld.tpl', 'buh|blar');
|
||||
$tpl3->writeCachedContent('hello world');
|
||||
$tpl3->writeCachedContent('something else 3');
|
||||
// test cached content
|
||||
$this->assertEquals('something else 1', $tpl->getCachedContent());
|
||||
$this->assertEquals('something else 2', $tpl2->getCachedContent());
|
||||
$this->assertEquals('something else 3', $tpl3->getCachedContent());
|
||||
sleep(10);
|
||||
$tpl4 = $this->smarty->createTemplate('helloworld2.tpl');
|
||||
$tpl4->writeCachedContent('something else 4');
|
||||
|
||||
// test number of deleted caches
|
||||
$this->doClearCacheAssertion(3,$this->smarty->clearAllCache(5));
|
||||
|
||||
$tpl = $this->smarty->createTemplate('helloworld.tpl');
|
||||
$tpl2 = $this->smarty->createTemplate('helloworld.tpl', null, 'bar');
|
||||
$tpl3 = $this->smarty->createTemplate('helloworld.tpl', 'buh|blar');
|
||||
$tpl4 = $this->smarty->createTemplate('helloworld2.tpl');
|
||||
|
||||
// test that caches are deleted properly
|
||||
$this->assertEquals('hello world', $tpl->getCachedContent());
|
||||
$this->assertEquals('hello world', $tpl2->getCachedContent());
|
||||
$this->assertEquals('hello world', $tpl3->getCachedContent());
|
||||
sleep(10);
|
||||
$tpl4 = $this->smarty->createTemplate('helloworld2.tpl');
|
||||
$tpl4->writeCachedContent('hello world');
|
||||
// test number of deleted caches
|
||||
$this->doClearCacheAssertion(3,$this->smarty->clearAllCache(5));
|
||||
// test that caches are deleted properly
|
||||
$this->assertNull($tpl->getCachedContent());
|
||||
$this->assertNull($tpl2->getCachedContent());
|
||||
$this->assertNull($tpl3->getCachedContent());
|
||||
$this->assertEquals('hello world', $tpl4->getCachedContent());
|
||||
$this->assertEquals('something else 4', $tpl4->getCachedContent());
|
||||
}
|
||||
|
||||
public function testClearCacheCacheFileSub()
|
||||
|
||||
@@ -7,7 +7,7 @@ use Smarty\Template\Source;
|
||||
class Smarty_Resource_FiletestPlugin extends FilePlugin
|
||||
{
|
||||
/**
|
||||
* populate Source Object with meta data from Resource
|
||||
* populate Source Object with metadata from Resource
|
||||
*
|
||||
* @param Source $source source object
|
||||
* @param Template $_template template object
|
||||
|
||||
@@ -17,20 +17,22 @@ class Smarty_CacheResource_Memcache extends \Smarty\Cacheresource\KeyValueStore
|
||||
*
|
||||
* @var Memcache
|
||||
*/
|
||||
protected $memcache = null;
|
||||
private $memcache = null;
|
||||
|
||||
/**
|
||||
* Smarty_CacheResource_Memcache constructor.
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
if (class_exists('Memcached')) {
|
||||
$this->memcache = new Memcached();
|
||||
} else {
|
||||
$this->memcache = new Memcache();
|
||||
}
|
||||
$this->memcache->addServer('127.0.0.1', 11211);
|
||||
}
|
||||
/**
|
||||
* @return Memcache|Memcached
|
||||
*/
|
||||
public function getMemcache() {
|
||||
if ($this->memcache === null) {
|
||||
if (class_exists('Memcached')) {
|
||||
$this->memcache = new Memcached();
|
||||
} else {
|
||||
$this->memcache = new Memcache();
|
||||
}
|
||||
$this->memcache->addServer('127.0.0.1', 11211);
|
||||
}
|
||||
return $this->memcache;
|
||||
}
|
||||
|
||||
/**
|
||||
* Read values for a set of keys from cache
|
||||
@@ -45,7 +47,7 @@ class Smarty_CacheResource_Memcache extends \Smarty\Cacheresource\KeyValueStore
|
||||
$res = array();
|
||||
foreach ($keys as $key) {
|
||||
$k = sha1($key);
|
||||
$res[$key] = $this->memcache->get($k);
|
||||
$res[$key] = $this->getMemcache()->get($k);
|
||||
}
|
||||
return $res;
|
||||
}
|
||||
@@ -63,9 +65,9 @@ class Smarty_CacheResource_Memcache extends \Smarty\Cacheresource\KeyValueStore
|
||||
foreach ($keys as $k => $v) {
|
||||
$k = sha1($k);
|
||||
if (class_exists('Memcached')) {
|
||||
$this->memcache->set($k, $v, $expire);
|
||||
$this->getMemcache()->set($k, $v, $expire);
|
||||
} else {
|
||||
$this->memcache->set($k, $v, 0, $expire);
|
||||
$this->getMemcache()->set($k, $v, 0, $expire);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
@@ -82,7 +84,7 @@ class Smarty_CacheResource_Memcache extends \Smarty\Cacheresource\KeyValueStore
|
||||
{
|
||||
foreach ($keys as $k) {
|
||||
$k = sha1($k);
|
||||
$this->memcache->delete($k);
|
||||
$this->getMemcache()->delete($k);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -94,6 +96,6 @@ class Smarty_CacheResource_Memcache extends \Smarty\Cacheresource\KeyValueStore
|
||||
*/
|
||||
protected function purge()
|
||||
{
|
||||
return $this->memcache->flush();
|
||||
return $this->getMemcache()->flush();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,7 +29,8 @@ class My_Resource_Extendsall extends \Smarty\Resource\ExtendsPlugin
|
||||
$timestamp = 0;
|
||||
foreach ($source->getSmarty()->getTemplateDir() as $key => $directory) {
|
||||
try {
|
||||
$s = Smarty\Resource\BasePlugin::source(null, $source->getSmarty(), 'file:' . '[' . $key . ']' . $source->name);
|
||||
$s = \Smarty\Template\Source::load(null, $source->getSmarty(),
|
||||
'file:' . '[' . $key . ']' . $source->name);
|
||||
if (!$s->exists) {
|
||||
continue;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user