Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixed unit tests broken by previous merge
- Loading branch information
Showing
10 changed files
with
73 additions
and
73 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
tests/Symfony/Tests/Component/DependencyInjection/Fixtures/yaml/services13.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
# used to test imports in XML | ||
parameters: | ||
imported_from_yaml: true | ||
imported_from_yaml: true |
20 changes: 10 additions & 10 deletions
20
tests/Symfony/Tests/Component/DependencyInjection/Fixtures/yaml/services2.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
8 changes: 4 additions & 4 deletions
8
tests/Symfony/Tests/Component/DependencyInjection/Fixtures/yaml/services3.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
parameters: | ||
foo: foo | ||
values: | ||
- true | ||
- false | ||
foo: foo | ||
values: | ||
- true | ||
- false |
10 changes: 5 additions & 5 deletions
10
tests/Symfony/Tests/Component/DependencyInjection/Fixtures/yaml/services4.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" } |
2 changes: 1 addition & 1 deletion
2
tests/Symfony/Tests/Component/DependencyInjection/Fixtures/yaml/services4_bad_import.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
imports: | ||
- { resource: foo_fake.yml, ignore_errors: true } | ||
- { resource: foo_fake.yml, ignore_errors: true } |
48 changes: 24 additions & 24 deletions
48
tests/Symfony/Tests/Component/DependencyInjection/Fixtures/yaml/services6.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 } |
2 changes: 1 addition & 1 deletion
2
tests/Symfony/Tests/Component/DependencyInjection/Fixtures/yaml/services7.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
services: | ||
foo: { class: BarClass } | ||
foo: { class: BarClass } |
8 changes: 4 additions & 4 deletions
8
tests/Symfony/Tests/Component/DependencyInjection/Fixtures/yaml/services8.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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'] | ||
|
6 changes: 3 additions & 3 deletions
6
tests/Symfony/Tests/Component/DependencyInjection/Fixtures/yaml/services9.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters