Decoder: array-after-key syntax allows only array, not scalars [BC br…

…eak]
nette · Nov 8, 2014 · 8d7f720 · 8d7f720
1 parent fdf47ea
commit 8d7f720
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Neon/Decoder.php b/src/Neon/Decoder.php
@@ -223,7 +223,7 @@ private function parse($indent, $result = NULL, $key = NULL, $hasKey = FALSE)
 
 						} elseif ($hasKey) {
 							$this->addValue($result, $key, $hasValue ? $value : NULL);
-							if ($key !== NULL && !$hasValue && $newIndent === $indent) {
+							if ($key !== NULL && !$hasValue && $newIndent === $indent && isset($tokens[$n + 1]) && $tokens[$n + 1][0] === '-') {
 								$result = & $result[$key];
 							}
 							$hasKey = $hasValue = FALSE;

diff --git a/tests/Neon/Decoder.errors.phpt b/tests/Neon/Decoder.errors.phpt
@@ -90,3 +90,11 @@ Assert::exception(function() {
 Assert::exception(function() {
 	Neon::decode('- x: y:');
 }, 'Nette\Neon\Exception', "Unexpected ':' on line 1, column 7." );
+
+
+Assert::exception(function () {
+	Neon::decode('
+foo:
+bar
+');
+}, 'Nette\Neon\Exception', "Unexpected '<new line>' on line 3, column 4.");