issue #18 - update lib_smarty to enable smarty w/out composer; update…

… to smarty 5.3.0 (#19)

Co-authored-by: thisisaaronland <thisisaaronland@localhost>

www/include/lib_smarty.php

@@ -3,14 +3,36 @@
 	$GLOBALS['timings']['smarty_comp_count'] = 0;
 	$GLOBALS['timings']['smarty_comp_time']	 = 0;
 
-	# 5.0.0, required for PHP 8.2
-	# composer require smarty/smarty:dev-master
+	# 5.0.0, required for PHP 8.2 and higher
+
+	# START OF hoop jumping to load Smarty without Composer
+	# https://github.com/smarty-php/smarty/issues/999#issuecomment-2109190898
+
+	define('SMARTY_DIR', dirname(__FILE__) . "/smarty-5.3.0/");
+
+	require_once(SMARTY_DIR . "functions.php");
+
+	spl_autoload_register(function ($class) {
+		// Class prefix
+		$prefix = 'Smarty\\';
+
+		// If we are not a member of above class skip
+		if (!str_starts_with($class, $prefix)) { return; }
+
+		// Hack off the prefix part
+		$relative_class = substr($class, strlen($prefix));
+
+		// Build a path to the include file
+		$file = SMARTY_DIR . str_replace('\\', '/', $relative_class) . '.php';
+
+		// If the file exists, require it
+		if (file_exists($file))  { require_once($file); }
+	});
+
+
+	# END OF hoop jumping to load Smarty without Composer
 
-	require "vendor/autoload.php";
-	require "vendor/smarty/smarty/src/Smarty.php";
-	use Smarty\Smarty;
-
-	$GLOBALS['smarty'] = new Smarty();
+	$GLOBALS['smarty'] = new Smarty\Smarty();
 
 	$GLOBALS['smarty']->setTemplateDir($GLOBALS['cfg']['smarty_template_dir']);
 	$GLOBALS['smarty']->setCompileDir($GLOBALS['cfg']['smarty_compile_dir']);

www/include/vendor/smarty/smarty/src/BlockHandler/TextFormat.php → www/include/smarty-5.3.0/BlockHandler/TextFormat.php

@@ -20,9 +20,6 @@
  * - indent_char   - string (" ")
  * - wrap_boundary - boolean (true)
  *
- * @link   https://www.smarty.net/manual/en/language.function.textformat.php {textformat}
- *         (Smarty online manual)
- *
  * @param array                    $params   parameters
  * @param string                   $content  contents of the block
  * @param Template $template template object

www/include/vendor/smarty/smarty/src/Compile/Base.php → www/include/smarty-5.3.0/Compile/Base.php

@@ -226,8 +226,8 @@ protected function convertScope($scope): int {
 	 * @param Template $compiler  compiler object
 	 * @param array                                 $parameter array with compilation parameter
 	 *
-	 * @return bool|string compiled code or true if no code has been compiled
+	 * @return string compiled code as a string
 	 * @throws \Smarty\CompilerException
 	 */
-	abstract public function compile($args, Template $compiler, $parameter = array(), $tag = null, $function = null);
+	abstract public function compile($args, Template $compiler, $parameter = array(), $tag = null, $function = null): string;
 }

www/include/vendor/smarty/smarty/src/Compile/BlockCompiler.php → www/include/smarty-5.3.0/Compile/BlockCompiler.php

@@ -50,7 +50,8 @@ class BlockCompiler extends Base {
 	 * @throws CompilerException
 	 * @throws Exception
 	 */
-	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null) {
+	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
 
 		if (!isset($tag[5]) || substr($tag, -5) !== 'close') {
 			$output = $this->compileOpeningTag($compiler, $args, $tag, $function);
@@ -77,7 +78,6 @@ public function compileChild(\Smarty\Compiler\Template $compiler) {
 			);
 		}
 		$compiler->_cache['blockParams'][$compiler->_cache['blockNesting']]['callsChild'] = true;
-		$compiler->has_code = true;
 		$compiler->suppressNocacheProcessing = true;
 
 		$output = "<?php \n";
@@ -102,7 +102,6 @@ public function compileParent(\Smarty\Compiler\Template $compiler) {
 				$compiler->getParser()->lex->taglineno
 			);
 		}
-		$compiler->has_code = true;
 		$compiler->suppressNocacheProcessing = true;
 
 		$output = "<?php \n";

www/include/vendor/smarty/smarty/src/Compile/CompilerInterface.php → www/include/smarty-5.3.0/Compile/CompilerInterface.php

@@ -17,10 +17,10 @@ interface CompilerInterface {
 	 * @param \Smarty\Compiler\Template $compiler compiler object
 	 * @param array $parameter array with compilation parameter
 	 *
-	 * @return bool|string compiled code or true if no code has been compiled
+	 * @return string compiled code as a string
 	 * @throws \Smarty\CompilerException
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null);
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string;
 
 	public function isCacheable(): bool;
 }

www/include/vendor/smarty/smarty/src/Compile/DefaultHandlerFunctionCallCompiler.php → www/include/smarty-5.3.0/Compile/DefaultHandlerFunctionCallCompiler.php

@@ -27,7 +27,8 @@ class DefaultHandlerFunctionCallCompiler extends Base {
 	 * @throws \Smarty\CompilerException
 	 * @throws \Smarty\Exception
 	 */
-	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null) {
+	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
 		// check and get attributes
 		$_attr = $this->getAttributes($compiler, $args);
 		unset($_attr['nocache']);

www/include/vendor/smarty/smarty/src/Compile/FunctionCallCompiler.php → www/include/smarty-5.3.0/Compile/FunctionCallCompiler.php

@@ -49,7 +49,8 @@ class FunctionCallCompiler extends Base {
 	 * @throws \Smarty\CompilerException
 	 * @throws \Smarty\Exception
 	 */
-	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null) {
+	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
 
 		// check and get attributes
 		$_attr = $this->getAttributes($compiler, $args);

www/include/vendor/smarty/smarty/src/Compile/Modifier/CatModifierCompiler.php → www/include/smarty-5.3.0/Compile/Modifier/CatModifierCompiler.php

@@ -11,8 +11,6 @@
  * Input:    string to catenate
  * Example:  {$var|cat:"foo"}
  *
- * @link   https://www.smarty.net/manual/en/language.modifier.cat.php cat
- *           (Smarty online manual)
  * @author Uwe Tews
  */
 

www/include/vendor/smarty/smarty/src/Compile/Modifier/CountCharactersModifierCompiler.php → www/include/smarty-5.3.0/Compile/Modifier/CountCharactersModifierCompiler.php

@@ -6,8 +6,6 @@
  * Name:     count_characters
  * Purpose:  count the number of characters in a text
  *
- * @link   https://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online
- *         manual)
  * @author Uwe Tews
  */
 

www/include/vendor/smarty/smarty/src/Compile/Modifier/CountParagraphsModifierCompiler.php → www/include/smarty-5.3.0/Compile/Modifier/CountParagraphsModifierCompiler.php

@@ -6,8 +6,6 @@
  * Name:     count_paragraphs
  * Purpose:  count the number of paragraphs in a text
  *
- * @link   https://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
- *          count_paragraphs (Smarty online manual)
  * @author Uwe Tews
  */
 

www/include/vendor/smarty/smarty/src/Compile/Modifier/CountSentencesModifierCompiler.php → www/include/smarty-5.3.0/Compile/Modifier/CountSentencesModifierCompiler.php

@@ -6,8 +6,6 @@
  * Name:     count_sentences
  * Purpose:  count the number of sentences in a text
  *
- * @link   https://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
- *          count_sentences (Smarty online manual)
  * @author Uwe Tews
  */
 

www/include/vendor/smarty/smarty/src/Compile/Modifier/CountWordsModifierCompiler.php → www/include/smarty-5.3.0/Compile/Modifier/CountWordsModifierCompiler.php

@@ -6,7 +6,6 @@
  * Name:     count_words
  * Purpose:  count the number of words in a text
  *
- * @link   https://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
  * @author Uwe Tews
  */
 

www/include/vendor/smarty/smarty/src/Compile/Modifier/DefaultModifierCompiler.php → www/include/smarty-5.3.0/Compile/Modifier/DefaultModifierCompiler.php

@@ -6,7 +6,6 @@
  * Name:     default
  * Purpose:  designate default value for empty variables
  *
- * @link   https://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
  * @author Uwe Tews
  */
 

www/include/vendor/smarty/smarty/src/Compile/Modifier/EscapeModifierCompiler.php → www/include/smarty-5.3.0/Compile/Modifier/EscapeModifierCompiler.php

@@ -9,7 +9,6 @@
  * Name:     escape
  * Purpose:  escape string for output
  *
- * @link   https://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
  * @author Rodney Rehm
  */
 

www/include/vendor/smarty/smarty/src/Compile/Modifier/IndentModifierCompiler.php → www/include/smarty-5.3.0/Compile/Modifier/IndentModifierCompiler.php

@@ -6,7 +6,6 @@
  * Name:     indent
  * Purpose:  indent lines of text
  *
- * @link   https://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
  * @author Uwe Tews
  */
 

www/include/vendor/smarty/smarty/src/Compile/Modifier/LowerModifierCompiler.php → www/include/smarty-5.3.0/Compile/Modifier/LowerModifierCompiler.php

@@ -6,7 +6,6 @@
  * Name:     lower
  * Purpose:  convert string to lowercase
  *
- * @link   https://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Uwe Tews
  */

www/include/vendor/smarty/smarty/src/Compile/Modifier/Nl2brModifierCompiler.php → www/include/smarty-5.3.0/Compile/Modifier/Nl2brModifierCompiler.php

@@ -7,7 +7,6 @@
  * Name:     nl2br
  * Purpose:  insert HTML line breaks before all newlines in a string
  *
- * @link   https://www.smarty.net/docs/en/language.modifier.nl2br.tpl nl2br (Smarty online manual)
  */
 
 class Nl2brModifierCompiler extends Base {

www/include/vendor/smarty/smarty/src/Compile/Modifier/RoundModifierCompiler.php → www/include/smarty-5.3.0/Compile/Modifier/RoundModifierCompiler.php

@@ -7,7 +7,6 @@
  * Name:     round
  * Purpose:  Returns the rounded value of num to specified precision (number of digits after the decimal point)
  *
- * @link   https://www.smarty.net/docs/en/language.modifier.round.tpl round (Smarty online manual)
  */
 
 class RoundModifierCompiler extends Base {

www/include/vendor/smarty/smarty/src/Compile/Modifier/StrRepeatModifierCompiler.php → www/include/smarty-5.3.0/Compile/Modifier/StrRepeatModifierCompiler.php

@@ -6,7 +6,6 @@
  * Name:     str_repeat
  * Purpose:  returns string repeated times times
  *
- * @link   https://www.smarty.net/docs/en/language.modifier.str_repeat.tpl str_repeat (Smarty online manual)
  */
 
 class StrRepeatModifierCompiler extends Base {

www/include/vendor/smarty/smarty/src/Compile/Modifier/StringFormatModifierCompiler.php → www/include/smarty-5.3.0/Compile/Modifier/StringFormatModifierCompiler.php

@@ -6,7 +6,6 @@
  * Name:     string_format
  * Purpose:  format strings via sprintf
  *
- * @link   https://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
  * @author Uwe Tews
  */
 

www/include/vendor/smarty/smarty/src/Compile/Modifier/StripModifierCompiler.php → www/include/smarty-5.3.0/Compile/Modifier/StripModifierCompiler.php

@@ -9,7 +9,6 @@
  * Example:  {$var|strip} {$var|strip:" "}
  * Date:     September 25th, 2002
  *
- * @link   https://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
  * @author Uwe Tews
  */
 

www/include/vendor/smarty/smarty/src/Compile/Modifier/StripTagsModifierCompiler.php → www/include/smarty-5.3.0/Compile/Modifier/StripTagsModifierCompiler.php

@@ -6,7 +6,6 @@
  * Name:     strip_tags
  * Purpose:  strip html tags from text
  *
- * @link   https://www.smarty.net/docs/en/language.modifier.strip.tags.tpl strip_tags (Smarty online manual)
  * @author Uwe Tews
  */
 

www/include/vendor/smarty/smarty/src/Compile/Modifier/StrlenModifierCompiler.php → www/include/smarty-5.3.0/Compile/Modifier/StrlenModifierCompiler.php

@@ -7,7 +7,6 @@
  * Name:     strlen
  * Purpose:  return the length of the given string
  *
- * @link   https://www.smarty.net/docs/en/language.modifier.strlen.tpl strlen (Smarty online manual)
  */
 
 class StrlenModifierCompiler extends Base {

www/include/vendor/smarty/smarty/src/Compile/Modifier/UpperModifierCompiler.php → www/include/smarty-5.3.0/Compile/Modifier/UpperModifierCompiler.php

@@ -6,7 +6,6 @@
  * Name:     lower
  * Purpose:  convert string to uppercase
  *
- * @link   https://www.smarty.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
  * @author Uwe Tews
  */
 

www/include/vendor/smarty/smarty/src/Compile/Modifier/WordWrapModifierCompiler.php → www/include/smarty-5.3.0/Compile/Modifier/WordWrapModifierCompiler.php

@@ -6,7 +6,6 @@
  * Name:     wordwrap
  * Purpose:  wrap a string of text at a given length
  *
- * @link   https://www.smarty.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
  * @author Uwe Tews
  */
 

www/include/vendor/smarty/smarty/src/Compile/ModifierCompiler.php → www/include/smarty-5.3.0/Compile/ModifierCompiler.php

@@ -33,9 +33,8 @@ class ModifierCompiler extends Base {
 	 * @throws \Smarty\CompilerException
 	 * @throws \Smarty\Exception
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
-
-		$compiler->has_code = true;
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
 
 		$output = $parameter['value'];
 

www/include/vendor/smarty/smarty/src/Compile/ObjectMethodCallCompiler.php → www/include/smarty-5.3.0/Compile/ObjectMethodCallCompiler.php

@@ -39,7 +39,8 @@ class ObjectMethodCallCompiler extends Base {
 	 * @throws \Smarty\CompilerException
 	 * @throws \Smarty\Exception
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
 		// check and get attributes
 		$_attr = $this->getAttributes($compiler, $args);
 		unset($_attr['nocache']);

www/include/vendor/smarty/smarty/src/Compile/PrintExpressionCompiler.php → www/include/smarty-5.3.0/Compile/PrintExpressionCompiler.php

@@ -47,9 +47,8 @@ class PrintExpressionCompiler extends Base {
 	 * @return string
 	 * @throws \Smarty\Exception
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
-
-		$compiler->has_code = true;
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
 
 		// check and get attributes
 		$_attr = $this->getAttributes($compiler, $args);

www/include/vendor/smarty/smarty/src/Compile/SpecialVariableCompiler.php → www/include/smarty-5.3.0/Compile/SpecialVariableCompiler.php

@@ -37,9 +37,8 @@ class SpecialVariableCompiler extends Base {
 	 * @return string compiled code
 	 * @throws CompilerException
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
-
-		$compiler->has_code = true;
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
 
 		$_index = preg_split("/\]\[/", substr($parameter, 1, strlen($parameter) - 2));
 		$variable = smarty_strtolower_ascii($compiler->getId($_index[0]));
@@ -129,5 +128,7 @@ public function compile($args, \Smarty\Compiler\Template $compiler, $parameter =
 			}
 			return $compiled_ref;
 		}
+
+		return '';
 	}
 }

www/include/vendor/smarty/smarty/src/Compile/Tag/Append.php → www/include/smarty-5.3.0/Compile/Tag/Append.php

@@ -35,8 +35,8 @@ class Append extends Assign
      * @return string compiled code
      * @throws \Smarty\CompilerException
      */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null)
-    {
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null): string
+	{
 
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);

www/include/vendor/smarty/smarty/src/Compile/Tag/Assign.php → www/include/smarty-5.3.0/Compile/Tag/Assign.php

@@ -55,8 +55,8 @@ class Assign extends Base
      * @return string compiled code
      * @throws \Smarty\CompilerException
      */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null)
-    {
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null): string
+	{
 
         $_nocache = false;
         // check and get attributes

www/include/vendor/smarty/smarty/src/Compile/Tag/BCPluginWrapper.php → www/include/smarty-5.3.0/Compile/Tag/BCPluginWrapper.php

@@ -24,7 +24,8 @@ public function __construct($callback, bool $cacheable = true) {
 	/**
 	 * @inheritDoc
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
 		return call_user_func($this->callback, $this->getAttributes($compiler, $args), $compiler->getSmarty());
 	}
 }

www/include/vendor/smarty/smarty/src/Compile/Tag/Block.php → www/include/smarty-5.3.0/Compile/Tag/Block.php

@@ -58,7 +58,7 @@ class Block extends Inheritance {
 	 * @param \Smarty\Compiler\Template $compiler compiler object
 	 * @param array $parameter array with compilation parameter
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null)
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null): string
 	{
 		if (!isset($compiler->_cache['blockNesting'])) {
 			$compiler->_cache['blockNesting'] = 0;
@@ -87,5 +87,6 @@ public function compile($args, \Smarty\Compiler\Template $compiler, $parameter =
 		$compiler->getParser()->current_buffer = new Template();
 		$compiler->getTemplate()->getCompiled()->setNocacheCode(false);
 		$compiler->suppressNocacheProcessing = true;
+		return '';
 	}
 }

www/include/vendor/smarty/smarty/src/Compile/Tag/BlockClose.php → www/include/smarty-5.3.0/Compile/Tag/BlockClose.php

@@ -18,7 +18,7 @@ class BlockClose extends Inheritance {
 	 *
 	 * @return bool true
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null)
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null): string
 	{
 		[$_attr, $_nocache, $_buffer, $_has_nocache_code, $_className] = $this->closeTag($compiler, ['block']);
 
@@ -103,7 +103,6 @@ public function compile($args, \Smarty\Compiler\Template $compiler, $parameter =
 		if ($compiler->_cache['blockNesting'] === 0) {
 			unset($compiler->_cache['blockNesting']);
 		}
-		$compiler->has_code = true;
 		$compiler->suppressNocacheProcessing = true;
 		return $output;
 	}