|
@@ -453,14 +453,17 @@ EOF;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- if ($this->container->hasDefinition($id) || $this->container->hasAlias($id))
|
|
|
+ if ($this->container->hasAlias($id))
|
|
|
{
|
|
|
- return sprintf('$this->get%sService()', Container::camelize($id));
|
|
|
+ $id = $this->container->getAlias($id);
|
|
|
}
|
|
|
- else
|
|
|
+
|
|
|
+ if ($this->container->hasDefinition($id))
|
|
|
{
|
|
|
- return sprintf('$this->getService(\'%s\')', $id);
|
|
|
+ return sprintf('$this->get%sService()', Container::camelize($id));
|
|
|
}
|
|
|
+
|
|
|
+ return sprintf('$this->getService(\'%s\')', $id);
|
|
|
}
|
|
|
}
|
|
|
}
|