Disabled nightly testing because phpunit doesn't support php8 yet.

.travis.yml

@@ -1,4 +1,3 @@
-
 language: php
 
 sudo: false
@@ -7,12 +6,17 @@ dist: trusty
 
 matrix:
   include:
+   - php: 5.3 # Composer requires PHP 5.3.2+ to run, so we cannot test below 5.3
+     dist: precise # PHP 5.3 is supported only on Precise.
+   - php: 5.4
+   - php: 5.5
+   - php: 5.6
    - php: 7.0
    - php: 7.1
    - php: 7.2
    - php: 7.3
    - php: 7.4
-   - php: nightly
+#   - php: nightly # PHP nightly build testing disabled because PHPUnit doesn't support PHP8 yet.
   fast_finish: true
   allow_failures:
    - php: nightly

CHANGELOG.md

@@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- Travis unit tests now run for all php versions >= 5.3
+
+### Fixed
+- PHP5.3 compatability fixes
+
+## [3.1.36] - 2020-04-14
+
+### Fixed
+ - Smarty::SMARTY_VERSION wasn't updated in v3.1.35 https://github.com/smarty-php/smarty/issues/584
+
 ## [3.1.35] - 2020-04-14
  - remove whitespaces after comments https://github.com/smarty-php/smarty/issues/447
  - fix foreachelse on arrayiterators https://github.com/smarty-php/smarty/issues/506

composer.json

@@ -40,7 +40,7 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "6.4.1",
+        "phpunit/phpunit": "6.4.1 || ^5.7 || ^4.8",
         "smarty/smarty-lexer": "^3.1"
     }
 }

libs/Smarty.class.php

@@ -112,7 +112,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.34-dev-7';
+    const SMARTY_VERSION = '3.1.36';
     /**
      * define variable scopes
      */
@@ -800,7 +800,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @param mixed $index    index of directory to get, null to get all
      * @param bool  $isConfig true for config_dir
      *
-     * @return array list of template directories, or directory of $index
+     * @return array|string list of template directories, or directory of $index
      */
     public function getTemplateDir($index = null, $isConfig = false)
     {

libs/sysplugins/smarty_internal_parsetree_template.php

@@ -127,12 +127,12 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
     }
 
     private function getChunkedSubtrees() {
-    	$chunks = [];
+    	$chunks = array();
     	$currentMode = null;
-    	$currentChunk = [];
+    	$currentChunk = array();
 	    for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
 
-	    	if ($this->subtrees[ $key ]->data === '' && in_array($currentMode, ['textstripped', 'text', 'tag'])) {
+	    	if ($this->subtrees[ $key ]->data === '' && in_array($currentMode, array('textstripped', 'text', 'tag'))) {
 	    		continue;
 	    	}
 
@@ -150,19 +150,19 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
 		    if ($newMode == $currentMode) {
 			    $currentChunk[] = $this->subtrees[ $key ];
 		    } else {
-		    	$chunks[] = [
+		    	$chunks[] = array(
 		    		'mode' => $currentMode,
 				    'subtrees' => $currentChunk
-			    ];
+			    );
 		    	$currentMode = $newMode;
-			    $currentChunk = [$this->subtrees[ $key ]];
+			    $currentChunk = array($this->subtrees[ $key ]);
 		    }
 	    }
 	    if ($currentMode && $currentChunk) {
-		    $chunks[] = [
+		    $chunks[] = array(
 			    'mode' => $currentMode,
 			    'subtrees' => $currentChunk
-		    ];
+		    );
 	    }
 		return $chunks;
     }

make-release.sh

@@ -4,8 +4,9 @@ printf 'Creating release %s\n' "$1"
 
 git checkout -b "release/$1"
 sed -i "s/## \\[Unreleased\\]/## \\[Unreleased\\]\\n\\n## \\[$1\\] - $(date +%Y-%m-%d)/" CHANGELOG.md
+sed -i "s/const SMARTY_VERSION = '[^']\+';/const SMARTY_VERSION = '$1';/" libs/Smarty.class.php
 
-git add CHANGELOG.md
+git add CHANGELOG.md libs/Smarty.class.php
 git commit -m "version bump"
 
 git checkout master

tests/UnitTests/TemplateSource/TagTests/Foreach/CompileForeachTest.php

@@ -95,7 +95,7 @@ class CompileForeachTest extends PHPUnit_Smarty
             array('{foreach $foo x y foo}{$y}.{$x},{foreachelse}else{/foreach}total{$smarty.foreach.foo.total}', array(9,10,11), '0.9,1.10,2.11,total3', '', $i ++),
             array('{$x = "hallo"}{$bar=[1,2,3]}{foreach $foo as $x}outer={$x@index}.{$x}#{foreach $bar as $x}inner={$x@index}.{$x}{/foreach}##{/foreach}###{$x}', array(9,10,11), 'outer=0.9#inner=0.1inner=1.2inner=2.3##outer=1.10#inner=0.1inner=1.2inner=2.3##outer=2.11#inner=0.1inner=1.2inner=2.3#####hallo', '', $i ++),
 	        array('{foreach $foo as $x}{$x}{foreachelse}else{/foreach}', null, 'else', '', $i ++),
-	        array('{foreach $foo as $x}{$x}{foreachelse}else{/foreach}', [], 'else', '', $i ++),
+	        array('{foreach $foo as $x}{$x}{foreachelse}else{/foreach}', array(), 'else', '', $i ++),
 	        array('{foreach $foo as $x}{$x}{foreachelse}else{/foreach}', new \ArrayIterator(), 'else', '', $i ++),
         );
     }

tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/PhpFunctionTest.php

@@ -57,7 +57,7 @@ class PhpFunctionTest extends PHPUnit_Smarty
     public function testEmpty2()
     {
         if (version_compare(phpversion(), '5.5', '<')) {
-            $this->markTestSkipped('runs only on PHP > 5.5');
+            $this->markTestSkipped('runs only on PHP >= 5.5');
         }
 
         $this->smarty->disableSecurity();
@@ -82,7 +82,7 @@ class PhpFunctionTest extends PHPUnit_Smarty
     public function testEmpty3()
     {
         if (version_compare(phpversion(), '5.5', '<')) {
-            $this->markTestSkipped('runs only on PHP > 5.5');
+            $this->markTestSkipped('runs only on PHP >= 5.5');
         }
         $this->smarty->disableSecurity();
         $this->smarty->assign('var', array(true,
@@ -104,7 +104,7 @@ class PhpFunctionTest extends PHPUnit_Smarty
     public function testEmpty4()
     {
         if (version_compare(phpversion(), '5.5', '<')) {
-        $this->markTestSkipped('runs only on PHP > 5.5');
+        $this->markTestSkipped('runs only on PHP >= 5.5');
         }
 
         $this->smarty->disableSecurity();
@@ -168,11 +168,11 @@ class PhpFunctionTest extends PHPUnit_Smarty
 		$this->smarty->disableSecurity();
 
 		$this->smarty->assign('varobject', new TestIsset());
-		$this->smarty->assign('vararray', $vararray = [
+		$this->smarty->assign('vararray', $vararray = array(
 			'keythatexists' => false,
-			'keywitharray' => [1 => 1],
-			'keywithobject' => new TestIsset()]
-		);
+			'keywitharray' => array(1 => 1),
+			'keywithobject' => new TestIsset()
+		));
 
 		$this->smarty->assign('key', 'A');
 		$this->smarty->assign('_varsimpleA', 1);
@@ -234,4 +234,4 @@ class TestIsset {
     public function pass($v) {
         return $v;
     }
-}
+}