ServiceDefinition: does deep clone

Author: dg

src/DI/Compiler.php

@@ -273,7 +273,7 @@ public static function parseServices(ContainerBuilder $builder, array $config, $
 				$builder->removeDefinition($name);
 				$definition = $builder->addDefinition(
 					$name,
-					$parent === Config\Helpers::OVERWRITE ? NULL : unserialize(serialize($builder->getDefinition($parent))) // deep clone
+					$parent === Config\Helpers::OVERWRITE ? NULL : clone $builder->getDefinition($parent)
 				);
 			} elseif ($builder->hasDefinition($name)) {
 				$definition = $builder->getDefinition($name);

src/DI/ServiceDefinition.php

@@ -302,4 +302,11 @@ public function getInject()
 		return $this->getTag(Extensions\InjectExtension::TAG_INJECT);
 	}
 
+
+	public function __clone()
+	{
+		$this->factory = unserialize(serialize($this->factory));
+		$this->setup = unserialize(serialize($this->setup));
+	}
+
 }

tests/DI/ServiceDefinition.phpt

@@ -94,3 +94,15 @@ test(function () {
 	Assert::equal([1, 2], $def->getTag('tag2'));
 	Assert::equal(NULL, $def->getTag('tag3'));
 });
+
+test(function () { // deep clone
+	$def = new ServiceDefinition;
+	$def->setFactory(new Statement('Class', [1, 2]));
+	$def->addSetup(new Statement('Class', [1, 2]));
+
+	$dolly = clone $def;
+	Assert::notSame($dolly->getFactory(), $def->getFactory());
+	Assert::equal($dolly->getFactory(), $def->getFactory());
+	Assert::notSame($dolly->getSetup(), $def->getSetup());
+	Assert::equal($dolly->getSetup(), $def->getSetup());
+});