Skip to content

Commit

Permalink
[DependencyInjection] changed the default YAML indentation to 4 space…
Browse files Browse the repository at this point in the history
…s instead of 2
  • Loading branch information
fabpot committed Sep 23, 2011
1 parent e5294fe commit 98abc8e
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 51 deletions.
28 changes: 14 additions & 14 deletions src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
Expand Up @@ -48,9 +48,9 @@ public function dump(array $options = array())
*/
private function addService($id, $definition)
{
$code = " $id:\n";
$code = " $id:\n";
if ($definition->getClass()) {
$code .= sprintf(" class: %s\n", $definition->getClass());
$code .= sprintf(" class: %s\n", $definition->getClass());
}

$tagsCode = '';
Expand All @@ -62,39 +62,39 @@ private function addService($id, $definition)
}
$att = $att ? ', '.implode(' ', $att) : '';

$tagsCode .= sprintf(" - { name: %s%s }\n", Yaml::dump($name), $att);
$tagsCode .= sprintf(" - { name: %s%s }\n", Yaml::dump($name), $att);
}
}
if ($tagsCode) {
$code .= " tags:\n".$tagsCode;
$code .= " tags:\n".$tagsCode;
}

if ($definition->getFile()) {
$code .= sprintf(" file: %s\n", $definition->getFile());
$code .= sprintf(" file: %s\n", $definition->getFile());
}

if ($definition->getFactoryMethod()) {
$code .= sprintf(" factory_method: %s\n", $definition->getFactoryMethod());
$code .= sprintf(" factory_method: %s\n", $definition->getFactoryMethod());
}

if ($definition->getFactoryService()) {
$code .= sprintf(" factory_service: %s\n", $definition->getFactoryService());
$code .= sprintf(" factory_service: %s\n", $definition->getFactoryService());
}

if ($definition->getArguments()) {
$code .= sprintf(" arguments: %s\n", Yaml::dump($this->dumpValue($definition->getArguments()), 0));
$code .= sprintf(" arguments: %s\n", Yaml::dump($this->dumpValue($definition->getArguments()), 0));
}

if ($definition->getProperties()) {
$code .= sprintf(" properties: %s\n", Yaml::dump($this->dumpValue($definition->getProperties()), 0));
$code .= sprintf(" properties: %s\n", Yaml::dump($this->dumpValue($definition->getProperties()), 0));
}

if ($definition->getMethodCalls()) {
$code .= sprintf(" calls:\n %s\n", str_replace("\n", "\n ", Yaml::dump($this->dumpValue($definition->getMethodCalls()), 1)));
$code .= sprintf(" calls:\n %s\n", str_replace("\n", "\n ", Yaml::dump($this->dumpValue($definition->getMethodCalls()), 1)));
}

if (ContainerInterface::SCOPE_CONTAINER !== $scope = $definition->getScope()) {
$code .= sprintf(" scope: %s\n", $scope);
$code .= sprintf(" scope: %s\n", $scope);
}

if ($callable = $definition->getConfigurator()) {
Expand All @@ -106,7 +106,7 @@ private function addService($id, $definition)
}
}

$code .= sprintf(" configurator: %s\n", Yaml::dump($callable, 0));
$code .= sprintf(" configurator: %s\n", Yaml::dump($callable, 0));
}

return $code;
Expand All @@ -122,9 +122,9 @@ private function addService($id, $definition)
private function addServiceAlias($alias, $id)
{
if ($id->isPublic()) {
return sprintf(" %s: @%s\n", $alias, $id);
return sprintf(" %s: @%s\n", $alias, $id);
} else {
return sprintf(" %s:\n alias: %s\n public: false", $alias, $id);
return sprintf(" %s:\n alias: %s\n public: false", $alias, $id);
}
}

Expand Down
Expand Up @@ -4,40 +4,40 @@ parameters:
foo: bar

services:
foo:
class: FooClass
tags:
- { name: foo, foo: foo }
- { name: foo, bar: bar }
factory_method: getInstance
arguments: [foo, '@foo.baz', { '%foo%': 'foo is %foo%', bar: '%foo%' }, true, '@service_container']
properties: { foo: bar, moo: '@foo.baz' }
calls:
- [setBar, ['@bar']]
- [initialize, { }]

scope: prototype
configurator: sc_configure
bar:
class: FooClass
arguments: [foo, '@foo.baz', '%foo_bar%']
configurator: ['@foo.baz', configure]
foo.baz:
class: %baz_class%
factory_method: getInstance
configurator: ['%baz_class%', configureStatic1]
foo_bar:
class: %foo_class%
method_call1:
class: FooClass
file: %path%foo.php
calls:
- [setBar, ['@foo']]
- [setBar, ['@?foo2']]
- [setBar, ['@?foo3']]
- [setBar, ['@?foobaz']]

factory_service:
factory_method: getInstance
factory_service: foo.baz
alias_for_foo: @foo
foo:
class: FooClass
tags:
- { name: foo, foo: foo }
- { name: foo, bar: bar }
factory_method: getInstance
arguments: [foo, '@foo.baz', { '%foo%': 'foo is %foo%', bar: '%foo%' }, true, '@service_container']
properties: { foo: bar, moo: '@foo.baz' }
calls:
- [setBar, ['@bar']]
- [initialize, { }]
scope: prototype
configurator: sc_configure
bar:
class: FooClass
arguments: [foo, '@foo.baz', '%foo_bar%']
configurator: ['@foo.baz', configure]
foo.baz:
class: %baz_class%
factory_method: getInstance
configurator: ['%baz_class%', configureStatic1]
foo_bar:
class: %foo_class%
method_call1:
class: FooClass
file: %path%foo.php
calls:
- [setBar, ['@foo']]
- [setBar, ['@?foo2']]
- [setBar, ['@?foo3']]
- [setBar, ['@?foobaz']]
factory_service:
factory_method: getInstance
factory_service: foo.baz
alias_for_foo: @foo

0 comments on commit 98abc8e

Please sign in to comment.