1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-24 09:30:34 +01:00

Merge branch '3.2.x'

* 3.2.x:
  [ticket/14717] Quote strings beginning with @ or % in yaml definitions
This commit is contained in:
Máté Bartus 2016-07-23 16:57:56 +02:00
commit 96617e8e46
6 changed files with 13 additions and 13 deletions

View File

@ -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 }

View File

@ -8,7 +8,7 @@ services:
dbal.conn:
class: phpbb\db\driver\factory
arguments:
- @service_container
- '@service_container'
dispatcher:
class: phpbb\db\driver\container_mock

View File

@ -8,7 +8,7 @@ services:
dbal.conn:
class: phpbb\db\driver\factory
arguments:
- @service_container
- '@service_container'
dispatcher:
class: phpbb\db\driver\container_mock

View File

@ -8,7 +8,7 @@ services:
dbal.conn:
class: phpbb\db\driver\factory
arguments:
- @service_container
- '@service_container'
dispatcher:
class: phpbb\db\driver\container_mock

View File

@ -8,7 +8,7 @@ services:
dbal.conn:
class: phpbb\db\driver\factory
arguments:
- @service_container
- '@service_container'
dispatcher:
class: phpbb\db\driver\container_mock

View File

@ -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