NeonAdapter: fixed dump() for data with simple Nette\DI\Statement

Fixed support for chained entities

Like:
- ent(1)
- ent(3)::inner(5)

Author: sallyx

src/DI/Config/Adapters/NeonAdapter.php

@@ -91,7 +91,43 @@ public function dump(array $data)
 			}
 			$tmp[$name] = $secData;
 		}
+		array_walk_recursive(
+			$tmp,
+			function (& $val) {
+				if ($val instanceof Statement) {
+					$val = self::statementToEntity($val);
+				}
+			}
+		);
+
 		return "# generated by Nette\n\n" . Neon\Neon::encode($tmp, Neon\Neon::BLOCK);
 	}
 
+
+	/**
+	 * @return Neon\Entity
+	 */
+	private static function statementToEntity(Statement $val)
+	{
+		array_walk_recursive(
+			$val->arguments,
+			function (& $val) {
+				if ($val instanceof Statement) {
+					$val = self::statementToEntity($val);
+				}
+			}
+		);
+		if (is_array($val->entity) && $val->entity[0] instanceof Statement) {
+			return new Neon\Entity(
+				Neon\Neon::CHAIN,
+				[
+					self::statementToEntity($val->entity[0]),
+					new Neon\Entity('::' . $val->entity[1], $val->arguments)
+				]
+			);
+		} else {
+			return new Neon\Entity($val->entity, $val->arguments);
+		}
+	}
+
 }

tests/DI/NeonAdapter.phpt

@@ -134,3 +134,76 @@ Assert::equal([
 		[5]
 	),
 ], $data);
+
+
+$data = $config->load('files/neonAdapter.entity.neon');
+$config->save($data, TEMP_FILE);
+Assert::match(<<<EOD
+# generated by Nette
+
+- ent(1)
+- ent(2)::inner(3, 4)
+- ent(3)::inner(5)
+EOD
+, file_get_contents(TEMP_FILE));
+
+
+$data = $config->load('files/neonAdapter.save.neon');
+$config->save($data, TEMP_FILE);
+Assert::match(<<<'EOD'
+# generated by Nette
+
+parameters:
+	class: Ipsum
+
+services:
+	referencedService: @one
+	referencedServiceWithSetup:
+		factory: @one
+		setup:
+			- $x(10)
+
+	serviceAsParam: Ipsum(@one)
+	calledService: @one()
+	calledServiceWithArgs: @one(1)
+	calledServiceAsParam: Ipsum(@one())
+	calledServiceWithArgsAsParam: Ipsum(@one(1))
+	one:
+		class: %class%
+		arguments:
+			- 1
+
+	two:
+		class: %class%(1)
+
+	three:
+		class: Lorem
+		create: Factory::createLorem
+		arguments:
+			- 1
+
+	four:
+		create: Factory::createLorem(1)
+
+	five:
+		create: [Factory, createLorem](1)
+
+	six: Factory::createLorem(1)
+	seven: @factory
+	eight: @factory()
+	nine:
+		- @three
+		- foo
+
+	stdClass: stdClass
+	factory: Lorem
+	rich1: Lorem(1)::foo()
+	rich2:
+		create: Lorem(Ipsum(@one))::foo(1)
+
+	rich3: Factory::createLorem(1)::foo()
+	rich4: Factory()::createLorem(1)::foo()
+	0: Lorem(1)::foo()
+
+EOD
+, file_get_contents(TEMP_FILE));

tests/DI/files/neonAdapter.save.neon

@@ -0,0 +1,57 @@
+parameters:
+	class: Ipsum
+
+services:
+	referencedService: @one
+
+	referencedServiceWithSetup:
+		factory: @one
+		setup:
+			- $x(10)
+
+	serviceAsParam: Ipsum(@one)
+	calledService: @one()
+	calledServiceWithArgs: @one(1)
+	calledServiceAsParam: Ipsum(@one())
+	calledServiceWithArgsAsParam: Ipsum(@one(1))
+
+	one:
+		class: %class%
+		arguments: [1]
+
+	two:
+		class: %class%(1)
+
+	three:
+		class: Lorem
+		create: Factory::createLorem
+		arguments: [1]
+
+	four:
+		create: Factory::createLorem(1)
+
+	five:
+		create: [Factory, createLorem](1)
+
+	six: Factory::createLorem(1)
+
+	seven: @factory
+
+	eight: @factory()
+
+	nine: [@three, foo]
+
+	stdClass: stdClass
+
+	factory: Lorem
+
+	rich1: Lorem(1)::foo
+
+	rich2:
+		create: Lorem(Ipsum(@one))::foo(1)
+
+	rich3: Factory::createLorem(1)::foo
+
+	rich4: Factory()::createLorem(1)::foo
+
+	- Lorem(1)::foo