diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-04 18:11:42 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-04 18:11:42 -0600 |
| commit | cb4bd3f8812b469afb489bdc60473a234837e50c (patch) | |
| tree | 4ebb850682e83f928498d71ea0e555c5f3679374 /phpBB/config | |
| parent | 1148f3fca51efb60e536f2fe0d51880610f0812b (diff) | |
| parent | 7423d48757bec0a81c8d439e911ed32d5af3a775 (diff) | |
| download | forums-cb4bd3f8812b469afb489bdc60473a234837e50c.tar forums-cb4bd3f8812b469afb489bdc60473a234837e50c.tar.gz forums-cb4bd3f8812b469afb489bdc60473a234837e50c.tar.bz2 forums-cb4bd3f8812b469afb489bdc60473a234837e50c.tar.xz forums-cb4bd3f8812b469afb489bdc60473a234837e50c.zip | |
Merge remote-tracking branch 'remotes/nickv/ticket/10714' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/10714: (56 commits)
[ticket/10714] Get log from container in install, update and download/file
[ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
[ticket/10714] Logs are disabled for this page call only
[ticket/10714] Update add_log docs block with @param and @deprecated
[ticket/10714] Remove fallback code from previous commits and move global
[ticket/10714] Fix missing parameter and global phpbb_log in unit tests
[ticket/10714] Add getter for is_in_admin and use it
[ticket/10714] Fix more comments
[ticket/10714] Cast values to integer before using them in the query
[ticket/10714] Fix several doc blocks and comments
[ticket/10714] Fix missing 8th argument in unit tests
[ticket/10714] Use new core.adm_relative_path to create the object.
[ticket/10714] Fix several comments and variable names
[ticket/10714] Fix database driver class name
[ticket/10714] Forgot most important, use container to create $phpbb_log
[ticket/10714] Remove type hinting to allow the usage of mocks in tests
[ticket/10714] Fix dependency injections in unit tests with mocks
[ticket/10714] Use dependencies instead of globals
[ticket/10714] Compare log_type to false, rather then null
[ticket/10714] Add global variables for the unit tests
...
Diffstat (limited to 'phpBB/config')
| -rw-r--r-- | phpBB/config/services.yml | 12 | ||||
| -rw-r--r-- | phpBB/config/tables.yml | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 24e80ddaf0..7b2a24b2b3 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -187,6 +187,18 @@ services: tags: - { name: kernel.event_subscriber } + log: + class: phpbb_log + arguments: + - @dbal.conn + - @user + - @auth + - @dispatcher + - %core.root_path% + - %core.adm_relative_path% + - %core.php_ext% + - %tables.log% + notification_manager: class: phpbb_notification_manager arguments: diff --git a/phpBB/config/tables.yml b/phpBB/config/tables.yml index 10db8fbab6..b3093abf0c 100644 --- a/phpBB/config/tables.yml +++ b/phpBB/config/tables.yml @@ -1,6 +1,7 @@ parameters: tables.config: %core.table_prefix%config tables.ext: %core.table_prefix%ext + tables.log: %core.table_prefix%log tables.notification_types: %core.table_prefix%notification_types tables.notifications: %core.table_prefix%notifications tables.user_notifications: %core.table_prefix%user_notifications |