Fix creation of new object when instance already exists

Zheness · web-flow · commit e5e6f64bfd08 · 2019-01-02T13:02:54.000+01:00
diff --git a/src/Mouf/MoufManager.php b/src/Mouf/MoufManager.php
@@ -641,7 +641,11 @@ private function instantiateComponent($instanceName) {
 							throw new MoufException("Unknown parameter type ".$constructorParameterDefinition['parametertype']." for parameter in constructor of instance '".$instanceName."'");
 					}
 				}
-				$object = $classDescriptor->newInstanceArgs($constructorParameters);
+				if (!isset($this->objectInstances[$instanceName])) {
+						$object = $classDescriptor->newInstanceArgs($constructorParameters);
+				} else {
+						$object = $this->objectInstances[$instanceName];
+				}
 			} else {
 				$object = new $className();
 			}

Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,11 @@ private function instantiateComponent($instanceName) {`
`641`	`641`	`throw new MoufException("Unknown parameter type ".$constructorParameterDefinition['parametertype']." for parameter in constructor of instance '".$instanceName."'");`
`642`	`642`	`}`
`643`	`643`	`}`
`644`		`- $object = $classDescriptor->newInstanceArgs($constructorParameters);`
	`644`	`+ if (!isset($this->objectInstances[$instanceName])) {`
	`645`	`+ $object = $classDescriptor->newInstanceArgs($constructorParameters);`
	`646`	`+ } else {`
	`647`	`+ $object = $this->objectInstances[$instanceName];`
	`648`	`+ }`
`645`	`649`	`} else {`
`646`	`650`	`$object = new $className();`
`647`	`651`	`}`