Neon, Decoder: added option $associativeAsObjects [Closes #34]

readme.md

@@ -48,13 +48,14 @@ $neon = Neon::encode($value); // Returns $value converted to NEON
 $neon = Neon::encode($value, true); // Returns $value converted to multiline NEON
 ```
 
-`Neon::decode()` converts given NEON to PHP value:
+`Neon::decode()` converts given NEON to PHP value. As the second parameter `$associativeAsObjects` you can pass true, which will return objects instead of associative arrays.
 
 ```php
 $value = Neon::decode('hello: world'); // Returns an array ['hello' => 'world']
+$value = Neon::decode('hello: world', true); // Returns an object {'hello': 'world'}
 ```
 
-`Neon::decodeFile()` converts given NEON file to PHP value:
+`Neon::decodeFile()` converts given NEON file to PHP value. It has also parameter `$associativeAsObjects`.
 
 ```php
 $value = Neon::decodeFile('config.neon');

src/Neon/Decoder.php

@@ -16,13 +16,25 @@
  */
 final class Decoder
 {
+	public $associativeAsObjects = false;
+
+
 	/**
 	 * Decodes a NEON string.
 	 * @return mixed
 	 */
 	public function decode(string $input)
 	{
 		$node = $this->parseToNode($input);
+		if ($this->associativeAsObjects) {
+			$evaluator = function (Node $node) use (&$evaluator) {
+				$value = $node->toValue($evaluator);
+				return $node instanceof Node\ArrayNode && $value && array_keys($value) !== range(0, count($value) - 1)
+					? (object) $value
+					: $value;
+			};
+			return $evaluator($node);
+		}
 		return $node->toValue();
 	}
 

src/Neon/Neon.php

@@ -37,9 +37,10 @@ public static function encode($value, bool $blockMode = false, string $indentati
 	 * Converts given NEON to PHP value.
 	 * @return mixed
 	 */
-	public static function decode(string $input)
+	public static function decode(string $input, bool $associativeAsObjects = false)
 	{
 		$decoder = new Decoder;
+		$decoder->associativeAsObjects = $associativeAsObjects;
 		return $decoder->decode($input);
 	}
 
@@ -48,7 +49,7 @@ public static function decode(string $input)
 	 * Converts given NEON file to PHP value.
 	 * @return mixed
 	 */
-	public static function decodeFile(string $file)
+	public static function decodeFile(string $file, bool $associativeAsObjects = false)
 	{
 		if (!is_file($file)) {
 			throw new Exception("File '$file' does not exist.");
@@ -59,6 +60,6 @@ public static function decodeFile(string $file)
 			$input = substr($input, 3);
 		}
 
-		return self::decode($input);
+		return self::decode($input, $associativeAsObjects);
 	}
 }

tests/Neon/Decoder.associativeAsObjects.phpt

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\Neon\Neon;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+Assert::equal((object) [
+	'a' => [1, 2, 3],
+	'b' => [],
+	'c' => (object) [
+		'a' => 1,
+		0 => 2,
+		1 => 3,
+	],
+], Neon::decode('
+a: {1, 2, 3}
+b: []
+c: [a: 1, 2, 3]', true));