diff options
| author | Máté Bartus <mate.bartus@gmail.com> | 2016-07-23 16:56:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-23 16:56:45 +0200 |
| commit | 4ad0c3e9034ca9f1d7fe12f4a36e7d1ac5180d5b (patch) | |
| tree | 7086054b627cc2f801c0b45820c36321d88eef73 | |
| parent | 4554c030c09ac938cd4926369ed690ffb2b2f16e (diff) | |
| parent | 89461d982c3356f5389caaae7bec1fa76fbe6beb (diff) | |
| download | forums-4ad0c3e9034ca9f1d7fe12f4a36e7d1ac5180d5b.tar forums-4ad0c3e9034ca9f1d7fe12f4a36e7d1ac5180d5b.tar.gz forums-4ad0c3e9034ca9f1d7fe12f4a36e7d1ac5180d5b.tar.bz2 forums-4ad0c3e9034ca9f1d7fe12f4a36e7d1ac5180d5b.tar.xz forums-4ad0c3e9034ca9f1d7fe12f4a36e7d1ac5180d5b.zip | |
Merge pull request #4390 from marc1706/ticket/14717
[ticket/14717] Quote strings beginning with @ or % in yaml definitions
6 files changed, 13 insertions, 13 deletions
diff --git a/phpBB/config/default/container/services_auth.yml b/phpBB/config/default/container/services_auth.yml index a0f9fbd8ef..ee6f7ef448 100644 --- a/phpBB/config/default/container/services_auth.yml +++ b/phpBB/config/default/container/services_auth.yml @@ -103,7 +103,7 @@ services: auth.provider.oauth.service.twitter: class: phpbb\auth\provider\oauth\service\twitter arguments: - - @config - - @request + - '@config' + - '@request' tags: - { name: auth.provider.oauth.service } diff --git a/tests/di/fixtures/config/production/container/environment.yml b/tests/di/fixtures/config/production/container/environment.yml index 9dcf11d865..4216b187cc 100644 --- a/tests/di/fixtures/config/production/container/environment.yml +++ b/tests/di/fixtures/config/production/container/environment.yml @@ -8,7 +8,7 @@ services: dbal.conn: class: phpbb\db\driver\factory arguments: - - @service_container + - '@service_container' dispatcher: class: phpbb\db\driver\container_mock diff --git a/tests/di/fixtures/config/test/container/environment.yml b/tests/di/fixtures/config/test/container/environment.yml index 14c986d123..7d528fed19 100644 --- a/tests/di/fixtures/config/test/container/environment.yml +++ b/tests/di/fixtures/config/test/container/environment.yml @@ -8,7 +8,7 @@ services: dbal.conn: class: phpbb\db\driver\factory arguments: - - @service_container + - '@service_container' dispatcher: class: phpbb\db\driver\container_mock diff --git a/tests/di/fixtures/other_config/production/container/environment.yml b/tests/di/fixtures/other_config/production/container/environment.yml index 4960562a6c..1170145b66 100644 --- a/tests/di/fixtures/other_config/production/container/environment.yml +++ b/tests/di/fixtures/other_config/production/container/environment.yml @@ -8,7 +8,7 @@ services: dbal.conn: class: phpbb\db\driver\factory arguments: - - @service_container + - '@service_container' dispatcher: class: phpbb\db\driver\container_mock diff --git a/tests/di/fixtures/other_config/test/container/environment.yml b/tests/di/fixtures/other_config/test/container/environment.yml index e285b1b781..6c36977d4d 100644 --- a/tests/di/fixtures/other_config/test/container/environment.yml +++ b/tests/di/fixtures/other_config/test/container/environment.yml @@ -8,7 +8,7 @@ services: dbal.conn: class: phpbb\db\driver\factory arguments: - - @service_container + - '@service_container' dispatcher: class: phpbb\db\driver\container_mock diff --git a/tests/functional/fixtures/ext/foo/bar/config/services.yml b/tests/functional/fixtures/ext/foo/bar/config/services.yml index d35be7955a..495c775a1f 100644 --- a/tests/functional/fixtures/ext/foo/bar/config/services.yml +++ b/tests/functional/fixtures/ext/foo/bar/config/services.yml @@ -2,13 +2,13 @@ services: foo_bar.controller: class: foo\bar\controller\controller arguments: - - @controller.helper - - @path_helper - - @template - - @config - - @user - - %core.root_path% - - %core.php_ext% + - '@controller.helper' + - '@path_helper' + - '@template' + - '@config' + - '@user' + - '%core.root_path%' + - '%core.php_ext%' foo_bar.listener.permission: class: foo\bar\event\permission |