Skip to content

Commit

Permalink
fixed unit tests broken by previous merge
Browse files Browse the repository at this point in the history
  • Loading branch information
fabpot committed Sep 23, 2011
1 parent 1dde274 commit e5294fe
Show file tree
Hide file tree
Showing 10 changed files with 73 additions and 73 deletions.
@@ -1,3 +1,3 @@
# used to test imports in XML
parameters:
imported_from_yaml: true
imported_from_yaml: true
@@ -1,11 +1,11 @@
parameters:
FOO: bar
values:
- true
- false
- 0
- 1000.3
bar: foo
foo_bar: @foo_bar
MixedCase:
MixedCaseKey: value
FOO: bar
values:
- true
- false
- 0
- 1000.3
bar: foo
foo_bar: @foo_bar
MixedCase:
MixedCaseKey: value
@@ -1,5 +1,5 @@
parameters:
foo: foo
values:
- true
- false
foo: foo
values:
- true
- false
@@ -1,6 +1,6 @@
imports:
- { resource: services2.yml }
- { resource: services3.yml }
- { resource: "../ini/parameters.ini", class: Symfony\Component\DependencyInjection\Loader\IniFileLoader }
- { resource: "../ini/parameters2.ini" }
- { resource: "../xml/services13.xml" }
- { resource: services2.yml }
- { resource: services3.yml }
- { resource: "../ini/parameters.ini", class: Symfony\Component\DependencyInjection\Loader\IniFileLoader }
- { resource: "../ini/parameters2.ini" }
- { resource: "../xml/services13.xml" }
@@ -1,2 +1,2 @@
imports:
- { resource: foo_fake.yml, ignore_errors: true }
- { resource: foo_fake.yml, ignore_errors: true }
@@ -1,25 +1,25 @@
services:
foo: { class: FooClass }
baz: { class: BazClass }
scope.container: { class: FooClass, scope: container }
scope.custom: { class: FooClass, scope: custom }
scope.prototype: { class: FooClass, scope: prototype }
constructor: { class: FooClass, factory_method: getInstance }
file: { class: FooClass, file: %path%/foo.php }
arguments: { class: FooClass, arguments: [foo, @foo, [true, false]] }
configurator1: { class: FooClass, configurator: sc_configure }
configurator2: { class: FooClass, configurator: [@baz, configure] }
configurator3: { class: FooClass, configurator: [BazClass, configureStatic] }
method_call1:
class: FooClass
calls:
- [ setBar, [] ]
method_call2:
class: FooClass
calls:
- [ setBar, [ foo, @foo, [true, false] ] ]
alias_for_foo: @foo
another_alias_for_foo:
alias: foo
public: false
factory_service: { class: BazClass, factory_method: getInstance, factory_service: baz_factory }
foo: { class: FooClass }
baz: { class: BazClass }
scope.container: { class: FooClass, scope: container }
scope.custom: { class: FooClass, scope: custom }
scope.prototype: { class: FooClass, scope: prototype }
constructor: { class: FooClass, factory_method: getInstance }
file: { class: FooClass, file: %path%/foo.php }
arguments: { class: FooClass, arguments: [foo, @foo, [true, false]] }
configurator1: { class: FooClass, configurator: sc_configure }
configurator2: { class: FooClass, configurator: [@baz, configure] }
configurator3: { class: FooClass, configurator: [BazClass, configureStatic] }
method_call1:
class: FooClass
calls:
- [ setBar, [] ]
method_call2:
class: FooClass
calls:
- [ setBar, [ foo, @foo, [true, false] ] ]
alias_for_foo: @foo
another_alias_for_foo:
alias: foo
public: false
factory_service: { class: BazClass, factory_method: getInstance, factory_service: baz_factory }
@@ -1,2 +1,2 @@
services:
foo: { class: BarClass }
foo: { class: BarClass }
@@ -1,6 +1,6 @@
parameters:
foo: '%baz%'
baz: bar
bar: 'foo is %%foo bar'
values: [true, false, null, 0, 1000.3, 'true', 'false', 'null']
foo: '%baz%'
baz: bar
bar: 'foo is %%foo bar'
values: [true, false, null, 0, 1000.3, 'true', 'false', 'null']

@@ -1,7 +1,7 @@
parameters:
baz_class: BazClass
foo_class: FooClass
foo: bar
baz_class: BazClass
foo_class: FooClass
foo: bar

services:
foo:
Expand Down
40 changes: 20 additions & 20 deletions tests/Symfony/Tests/Component/Yaml/DumperTest.php
Expand Up @@ -100,12 +100,12 @@ public function testInlineLevel()
foo: '#bar'
'foo''bar': { }
bar:
- 1
- foo
- 1
- foo
foobar:
foo: bar
bar: [1, foo]
foobar: { foo: bar, bar: [1, foo] }
foo: bar
bar: [1, foo]
foobar: { foo: bar, bar: [1, foo] }
EOF;
$this->assertEquals($expected, $this->dumper->dump($array, 2), '->dump() takes an inline level argument');
Expand All @@ -115,16 +115,16 @@ public function testInlineLevel()
foo: '#bar'
'foo''bar': { }
bar:
- 1
- foo
foobar:
foo: bar
bar:
- 1
- foo
foobar:
foobar:
foo: bar
bar: [1, foo]
bar:
- 1
- foo
foobar:
foo: bar
bar: [1, foo]
EOF;
$this->assertEquals($expected, $this->dumper->dump($array, 3), '->dump() takes an inline level argument');
Expand All @@ -134,18 +134,18 @@ public function testInlineLevel()
foo: '#bar'
'foo''bar': { }
bar:
- 1
- foo
foobar:
foo: bar
bar:
- 1
- foo
foobar:
foobar:
foo: bar
bar:
- 1
- foo
- 1
- foo
foobar:
foo: bar
bar:
- 1
- foo
EOF;
$this->assertEquals($expected, $this->dumper->dump($array, 4), '->dump() takes an inline level argument');
Expand Down

0 comments on commit e5294fe

Please sign in to comment.