From fe579cac8385381f52a26cd61a2de29a71434f2b Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Tue, 14 Aug 2012 09:57:17 -0400
Subject: [PATCH 1/3] [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(-)

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;
 

From 0b70c3d0d6e96854ab517244e8ae745c24b862f4 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Tue, 14 Aug 2012 10:02:16 -0400
Subject: [PATCH 2/3] [ticket/11054] The user class is phpbb_user

PHPBB3-11054
---
 phpBB/includes/extension/controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
 

From b729609fb29ba653b168a8bcb2e071e3bd72dda6 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Wed, 15 Aug 2012 09:15:18 -0400
Subject: [PATCH 3/3] [ticket/11054] Fixed $config var description

PHPBB3-11054
---
 phpBB/includes/extension/controller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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;