eee
This commit is contained in:
+2
-2
@@ -168,7 +168,7 @@ class Container implements ContainerInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (($handler = $reflect->getConstructor()) !== null) {
|
if (($handler = $reflect->getConstructor()) !== null) {
|
||||||
$construct = $this->getMethodParams($handler);
|
$construct = $this->mergeParams($this->getMethodParams($handler), $construct);
|
||||||
}
|
}
|
||||||
|
|
||||||
$newInstance = $reflect->newInstanceArgs($construct);
|
$newInstance = $reflect->newInstanceArgs($construct);
|
||||||
@@ -211,7 +211,7 @@ class Container implements ContainerInterface
|
|||||||
throw new ReflectionException('Class ' . $reflect->getName() . ' cannot be instantiated');
|
throw new ReflectionException('Class ' . $reflect->getName() . ' cannot be instantiated');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (empty($construct) && ($handler = $reflect->getConstructor()) !== null) {
|
if (($handler = $reflect->getConstructor()) !== null) {
|
||||||
$construct = $this->getMethodParams($handler);
|
$construct = $this->getMethodParams($handler);
|
||||||
}
|
}
|
||||||
$newInstance = $reflect->newInstanceArgs($construct);
|
$newInstance = $reflect->newInstanceArgs($construct);
|
||||||
|
|||||||
Reference in New Issue
Block a user