From b035697800a4a208cd4e6be68bfd4033cc85af38 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Mon, 10 Jun 2013 12:59:47 -0500 Subject: [feature/twig] Replace phpBB template with Twig Move phpbb_template class to phpbb_template_phpbb Changed phpbb_template class to an interface Switch services.yml to load phpbb_template_twig instead of phpbb_template PHPBB3-11598 --- phpBB/config/services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index bb96953bcf..4713cb21a6 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -254,7 +254,7 @@ services: class: phpbb_style_path_provider template: - class: phpbb_template + class: phpbb_template_twig arguments: - %core.root_path% - %core.php_ext% -- cgit v1.2.1 From bdc05b7dc8ee2363dfe1a7fa70bc4118140ed351 Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Mon, 1 Jul 2013 13:28:08 -0500 Subject: [feature/twig] Remove resource locator dependency from template PHPBB3-11598 --- phpBB/config/services.yml | 1 - 1 file changed, 1 deletion(-) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 4713cb21a6..32bd493743 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -260,7 +260,6 @@ services: - %core.php_ext% - @config - @user - - @style.resource_locator - @template_context - @ext.manager -- cgit v1.2.1 From d7cff78443465a06d6aab519c3285a9b20b6cd50 Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Mon, 1 Jul 2013 13:39:51 -0500 Subject: [feature/twig] Use adm_relative_path to build admin namespace PHPBB3-11598 --- phpBB/config/services.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 32bd493743..23205169b9 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -262,6 +262,7 @@ services: - @user - @template_context - @ext.manager + - %core.adm_relative_path% template_context: class: phpbb_template_context -- cgit v1.2.1 From 884a5b06fa2e300285a67885d0652d201c7a330a Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Thu, 4 Jul 2013 10:13:05 -0500 Subject: [feature/twig] Add set_style function to controller helper PHPBB3-11598 --- phpBB/config/services.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 23205169b9..f364bf5574 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -68,6 +68,7 @@ services: controller.helper: class: phpbb_controller_helper arguments: + - @style - @template - @user - %core.root_path% -- cgit v1.2.1 From 2fb48d60f1b8ea111c766d6d9e7a3dde2b8a4e74 Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Thu, 4 Jul 2013 11:08:36 -0500 Subject: [feature/twig] Attempt to automatically set style dir for ext controllers Extension authors can change it themselves if necessary PHPBB3-11598 --- phpBB/config/services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index f364bf5574..bb9879601c 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -79,7 +79,7 @@ services: arguments: - @user - @service_container - - @ext.finder + - @style cron.task_collection: class: phpbb_di_service_collection -- cgit v1.2.1 From 13c356545465a457b8c55dd9638f89165bab6271 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Fri, 5 Jul 2013 12:11:59 -0500 Subject: [feature/twig] Remove style dependency for controller helper If a controller wants to use set_style, it can just use phpbb_style PHPBB3-11598 --- phpBB/config/services.yml | 1 - 1 file changed, 1 deletion(-) (limited to 'phpBB/config') diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 3d951e2a45..e228b3d83f 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -69,7 +69,6 @@ services: controller.helper: class: phpbb_controller_helper arguments: - - @style - @template - @user - %core.root_path% -- cgit v1.2.1