Decoder: fixed entity value conversion in the entity chain

Author: matej21

src/Neon/Decoder.php

@@ -231,37 +231,40 @@ private function parse($indent, $result = NULL, $key = NULL, $hasKey = FALSE)
 					}
 				}
 
-			} elseif ($hasValue) { // Value
-				if ($value instanceof Entity) { // Entity chaining
-					if ($value->value !== Neon::CHAIN) {
-						$value = new Entity(Neon::CHAIN, array($value));
-					}
-					$value->attributes[] = new Entity($t);
-				} else {
-					$this->error();
-				}
 			} else { // Value
 				static $consts = array(
 					'true' => TRUE, 'True' => TRUE, 'TRUE' => TRUE, 'yes' => TRUE, 'Yes' => TRUE, 'YES' => TRUE, 'on' => TRUE, 'On' => TRUE, 'ON' => TRUE,
 					'false' => FALSE, 'False' => FALSE, 'FALSE' => FALSE, 'no' => FALSE, 'No' => FALSE, 'NO' => FALSE, 'off' => FALSE, 'Off' => FALSE, 'OFF' => FALSE,
 					'null' => 0, 'Null' => 0, 'NULL' => 0,
 				);
 				if ($t[0] === '"') {
-					$value = preg_replace_callback('#\\\\(?:ud[89ab][0-9a-f]{2}\\\\ud[c-f][0-9a-f]{2}|u[0-9a-f]{4}|x[0-9a-f]{2}|.)#i', array($this, 'cbString'), substr($t, 1, -1));
+					$converted = preg_replace_callback('#\\\\(?:ud[89ab][0-9a-f]{2}\\\\ud[c-f][0-9a-f]{2}|u[0-9a-f]{4}|x[0-9a-f]{2}|.)#i', array($this, 'cbString'), substr($t, 1, -1));
 				} elseif ($t[0] === "'") {
-					$value = substr($t, 1, -1);
+					$converted = substr($t, 1, -1);
 				} elseif (isset($consts[$t]) && (!isset($tokens[$n + 1][0]) || ($tokens[$n + 1][0] !== ':' && $tokens[$n + 1][0] !== '='))) {
-					$value = $consts[$t] === 0 ? NULL : $consts[$t];
+					$converted = $consts[$t] === 0 ? NULL : $consts[$t];
 				} elseif (is_numeric($t)) {
-					$value = $t * 1;
+					$converted = $t * 1;
 				} elseif (preg_match('#0x[0-9a-fA-F]+\z#A', $t)) {
-					$value = hexdec($t);
+					$converted = hexdec($t);
 				} elseif (preg_match('#\d\d\d\d-\d\d?-\d\d?(?:(?:[Tt]| +)\d\d?:\d\d:\d\d(?:\.\d*)? *(?:Z|[-+]\d\d?(?::\d\d)?)?)?\z#A', $t)) {
-					$value = new \DateTime($t);
+					$converted = new \DateTime($t);
 				} else { // literal
-					$value = $t;
+					$converted = $t;
+				}
+				if ($hasValue) {
+					if ($value instanceof Entity) { // Entity chaining
+						if ($value->value !== Neon::CHAIN) {
+							$value = new Entity(Neon::CHAIN, array($value));
+						}
+						$value->attributes[] = new Entity($converted);
+					} else {
+						$this->error();
+					}
+				} else {
+					$value = $converted;
+					$hasValue = TRUE;
 				}
-				$hasValue = TRUE;
 			}
 		}
 

tests/Neon/Decoder.inline.array.phpt

@@ -95,3 +95,11 @@ Assert::equal(
 	)),
 	Neon::decode('first(a, b)second(1, 2)')
 );
+
+Assert::equal(
+	new Entity(Neon::CHAIN, array(
+		new Entity(1, array()),
+		new Entity(2, array()),
+	)),
+	Neon::decode('1() 2()')
+);