[DependencyInjection] inline conditional statements.
This commit is contained in:
parent
eb750be851
commit
b7b7c5433a
@ -1009,11 +1009,7 @@ EOF;
|
|||||||
private function addAliases()
|
private function addAliases()
|
||||||
{
|
{
|
||||||
if (!$aliases = $this->container->getAliases()) {
|
if (!$aliases = $this->container->getAliases()) {
|
||||||
if ($this->container->isFrozen()) {
|
return $this->container->isFrozen() ? "\n \$this->aliases = array();\n" : '';
|
||||||
return "\n \$this->aliases = array();\n";
|
|
||||||
} else {
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$code = " \$this->aliases = array(\n";
|
$code = " \$this->aliases = array(\n";
|
||||||
@ -1382,9 +1378,9 @@ EOF;
|
|||||||
$service = $this->dumpValue($value->getFactoryService(false));
|
$service = $this->dumpValue($value->getFactoryService(false));
|
||||||
|
|
||||||
return sprintf('%s->%s(%s)', 0 === strpos($service, '$') ? sprintf('$this->get(%s)', $service) : $this->getServiceCall($value->getFactoryService(false)), $value->getFactoryMethod(false), implode(', ', $arguments));
|
return sprintf('%s->%s(%s)', 0 === strpos($service, '$') ? sprintf('$this->get(%s)', $service) : $this->getServiceCall($value->getFactoryService(false)), $value->getFactoryMethod(false), implode(', ', $arguments));
|
||||||
} else {
|
|
||||||
throw new RuntimeException('Cannot dump definitions which have factory method without factory service or factory class.');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
throw new RuntimeException('Cannot dump definitions which have factory method without factory service or factory class.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$class = $value->getClass();
|
$class = $value->getClass();
|
||||||
@ -1422,9 +1418,9 @@ EOF;
|
|||||||
}
|
}
|
||||||
} elseif (is_object($value) || is_resource($value)) {
|
} elseif (is_object($value) || is_resource($value)) {
|
||||||
throw new RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
|
throw new RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
|
||||||
} else {
|
|
||||||
return $this->export($value);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return $this->export($value);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1493,13 +1489,13 @@ EOF;
|
|||||||
|
|
||||||
if (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior()) {
|
if (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior()) {
|
||||||
return sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id);
|
return sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id);
|
||||||
} else {
|
|
||||||
if ($this->container->hasAlias($id)) {
|
|
||||||
$id = (string) $this->container->getAlias($id);
|
|
||||||
}
|
|
||||||
|
|
||||||
return sprintf('$this->get(\'%s\')', $id);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($this->container->hasAlias($id)) {
|
||||||
|
$id = (string) $this->container->getAlias($id);
|
||||||
|
}
|
||||||
|
|
||||||
|
return sprintf('$this->get(\'%s\')', $id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user