From ce9245cb50933c832ff35c6395ed8582ca445d22 Mon Sep 17 00:00:00 2001 From: Ivan Shalganov Date: Sun, 29 Jun 2014 15:22:36 +0400 Subject: [PATCH 1/4] Update CHANGELOG.md Add 2.1 changes --- CHANGELOG.md | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e21f82..9bbb77c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,21 @@ Changelog ========= -### 2.0.1 (2013-06-09) +## 2.1.0 (2014-06-29) + +- Check variable before using in {foreach} (#83) +- Add tag {unset} (#80) +- Refactory array parser +- --Bugs +- ++Tests +- ++Docs + +### 2.0.1 (2014-06-09) - Fix string concatenation. If `~` in the end of expression Fenom generates broken template. - Fix `~=` operator. Operator was not working. -- Tests++ -- Docs++ +- ++Tests +- ++Docs ## 2.0.0 From 89d1cae918d363143aa0eed80ae0b62cff9f6799 Mon Sep 17 00:00:00 2001 From: Dmitry Krokhin Date: Mon, 30 Jun 2014 13:36:11 +0400 Subject: [PATCH 2/4] Fixed array convertion and foreach tag separator --- src/Fenom/Compiler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Fenom/Compiler.php b/src/Fenom/Compiler.php index 5fac684..e1edd38 100644 --- a/src/Fenom/Compiler.php +++ b/src/Fenom/Compiler.php @@ -144,7 +144,7 @@ class Compiler $check = '!empty('.$from.')'; } else { $scope["var"] = $scope->tpl->tmpVar(); - $prepend = $scope["var"].' = (array)('.$from.')'; + $prepend = $scope["var"].' = (array)('.$from.');'; $from = $check = $scope["var"]; } } elseif ($tokens->is('[')) { From 8024cd614a824c9616288ff41fd09bdeb842e880 Mon Sep 17 00:00:00 2001 From: Ivan Shalganov Date: Mon, 30 Jun 2014 14:14:06 +0400 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bbb77c..cd942ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Changelog ========= +### 2.1.1 (2014-06-30) + +- Fix bug #86: mismatch semicolon separator when value for foreach got from method (by nekufa) + ## 2.1.0 (2014-06-29) - Check variable before using in {foreach} (#83) From 7422aef4dec5f7f671f59d84989b1b773c8677a8 Mon Sep 17 00:00:00 2001 From: Ivan Shalganov Date: Thu, 3 Jul 2014 12:23:20 +0400 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd942ee..d187a8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ Changelog ========= +### 2.1.2 (2014-07-03) + +- Add test for bug #86 +- Fix bug #90 +- --Bugs +- ++Tests + ### 2.1.1 (2014-06-30) - Fix bug #86: mismatch semicolon separator when value for foreach got from method (by nekufa)