Merge branch 'master' into 979_setErrorUnassigned

Fixes #979

CHANGELOG.md

@@ -6,15 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [5.3.1] - 2024-06-16
-- Fixed error when using section with nocache [#1034](https://github.com/smarty-php/smarty/issues/1034)
-
-
-## [5.3.0] - 2024-05-30
-- Fix warning when calling hasVariable for an undefined variable [#977](https://github.com/smarty-php/smarty/issues/977)
-- Added `$smarty->prependTemplateDir()` method [#1022](https://github.com/smarty-php/smarty/issues/1022)
-
-
 ## [5.2.0] - 2024-05-28
 - Fixed a code injection vulnerability in extends-tag. This addresses CVE-2024-35226.
 - Added `$smarty->setCacheModifiedCheck()` setter for cache_modified_check
@@ -31,16 +22,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Internal compiler classes always return a string (the internal has_code flag has been removed for simplicity) [#918](https://github.com/smarty-php/smarty/pull/918)
 - Fix invalid classnames in Runtime code for foreach [#1000](https://github.com/smarty-php/smarty/issues/1000)
 
-## [5.0.2] - 2024-03-28
-- Fix Smarty::assign() not returning $this when called with an array as first parameter [#972](https://github.com/smarty-php/smarty/pull/972)
 
 ## [5.0.1] - 2024-03-27
 - Fix error in Smarty\Smarty::compileAllTemplates() by including missing FilesystemIterator class [#966](https://github.com/smarty-php/smarty/issues/966)  
 
+
 ## [5.0.0] - 2024-03-25
 - Fixed that scoped variables would overwrite parent scope [#952](https://github.com/smarty-php/smarty/issues/952)
 - Removed publicly accessible `$tpl->_var_stack` variable
 
+
 ### Fixed
 - Too many shorthand attributes error when using a modifier as a function with more than 3 parameters in an expression [#949](https://github.com/smarty-php/smarty/issues/949)
 

changelog/1022.md

@@ -0,0 +1 @@
+- Added `$smarty->prependTemplateDir()` method [#1022](https://github.com/smarty-php/smarty/issues/1022)

changelog/972.md

@@ -0,0 +1 @@
+- Fix Smarty::assign() not returning $this when called with an array as first parameter [#972](https://github.com/smarty-php/smarty/pull/972)

changelog/979.md

@@ -0,0 +1 @@
+- Fixed missing Smarty getErrorUnassigned/setErrorUnassigned methods [#979](https://github.com/smarty-php/smarty/issues/979)

docs/img/smarty.svg

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" style="enable-background:new 0 0 1000 1000;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#F5E0B4;}
-	.st1{fill:#383535;}
-	.st2{fill:#FBDE3D;}
-	.st3{fill:#8C919F;}
-	.st4{fill:#CACED5;}
-	.st5{fill:#FFFFFF;}
-</style>
-<g>
-	<polygon class="st0" points="782.2,925.8 733.4,643.2 996.4,532.7 745.7,396.4 823.6,120.2 560.7,232.2 391.6,0 313.7,274.7    26.5,260.1 194.4,491.3 3.6,705.5 289.4,721.3 340.5,1000 529.1,787  "/>
-	<path class="st1" d="M706.9,493.4c0-126-102.2-228.2-228.2-228.2c-126,0-228.2,102.2-228.2,228.2c0,81.8,43.1,153.6,107.8,193.8   v202.6l43.5,43.5l0.2-0.2h150.6l0.2,0.2l43.5-43.5V689C662.6,649,706.9,576.4,706.9,493.4z"/>
-	<path class="st2" d="M682.2,492.9c0-112.7-91.3-204-204-204s-204,91.3-204,204c0,78,43.8,145.8,108.1,180.1v93.6h191.7V673   C638.4,638.7,682.2,571,682.2,492.9z"/>
-	<g>
-		<polygon class="st3" points="382.7,790.4 382.7,881.1 412,910.3 544.9,910.3 574.1,881.1 574.1,790.4   "/>
-		<polygon class="st4" points="540,813.2 540,866.5 527,879.5 540.4,892.9 558.7,874.6 558.9,874.6 558.9,813.2   "/>
-	</g>
-	<path class="st5" d="M478.3,310.4c-5,0-9.1,4.1-9.1,9.1c0,5,4.1,9.1,9.1,9.1c90.7,0,164.3,73.5,164.3,164.3c0,5,4.1,9.1,9.1,9.1   s9.1-4.1,9.1-9.1C660.8,392.1,579.1,310.4,478.3,310.4z"/>
-</g>
-</svg>

make-release.sh

@@ -15,7 +15,7 @@ php utilities/update-smarty-version-number.php $1
 git add changelog CHANGELOG.md src/Smarty.php
 git commit -m "version bump"
 
-git checkout master
+git checkout support/5
 git pull
 git merge --no-ff "release/$1"
 git branch -d "release/$1"

src/Compile/Tag/Section.php

@@ -99,7 +99,7 @@ class Section extends ForeachSection {
 
 		if ($compiler->tag_nocache) {
 			// push a {nocache} tag onto the stack to prevent caching of this block
-			$this->openTag($compiler, 'nocache');
+			$this->openTag('nocache');
 		}
 
 		$this->openTag($compiler, 'section', ['section', $compiler->tag_nocache]);

src/Compile/Tag/SectionClose.php

@@ -33,7 +33,7 @@ class SectionClose extends Base {
 
 		if ($nocache_pushed) {
 			// pop the pushed virtual nocache tag
-			$this->closeTag($compiler, 'nocache');
+			$this->closeTag('nocache');
 		}
 
 		$output = "<?php\n";

src/Data.php

@@ -290,7 +290,7 @@ class Data
 	 * @return bool
 	 */
 	public function hasVariable($varName): bool {
-		return !($this->getVariable($varName, true, false) instanceof UndefinedVariable);
+		return !($this->getVariable($varName) instanceof UndefinedVariable);
 	}
 
 	/**

src/Smarty.php

@@ -54,7 +54,7 @@ class Smarty extends \Smarty\TemplateBase {
 	/**
 	 * smarty version
 	 */
-	const SMARTY_VERSION = '5.3.1';
+	const SMARTY_VERSION = '5.2.0';
 
 	/**
 	 * define caching modes
@@ -2227,6 +2227,22 @@ class Smarty extends \Smarty\TemplateBase {
 	}
 
 	/**
+	 * Whether Smarty displays an error when using an unassigned variable
+	 */
+	public function getErrorUnassigned(): bool
+	{
+		return (bool) $this->error_unassigned;
+	}
+
+	/**
+	 * Set if Smarty should display an error on using an unassigned variable
+	 */
+	public function setErrorUnassigned(bool $error_unassigned): void
+	{
+		$this->error_unassigned = $error_unassigned;
+  }
+  
+  /**
 	 * Sets if Smarty should check If-Modified-Since headers to determine cache validity.
 	 * @param bool $cache_modified_check
 	 * @return void
@@ -2236,4 +2252,3 @@ class Smarty extends \Smarty\TemplateBase {
 	}
 
 }
-

tests/UnitTests/SmartyMethodsTests/GetTemplateVars/cache/.gitignore

@@ -0,0 +1,2 @@
+# Ignore anything in here, but keep this directory
+*

tests/UnitTests/SmartyMethodsTests/GetTemplateVars/templates_c/.gitignore

@@ -0,0 +1,2 @@
+# Ignore anything in here, but keep this directory
+*

tests/UnitTests/SmartyMethodsTests/TemplateVars/HasVariableTest.php

@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Tests the ::hasVariable method
- */
-class HasVariableTest extends PHPUnit_Smarty
-{
-	public function setUp(): void
-	{
-		$this->setUpSmarty(__DIR__);
-	}
-
-
-	public function testInit()
-	{
-		$this->cleanDirs();
-	}
-
-	public function testSimpleTrue()
-	{
-		$this->smarty->assign('foo', 'bar');
-		$this->assertTrue($this->smarty->hasVariable('foo'));
-	}
-
-
-	public function testSimpleFalse()
-	{
-		$this->smarty->assign('foo', 'bar');
-		$this->assertFalse($this->smarty->hasVariable('foox'));
-	}
-
-}

tests/UnitTests/TemplateSource/TagTests/Section/CompileSectionTest.php

@@ -148,10 +148,4 @@ class CompileSectionTest extends PHPUnit_Smarty
         );
     }
 
-    public function testSectionWithNocache()
-    {
-        $source = 'string:{section name=module start=0 loop=1 nocache}{/section}';
-        $this->assertEquals('', $this->smarty->fetch($source));
-    }
-
 }