From 85bcdbad468cd255a02d6c48b2dcd1d128978eed Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Sat, 21 Jul 2012 16:19:01 +0200 Subject: [ticket/11012] Normalize $phpEx member vars to $php_ext PHPBB3-11012 --- phpBB/includes/extension/controller.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/includes/extension/controller.php') diff --git a/phpBB/includes/extension/controller.php b/phpBB/includes/extension/controller.php index c7fd439a19..ec051c756f 100644 --- a/phpBB/includes/extension/controller.php +++ b/phpBB/includes/extension/controller.php @@ -50,7 +50,7 @@ abstract class phpbb_extension_controller implements phpbb_extension_controller_ /** * @var string PHP Extension */ - protected $phpEx; + protected $php_ext; /** * @var string Relative path to board root @@ -64,14 +64,14 @@ abstract class phpbb_extension_controller implements phpbb_extension_controller_ public function __construct() { global $request, $db, $user, $template, $config; - global $phpEx, $phpbb_root_path; + global $php_ext, $phpbb_root_path; $this->request = $request; $this->db = $db; $this->user = $user; $this->template = $template; $this->config = $config; - $this->phpEx = $phpEx; + $this->php_ext = $php_ext; $this->phpbb_root_path = $phpbb_root_path; } } -- cgit v1.2.1 From a35ad4e689c204c52d23c07b701433325c27b0dc Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Thu, 2 Aug 2012 12:38:49 +0200 Subject: [ticket/11041] Correctly import PHP file extension from global space. 85bcdbad468cd255a02d6c48b2dcd1d128978eed shouldn't have changed imports of "global $phpEx". PHPBB3-11041 --- phpBB/includes/extension/controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/includes/extension/controller.php') diff --git a/phpBB/includes/extension/controller.php b/phpBB/includes/extension/controller.php index ec051c756f..2b8c50aafb 100644 --- a/phpBB/includes/extension/controller.php +++ b/phpBB/includes/extension/controller.php @@ -64,14 +64,14 @@ abstract class phpbb_extension_controller implements phpbb_extension_controller_ public function __construct() { global $request, $db, $user, $template, $config; - global $php_ext, $phpbb_root_path; + global $phpEx, $phpbb_root_path; $this->request = $request; $this->db = $db; $this->user = $user; $this->template = $template; $this->config = $config; - $this->php_ext = $php_ext; + $this->php_ext = $phpEx; $this->phpbb_root_path = $phpbb_root_path; } } -- cgit v1.2.1 From fe579cac8385381f52a26cd61a2de29a71434f2b Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 14 Aug 2012 09:57:17 -0400 Subject: [ticket/11054] Fixed documentation syntax for @var in extension/controller.php PHPBB3-11054 --- phpBB/includes/extension/controller.php | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'phpBB/includes/extension/controller.php') diff --git a/phpBB/includes/extension/controller.php b/phpBB/includes/extension/controller.php index 2b8c50aafb..1099bc128e 100644 --- a/phpBB/includes/extension/controller.php +++ b/phpBB/includes/extension/controller.php @@ -23,37 +23,44 @@ if (!defined('IN_PHPBB')) abstract class phpbb_extension_controller implements phpbb_extension_controller_interface { /** - * @var phpbb_request Request class object + * Request class object + * @var phpbb_request */ protected $request; /** - * @var dbal DBAL class object + * DBAL class object + * @var dbal */ protected $db; /** - * @var user User class object + * User class object + * @var user */ protected $user; /** - * @var phpbb_template Template class object + * Template class object + * @var phpbb_template */ protected $template; /** - * @var array Config array + * Config array + * @var array */ protected $config; /** - * @var string PHP Extension + * PHP Extension + * @var string */ protected $php_ext; /** - * @var string Relative path to board root + * Relative path to board root + * @var string */ protected $phpbb_root_path; -- cgit v1.2.1 From 0b70c3d0d6e96854ab517244e8ae745c24b862f4 Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 14 Aug 2012 10:02:16 -0400 Subject: [ticket/11054] The user class is phpbb_user PHPBB3-11054 --- phpBB/includes/extension/controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/extension/controller.php') diff --git a/phpBB/includes/extension/controller.php b/phpBB/includes/extension/controller.php index 1099bc128e..3e9eadf2dd 100644 --- a/phpBB/includes/extension/controller.php +++ b/phpBB/includes/extension/controller.php @@ -36,7 +36,7 @@ abstract class phpbb_extension_controller implements phpbb_extension_controller_ /** * User class object - * @var user + * @var phpbb_user */ protected $user; -- cgit v1.2.1 From b729609fb29ba653b168a8bcb2e071e3bd72dda6 Mon Sep 17 00:00:00 2001 From: David King Date: Wed, 15 Aug 2012 09:15:18 -0400 Subject: [ticket/11054] Fixed $config var description PHPBB3-11054 --- phpBB/includes/extension/controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/includes/extension/controller.php') diff --git a/phpBB/includes/extension/controller.php b/phpBB/includes/extension/controller.php index 3e9eadf2dd..f97b69c7ed 100644 --- a/phpBB/includes/extension/controller.php +++ b/phpBB/includes/extension/controller.php @@ -47,8 +47,8 @@ abstract class phpbb_extension_controller implements phpbb_extension_controller_ protected $template; /** - * Config array - * @var array + * Config object + * @var phpbb_config */ protected $config; -- cgit v1.2.1 From f48709f5bb8fb1b916d308e3b4bb06bc96d08611 Mon Sep 17 00:00:00 2001 From: David King Date: Fri, 19 Oct 2012 19:53:29 -0400 Subject: [feature/compiled-dic] Compile the DI Container into a cached class PHPBB3-11152 --- phpBB/includes/extension/controller.php | 84 --------------------------------- 1 file changed, 84 deletions(-) delete mode 100644 phpBB/includes/extension/controller.php (limited to 'phpBB/includes/extension/controller.php') diff --git a/phpBB/includes/extension/controller.php b/phpBB/includes/extension/controller.php deleted file mode 100644 index f97b69c7ed..0000000000 --- a/phpBB/includes/extension/controller.php +++ /dev/null @@ -1,84 +0,0 @@ -request = $request; - $this->db = $db; - $this->user = $user; - $this->template = $template; - $this->config = $config; - $this->php_ext = $phpEx; - $this->phpbb_root_path = $phpbb_root_path; - } -} -- cgit v1.2.1