Permalink
Browse files

Merge branch 'feature/self-resolution-of-asset-manager' into develop

  • Loading branch information...
2 parents 0b766e5 + 42ffdb5 commit 4c4f01c2ca933bdda250200799cd6acdb80290f1 @trq trq committed Feb 4, 2013
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/Proem/Service/AssetManager.php
@@ -234,7 +234,7 @@ public function getDependencies($params)
foreach ($params as $param) {
$dependency = $param->getClass();
if ($dependency !== null) {
- if ($dependency->name == 'AssetManager' || $dependency->name == 'AssetManagerInterface') {
+ if ($dependency->name == 'Proem\Service\AssetManager' || $dependency->name == 'Proem\Service\AssetManagerInterface') {
$deps[] = $this;
} else {
$deps[] = $this->resolve($dependency->name);
@@ -316,7 +316,7 @@ protected function autoResolve($name, $params)
return $object;
}
} catch (\ReflectionException $e) {
- throw new \LogicException("Unable to resolve '{$name}'");
+ throw new \LogicException("Unable to resolve '{$name}'");
}
}
}

0 comments on commit 4c4f01c

Please sign in to comment.