namespace Symfony\Component\DependencyInjection\Dumper;
+use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Parameter;
-use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Alias;
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Parameter;
+use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\ExpressionLanguage\Expression;
/**
/**
* Dumps the service container as an XML string.
*
- * @param array $options An array of options
- *
* @return string An xml string representing of the service container
*/
public function dump(array $options = array())
return $this->container->resolveEnvPlaceholders($xml);
}
- /**
- * Adds parameters.
- *
- * @param \DOMElement $parent
- */
private function addParameters(\DOMElement $parent)
{
$data = $this->container->getParameterBag()->all();
return;
}
- if ($this->container->isFrozen()) {
+ if ($this->container->isCompiled()) {
$data = $this->escape($data);
}
$this->convertParameters($data, 'parameter', $parameters);
}
- /**
- * Adds method calls.
- *
- * @param array $methodcalls
- * @param \DOMElement $parent
- */
private function addMethodCalls(array $methodcalls, \DOMElement $parent)
{
foreach ($methodcalls as $methodcall) {
$call = $this->document->createElement('call');
$call->setAttribute('method', $methodcall[0]);
- if (count($methodcall[1])) {
+ if (\count($methodcall[1])) {
$this->convertParameters($methodcall[1], 'argument', $call);
}
$parent->appendChild($call);
if (!$definition->isShared()) {
$service->setAttribute('shared', 'false');
}
- if (!$definition->isPublic()) {
- $service->setAttribute('public', 'false');
+ if (!$definition->isPrivate()) {
+ $service->setAttribute('public', $definition->isPublic() ? 'true' : 'false');
}
if ($definition->isSynthetic()) {
$service->setAttribute('synthetic', 'true');
if ($callable = $definition->getFactory()) {
$factory = $this->document->createElement('factory');
- if (is_array($callable) && $callable[0] instanceof Definition) {
+ if (\is_array($callable) && $callable[0] instanceof Definition) {
$this->addService($callable[0], null, $factory);
$factory->setAttribute('method', $callable[1]);
- } elseif (is_array($callable)) {
- $factory->setAttribute($callable[0] instanceof Reference ? 'service' : 'class', $callable[0]);
+ } elseif (\is_array($callable)) {
+ if (null !== $callable[0]) {
+ $factory->setAttribute($callable[0] instanceof Reference ? 'service' : 'class', $callable[0]);
+ }
$factory->setAttribute('method', $callable[1]);
} else {
$factory->setAttribute('function', $callable);
$service->setAttribute('autowire', 'true');
}
- foreach ($definition->getAutowiringTypes() as $autowiringTypeValue) {
+ foreach ($definition->getAutowiringTypes(false) as $autowiringTypeValue) {
$autowiringType = $this->document->createElement('autowiring-type');
$autowiringType->appendChild($this->document->createTextNode($autowiringTypeValue));
$service->appendChild($autowiringType);
}
+ if ($definition->isAutoconfigured()) {
+ $service->setAttribute('autoconfigure', 'true');
+ }
+
if ($definition->isAbstract()) {
$service->setAttribute('abstract', 'true');
}
if ($callable = $definition->getConfigurator()) {
$configurator = $this->document->createElement('configurator');
- if (is_array($callable) && $callable[0] instanceof Definition) {
+ if (\is_array($callable) && $callable[0] instanceof Definition) {
$this->addService($callable[0], null, $configurator);
$configurator->setAttribute('method', $callable[1]);
- } elseif (is_array($callable)) {
+ } elseif (\is_array($callable)) {
$configurator->setAttribute($callable[0] instanceof Reference ? 'service' : 'class', $callable[0]);
$configurator->setAttribute('method', $callable[1]);
} else {
$service = $this->document->createElement('service');
$service->setAttribute('id', $alias);
$service->setAttribute('alias', $id);
- if (!$id->isPublic()) {
- $service->setAttribute('public', 'false');
+ if (!$id->isPrivate()) {
+ $service->setAttribute('public', $id->isPublic() ? 'true' : 'false');
}
$parent->appendChild($service);
}
- /**
- * Adds services.
- *
- * @param \DOMElement $parent
- */
private function addServices(\DOMElement $parent)
{
$definitions = $this->container->getDefinitions();
*/
private function convertParameters(array $parameters, $type, \DOMElement $parent, $keyAttribute = 'key')
{
- $withKeys = array_keys($parameters) !== range(0, count($parameters) - 1);
+ $withKeys = array_keys($parameters) !== range(0, \count($parameters) - 1);
foreach ($parameters as $key => $value) {
$element = $this->document->createElement($type);
if ($withKeys) {
$element->setAttribute($keyAttribute, $key);
}
- if (is_array($value)) {
+ if ($value instanceof ServiceClosureArgument) {
+ $value = $value->getValues()[0];
+ }
+ if (\is_array($value)) {
$element->setAttribute('type', 'collection');
$this->convertParameters($value, $type, $element, 'key');
+ } elseif ($value instanceof TaggedIteratorArgument) {
+ $element->setAttribute('type', 'tagged');
+ $element->setAttribute('tag', $value->getTag());
+ } elseif ($value instanceof IteratorArgument) {
+ $element->setAttribute('type', 'iterator');
+ $this->convertParameters($value->getValues(), $type, $element, 'key');
} elseif ($value instanceof Reference) {
$element->setAttribute('type', 'service');
$element->setAttribute('id', (string) $value);
$behaviour = $value->getInvalidBehavior();
- if ($behaviour == ContainerInterface::NULL_ON_INVALID_REFERENCE) {
+ if (ContainerInterface::NULL_ON_INVALID_REFERENCE == $behaviour) {
$element->setAttribute('on-invalid', 'null');
- } elseif ($behaviour == ContainerInterface::IGNORE_ON_INVALID_REFERENCE) {
+ } elseif (ContainerInterface::IGNORE_ON_INVALID_REFERENCE == $behaviour) {
$element->setAttribute('on-invalid', 'ignore');
+ } elseif (ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE == $behaviour) {
+ $element->setAttribute('on-invalid', 'ignore_uninitialized');
}
} elseif ($value instanceof Definition) {
$element->setAttribute('type', 'service');
$text = $this->document->createTextNode(self::phpToXml((string) $value));
$element->appendChild($text);
} else {
- if (in_array($value, array('null', 'true', 'false'), true)) {
+ if (\in_array($value, array('null', 'true', 'false'), true)) {
$element->setAttribute('type', 'string');
}
$text = $this->document->createTextNode(self::phpToXml($value));
/**
* Escapes arguments.
*
- * @param array $arguments
- *
* @return array
*/
private function escape(array $arguments)
{
$args = array();
foreach ($arguments as $k => $v) {
- if (is_array($v)) {
+ if (\is_array($v)) {
$args[$k] = $this->escape($v);
- } elseif (is_string($v)) {
+ } elseif (\is_string($v)) {
$args[$k] = str_replace('%', '%%', $v);
} else {
$args[$k] = $v;
return 'false';
case $value instanceof Parameter:
return '%'.$value.'%';
- case is_object($value) || is_resource($value):
+ case \is_object($value) || \is_resource($value):
throw new RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
default:
return (string) $value;