Skip to content

Commit 9edff29

Browse files
committed
Merge branch '2.3' into 2.5
* 2.3: [TwigBundle] allowed SecurityBundle to use the latest versions of FrameworkBundle [HttpFoundation] Make use of isEmpty() method fix missing comma in YamlDumper [Console] Helper\Table->addRow optimization Conflicts: src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Component/Console/Helper/TableHelper.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
2 parents b04e678 + 47054b3 commit 9edff29

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Dumper/YamlDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private function addService($id, $definition)
8686
foreach ($attributes as $key => $value) {
8787
$att[] = sprintf('%s: %s', $this->dumper->dump($key), $this->dumper->dump($value));
8888
}
89-
$att = $att ? ', '.implode(' ', $att) : '';
89+
$att = $att ? ', '.implode(', ', $att) : '';
9090

9191
$tagsCode .= sprintf(" - { name: %s%s }\n", $this->dumper->dump($name), $att);
9292
}

Tests/Fixtures/containers/container9.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
$container->
1313
register('foo', 'Bar\FooClass')->
1414
addTag('foo', array('foo' => 'foo'))->
15-
addTag('foo', array('bar' => 'bar'))->
15+
addTag('foo', array('bar' => 'bar', 'baz' => 'baz'))->
1616
setFactoryClass('Bar\\FooClass')->
1717
setFactoryMethod('getInstance')->
1818
setArguments(array('foo', new Reference('foo.baz'), array('%foo%' => 'foo is %foo%', 'foobar' => '%foo%'), true, new Reference('service_container')))->

Tests/Fixtures/xml/services9.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<services>
99
<service id="foo" class="Bar\FooClass" factory-method="getInstance" factory-class="Bar\FooClass">
1010
<tag name="foo" foo="foo"/>
11-
<tag name="foo" bar="bar"/>
11+
<tag name="foo" bar="bar" baz="baz"/>
1212
<argument>foo</argument>
1313
<argument type="service" id="foo.baz"/>
1414
<argument type="collection">

Tests/Fixtures/yaml/services9.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ services:
88
class: Bar\FooClass
99
tags:
1010
- { name: foo, foo: foo }
11-
- { name: foo, bar: bar }
11+
- { name: foo, bar: bar, baz: baz }
1212
factory_class: Bar\FooClass
1313
factory_method: getInstance
1414
arguments: [foo, '@foo.baz', { '%foo%': 'foo is %foo%', foobar: '%foo%' }, true, '@service_container']

0 commit comments

Comments
 (0)