diff --git a/composer.json b/composer.json index 889cb944..9a5e7fd6 100644 --- a/composer.json +++ b/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" } } diff --git a/libs/sysplugins/smarty_internal_parsetree_template.php b/libs/sysplugins/smarty_internal_parsetree_template.php index 477232ef..ab4c3ec3 100644 --- a/libs/sysplugins/smarty_internal_parsetree_template.php +++ b/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; } diff --git a/tests/UnitTests/TemplateSource/TagTests/Foreach/CompileForeachTest.php b/tests/UnitTests/TemplateSource/TagTests/Foreach/CompileForeachTest.php index ac186b58..78a5214f 100644 --- a/tests/UnitTests/TemplateSource/TagTests/Foreach/CompileForeachTest.php +++ b/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 ++), ); } diff --git a/tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/PhpFunctionTest.php b/tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/PhpFunctionTest.php index 8f13e315..7534e024 100644 --- a/tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/PhpFunctionTest.php +++ b/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; } -} \ No newline at end of file +}