From 8e2cbe39cdd7672638dbc0d6a0f65a7365db0d91 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Sat, 31 Mar 2012 04:06:52 +0200 Subject: [feature/dic] Convert common.php to Symfony2 DependencyInjection component PHPBB3-10739 --- phpBB/config/parameters.yml | 11 ++++++ phpBB/config/services.yml | 87 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 phpBB/config/parameters.yml create mode 100644 phpBB/config/services.yml (limited to 'phpBB/config') diff --git a/phpBB/config/parameters.yml b/phpBB/config/parameters.yml new file mode 100644 index 0000000000..8a90c8e99d --- /dev/null +++ b/phpBB/config/parameters.yml @@ -0,0 +1,11 @@ +parameters: + cache.acm_type: file + dbal.driver: dbal_mysqli + dbal.dbhost: + dbal.dbuser: root + dbal.dbpasswd: + dbal.dbname: phpbb_dev + dbal.dbport: + dbal.new_link: false + tables.config: phpbb_config + tables.ext: phpbb_ext diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml new file mode 100644 index 0000000000..2bf8478f82 --- /dev/null +++ b/phpBB/config/services.yml @@ -0,0 +1,87 @@ +services: + cache_factory: + class: phpbb_cache_factory + arguments: + - %cache.acm_type% + + cache: + class: phpbb_cache_service + factory_service: cache_factory + factory_method: get_service + + cache.driver: + class: phpbb_cache_driver_interface + factory_service: cache + factory_method: get_driver + + dispatcher: + class: phpbb_event_dispatcher + + request: + class: phpbb_request + + user: + class: phpbb_user + + auth: + class: phpbb_auth + + dbal.conn: + class: %dbal.driver% + calls: + - [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]] + + config: + class: phpbb_config_db + arguments: + - @dbal.conn + - @cache.driver + - %tables.config% + + ext.manager: + class: phpbb_extension_manager + arguments: + - @dbal.conn + - %tables.ext% + - %core.root_path% + - .%core.php_ext% + - @cache.driver + + style.resource_locator: + class: phpbb_style_resource_locator + + style.path_provider_ext: + class: phpbb_style_extension_path_provider + arguments: + - @ext.manager + - @style.path_provider + + style.path_provider: + class: phpbb_style_path_provider + + template: + class: phpbb_style_template + arguments: + - %core.root_path% + - %core.php_ext% + - @config + - @user + - @style.resource_locator + - @style.path_provider_ext + + style: + class: phpbb_style + arguments: + - %core.root_path% + - %core.php_ext% + - @config + - @user + - @style.resource_locator + - @style.path_provider_ext + - @template + + event.subscriber_loader: + class: phpbb_event_extension_subscriber_loader + arguments: + - @dispatcher + - @ext.manager -- cgit v1.2.1 From b12f9a285546641415d9ea2dd9e3a3dba6527d1a Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Sat, 31 Mar 2012 20:21:26 +0200 Subject: [feature/dic] Remove cache factory, now handled by DIC PHPBB3-10739 --- phpBB/config/parameters.yml | 4 ++-- phpBB/config/services.yml | 15 +++++---------- 2 files changed, 7 insertions(+), 12 deletions(-) (limited to 'phpBB/config') diff --git a/phpBB/config/parameters.yml b/phpBB/config/parameters.yml index 8a90c8e99d..da29ae8417 100644 --- a/phpBB/config/parameters.yml +++ b/phpBB/config/parameters.yml @@ -1,6 +1,6 @@ parameters: - cache.acm_type: file - dbal.driver: dbal_mysqli + cache.driver.class: phpbb_cache_driver_file + dbal.driver.class: dbal_mysqli dbal.dbhost: dbal.dbuser: root dbal.dbpasswd: diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 2bf8478f82..09eb993ca6 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -1,18 +1,13 @@ services: - cache_factory: - class: phpbb_cache_factory - arguments: - - %cache.acm_type% - cache: class: phpbb_cache_service - factory_service: cache_factory - factory_method: get_service + arguments: + - @cache.driver cache.driver: class: phpbb_cache_driver_interface - factory_service: cache - factory_method: get_driver + arguments: + - %cache.driver.class% dispatcher: class: phpbb_event_dispatcher @@ -27,7 +22,7 @@ services: class: phpbb_auth dbal.conn: - class: %dbal.driver% + class: %dbal.driver.class% calls: - [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]] -- cgit v1.2.1 From bca600877cbd92246949366238d365bbc3039d5a Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Sat, 31 Mar 2012 20:27:46 +0200 Subject: [feature/dic] Move cron manager into DIC PHPBB3-10739 --- phpBB/config/services.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 09eb993ca6..85a230de52 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -80,3 +80,14 @@ services: arguments: - @dispatcher - @ext.manager + + cron.task_provider: + class: phpbb_cron_task_provider + arguments: + - @ext.manager + + cron.manager: + class: phpbb_cron_manager + arguments: + - @cron.task_provider + - @cache.driver -- cgit v1.2.1 From 873630f04e6502cc69e6b208f596414f240bc923 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Sat, 31 Mar 2012 20:45:33 +0200 Subject: [feature/dic] Move class loader into DIC PHPBB3-10739 --- phpBB/config/services.yml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 85a230de52..ef459f4903 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -1,13 +1,28 @@ services: + class_loader: + class: phpbb_class_loader + arguments: + - phpbb_ + - %core.root_path%includes/ + - .%core.php_ext% + + class_loader.ext: + class: phpbb_class_loader + arguments: + - phpbb_ext_ + - %core.root_path%ext/ + - .%core.php_ext% + cache: class: phpbb_cache_service arguments: - @cache.driver cache.driver: - class: phpbb_cache_driver_interface - arguments: - - %cache.driver.class% + class: %cache.driver.class% + + cache.driver.install: + class: phpbb_cache_driver_file dispatcher: class: phpbb_event_dispatcher -- cgit v1.2.1 From dc9ccc432cd0b24cf762f8285d8a90f52b8efe5b Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Sat, 31 Mar 2012 21:20:58 +0200 Subject: [feature/dic] Make use of calls to cut down on boilerplate PHPBB3-10739 --- phpBB/config/services.yml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index ef459f4903..6f2ed8c7c3 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -5,6 +5,9 @@ services: - phpbb_ - %core.root_path%includes/ - .%core.php_ext% + calls: + - [register, []] + - [set_cache, [@cache.driver]] class_loader.ext: class: phpbb_class_loader @@ -12,6 +15,9 @@ services: - phpbb_ext_ - %core.root_path%ext/ - .%core.php_ext% + calls: + - [register, []] + - [set_cache, [@cache.driver]] cache: class: phpbb_cache_service @@ -95,6 +101,8 @@ services: arguments: - @dispatcher - @ext.manager + calls: + - [load, []] cron.task_provider: class: phpbb_cron_task_provider -- cgit v1.2.1 From 35c78c127b8fefe56512faaf83c47bee28908e0f Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Sun, 1 Apr 2012 00:59:23 +0200 Subject: [feature/dic] Make table_config a DIC parameter PHPBB3-10739 --- phpBB/config/parameters.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'phpBB/config') diff --git a/phpBB/config/parameters.yml b/phpBB/config/parameters.yml index da29ae8417..3bedc9a135 100644 --- a/phpBB/config/parameters.yml +++ b/phpBB/config/parameters.yml @@ -1,4 +1,5 @@ parameters: + core.table_prefix: phpbb_ cache.driver.class: phpbb_cache_driver_file dbal.driver.class: dbal_mysqli dbal.dbhost: @@ -7,5 +8,5 @@ parameters: dbal.dbname: phpbb_dev dbal.dbport: dbal.new_link: false - tables.config: phpbb_config - tables.ext: phpbb_ext + tables.config: %core.table_prefix%config + tables.ext: %core.table_prefix%ext -- cgit v1.2.1 From e78fbfef9c6aac1349d18454a4292781d661795c Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Sun, 1 Apr 2012 01:13:00 +0200 Subject: [feature/dic] Move cron.lock_db into DIC PHPBB3-10739 --- phpBB/config/services.yml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 6f2ed8c7c3..6817d8f015 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -114,3 +114,10 @@ services: arguments: - @cron.task_provider - @cache.driver + + cron.lock_db: + class: phpbb_lock_db + arguments: + - cron_lock + - @config + - @dbal.conn -- cgit v1.2.1 From 2e76620c8824da62f97cfdaee8f9b1014159fd7c Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Mon, 9 Apr 2012 00:22:55 +0200 Subject: [feature/dic] Rewrite cron system to use DIC PHPBB3-10739 --- phpBB/config/cron_tasks.yml | 72 +++++++++++++++++++++++++++++++++++++++++++++ phpBB/config/services.yml | 5 +++- 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 phpBB/config/cron_tasks.yml (limited to 'phpBB/config') diff --git a/phpBB/config/cron_tasks.yml b/phpBB/config/cron_tasks.yml new file mode 100644 index 0000000000..18a198fa27 --- /dev/null +++ b/phpBB/config/cron_tasks.yml @@ -0,0 +1,72 @@ +services: + cron.task.core.prune_all_forums: + class: phpbb_cron_task_core_prune_all_forums + arguments: + - %core.root_path% + - %core.php_ext% + - @config + - @dbal.conn + tags: + - { name: cron.task } + + cron.task.core.prune_forum: + class: phpbb_cron_task_core_prune_forum + arguments: + - %core.root_path% + - %core.php_ext% + - @config + - @dbal.conn + tags: + - { name: cron.task } + + cron.task.core.queue: + class: phpbb_cron_task_core_queue + arguments: + - %core.root_path% + - %core.php_ext% + - @config + tags: + - { name: cron.task } + + cron.task.core.tidy_cache: + class: phpbb_cron_task_core_tidy_cache + arguments: + - @config + - @cache.driver + tags: + - { name: cron.task } + + cron.task.core.tidy_database: + class: phpbb_cron_task_core_tidy_database + arguments: + - %core.root_path% + - %core.php_ext% + - @config + tags: + - { name: cron.task } + + cron.task.core.tidy_search: + class: phpbb_cron_task_core_tidy_search + arguments: + - %core.root_path% + - %core.php_ext% + - @config + tags: + - { name: cron.task } + + cron.task.core.tidy_sessions: + class: phpbb_cron_task_core_tidy_sessions + arguments: + - @config + - @user + tags: + - { name: cron.task } + + cron.task.core.tidy_warnings: + class: phpbb_cron_task_core_tidy_warnings + arguments: + - %core.root_path% + - %core.php_ext% + - @config + tags: + - { name: cron.task } diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 6817d8f015..f6e92112f7 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -1,3 +1,6 @@ +imports: + - { resource: cron_tasks.yml } + services: class_loader: class: phpbb_class_loader @@ -107,7 +110,7 @@ services: cron.task_provider: class: phpbb_cron_task_provider arguments: - - @ext.manager + - @container cron.manager: class: phpbb_cron_manager -- cgit v1.2.1 From aa0c995ed9cdafa2dfaca23b54d5b4cf6323f794 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Mon, 9 Apr 2012 13:15:27 +0200 Subject: [feature/dic] Protect config directory via .htaccess PHPBB3-10739 --- phpBB/config/.htaccess | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 phpBB/config/.htaccess (limited to 'phpBB/config') diff --git a/phpBB/config/.htaccess b/phpBB/config/.htaccess new file mode 100644 index 0000000000..aa5afc1640 --- /dev/null +++ b/phpBB/config/.htaccess @@ -0,0 +1,4 @@ + + Order Allow,Deny + Deny from All + \ No newline at end of file -- cgit v1.2.1 From 3896ee953fbdb45d0485c0b5dcdfca47409a22ed Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Mon, 9 Apr 2012 14:34:35 +0200 Subject: [feature/dic] Give all cron tasks a name, change some manager usage PHPBB3-10739 --- phpBB/config/services.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index f6e92112f7..94d641ab8b 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -116,7 +116,8 @@ services: class: phpbb_cron_manager arguments: - @cron.task_provider - - @cache.driver + - %core.root_path% + - %core.php_ext% cron.lock_db: class: phpbb_lock_db -- cgit v1.2.1 From 32d2ee61f78e3aeaac5f4f1bcb672c67aa10b10e Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Sat, 21 Jul 2012 16:14:21 +0200 Subject: [feature/dic] Configure container via config.php, use compiler pass PHPBB3-10739 --- phpBB/config/parameters.yml | 12 ------------ phpBB/config/services.yml | 1 + phpBB/config/tables.yml | 3 +++ 3 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 phpBB/config/parameters.yml create mode 100644 phpBB/config/tables.yml (limited to 'phpBB/config') diff --git a/phpBB/config/parameters.yml b/phpBB/config/parameters.yml deleted file mode 100644 index 3c24382fc4..0000000000 --- a/phpBB/config/parameters.yml +++ /dev/null @@ -1,12 +0,0 @@ -parameters: - core.table_prefix: phpbb_ - cache.driver.class: phpbb_cache_driver_file - dbal.driver.class: dbal_mysqli - dbal.dbhost: - dbal.dbuser: root - dbal.dbpasswd: - dbal.dbname: phpbb - dbal.dbport: - dbal.new_link: false - tables.config: %core.table_prefix%config - tables.ext: %core.table_prefix%ext diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 0141641aaf..20f9d67dd0 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -1,4 +1,5 @@ imports: + - { resource: tables.yml } - { resource: cron_tasks.yml } services: diff --git a/phpBB/config/tables.yml b/phpBB/config/tables.yml new file mode 100644 index 0000000000..cfc6dbcfed --- /dev/null +++ b/phpBB/config/tables.yml @@ -0,0 +1,3 @@ +parameters: + tables.config: %core.table_prefix%config + tables.ext: %core.table_prefix%ext -- cgit v1.2.1 From 50bc453aa6c91ae9c9df5cb633615825c9df7b6d Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Sat, 21 Jul 2012 21:02:55 +0200 Subject: [feature/dic] Load services from extensions PHPBB3-10739 --- phpBB/config/services.yml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 20f9d67dd0..61497cbcc1 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -126,3 +126,10 @@ services: - cron_lock - @config - @dbal.conn + + processor.config: + class: phpbb_di_processor_ext + arguments: + - @ext.manager + tags: + - { name: container.processor } -- cgit v1.2.1 From 8a264228d01215fe1020bf946fc95c804ba95450 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Thu, 26 Jul 2012 15:56:55 +0200 Subject: [feature/dic] Add trailing newline to htaccess PHPBB3-10739 --- phpBB/config/.htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/config') diff --git a/phpBB/config/.htaccess b/phpBB/config/.htaccess index aa5afc1640..4128d345ab 100644 --- a/phpBB/config/.htaccess +++ b/phpBB/config/.htaccess @@ -1,4 +1,4 @@ Order Allow,Deny Deny from All - \ No newline at end of file + -- cgit v1.2.1 From 7e44ca4d49a53b81ee1365282ae5f86cd32e7e4a Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Sat, 25 Aug 2012 16:39:38 +0200 Subject: [feature/dic] Re-order services alphabetically PHPBB3-10739 --- phpBB/config/services.yml | 108 +++++++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 54 deletions(-) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 61497cbcc1..a4e96a3797 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -3,6 +3,20 @@ imports: - { resource: cron_tasks.yml } services: + auth: + class: phpbb_auth + + cache: + class: phpbb_cache_service + arguments: + - @cache.driver + + cache.driver: + class: %cache.driver.class% + + cache.driver.install: + class: phpbb_cache_driver_file + class_loader: class: phpbb_class_loader arguments: @@ -23,40 +37,47 @@ services: - [register, []] - [set_cache, [@cache.driver]] - cache: - class: phpbb_cache_service + config: + class: phpbb_config_db arguments: - - @cache.driver + - @dbal.conn + - @cache.driver + - %tables.config% - cache.driver: - class: %cache.driver.class% + cron.task_provider: + class: phpbb_cron_task_provider + arguments: + - @container - cache.driver.install: - class: phpbb_cache_driver_file + cron.manager: + class: phpbb_cron_manager + arguments: + - @cron.task_provider + - %core.root_path% + - %core.php_ext% + + cron.lock_db: + class: phpbb_lock_db + arguments: + - cron_lock + - @config + - @dbal.conn dispatcher: class: phpbb_event_dispatcher - request: - class: phpbb_request - - user: - class: phpbb_user - - auth: - class: phpbb_auth - dbal.conn: class: %dbal.driver.class% calls: - [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]] - config: - class: phpbb_config_db + event.subscriber_loader: + class: phpbb_event_extension_subscriber_loader arguments: - - @dbal.conn - - @cache.driver - - %tables.config% + - @dispatcher + - @ext.manager + calls: + - [load, []] ext.manager: class: phpbb_extension_manager @@ -67,6 +88,16 @@ services: - .%core.php_ext% - @cache.driver + processor.config: + class: phpbb_di_processor_ext + arguments: + - @ext.manager + tags: + - { name: container.processor } + + request: + class: phpbb_request + style.resource_locator: class: phpbb_style_resource_locator @@ -100,36 +131,5 @@ services: - @style.path_provider_ext - @template - event.subscriber_loader: - class: phpbb_event_extension_subscriber_loader - arguments: - - @dispatcher - - @ext.manager - calls: - - [load, []] - - cron.task_provider: - class: phpbb_cron_task_provider - arguments: - - @container - - cron.manager: - class: phpbb_cron_manager - arguments: - - @cron.task_provider - - %core.root_path% - - %core.php_ext% - - cron.lock_db: - class: phpbb_lock_db - arguments: - - cron_lock - - @config - - @dbal.conn - - processor.config: - class: phpbb_di_processor_ext - arguments: - - @ext.manager - tags: - - { name: container.processor } + user: + class: phpbb_user -- cgit v1.2.1 From a8425e1f5046c07ad0baaf1cf1acb372d3dc0802 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Sat, 25 Aug 2012 17:08:03 +0200 Subject: [feature/dic] Fix re-ordering of services PHPBB3-10739 --- phpBB/config/services.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index a4e96a3797..84de37c28c 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -98,6 +98,17 @@ services: request: class: phpbb_request + style: + class: phpbb_style + arguments: + - %core.root_path% + - %core.php_ext% + - @config + - @user + - @style.resource_locator + - @style.path_provider_ext + - @template + style.resource_locator: class: phpbb_style_resource_locator @@ -120,16 +131,5 @@ services: - @style.resource_locator - @style.path_provider_ext - style: - class: phpbb_style - arguments: - - %core.root_path% - - %core.php_ext% - - @config - - @user - - @style.resource_locator - - @style.path_provider_ext - - @template - user: class: phpbb_user -- cgit v1.2.1