Fix RedefineMacro when no blocks are defined

nextras · Jul 6, 2016 · 38366b7 · 38366b7
1 parent 0b78f7c
commit 38366b7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/RedefineMacro.php b/src/RedefineMacro.php
@@ -44,8 +44,16 @@ public function finalize()
 
 		list($prolog) = parent::finalize();
 
-		foreach ($compiler->getProperties()['blocks'] as $key => $val) { $blocks[$key] = $val; }
-		foreach ($compiler->getProperties()['blockTypes'] as $key => $val) { $blockTypes[$key] = $val; }
+		if (isset($compiler->getProperties()['blocks'])) {
+			foreach ($compiler->getProperties()['blocks'] as $key => $val) {
+				$blocks[$key] = $val;
+			}
+		}
+		if (isset($compiler->getProperties()['blockTypes'])) {
+			foreach ($compiler->getProperties()['blockTypes'] as $key => $val) {
+				$blockTypes[$key] = $val;
+			}
+		}
 		$compiler->addProperty('blocks', $blocks);
 		$compiler->addProperty('blockTypes', $blockTypes);
 

diff --git a/tests/RedefineMacroTests.phpt b/tests/RedefineMacroTests.phpt
@@ -27,3 +27,4 @@ Assert::same('import.latte', render('case1/main.latte'));
 Assert::same('main.latte', render('case2/main.latte'));
 Assert::same('import.latte', render('case3/main.latte'));
 Assert::same('import.latte', render('case4/main.latte'));
+Assert::same('No blocks', render('case5/main.latte'));
diff --git a/tests/case5/main.latte b/tests/case5/main.latte
@@ -0,0 +1 @@
+No blocks