mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 06:51:33 +02:00
Code Issues Releases Wiki Activity

[feature/avatars] Docblock fixes and small change for php_ext

Browse Source 
PHPBB3-10018
This commit is contained in:
Marc Alexander
2012-11-25 20:50:31 +01:00
parent a77fcdb5f9
commit 6522190ff1
4 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
phpBB/includes/avatar/driver/driver.php
View File

@@ -23,26 +23,6 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
{
protected $name;
/**
* Returns the name of the driver.
*
* @return string Name of wrapped driver.
*/
public function get_name()
{
return $this->name;
}
/**
* Sets the name of the driver.
*
* @param string $name The driver name
*/
public function set_name($name)
{
$this->name = $name;
}
/**
* Current board configuration
* @type phpbb_config
@@ -50,8 +30,8 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
protected $config;
/**
* Current board configuration
* @type phpbb_config
* Request object
* @type phpbb_request
*/
protected $request;
@@ -62,10 +42,10 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
protected $phpbb_root_path;
/**
* Current $phpEx
* Current $php_ext
* @type string
*/
protected $phpEx;
protected $php_ext;
/**
* A cache driver
@@ -83,18 +63,18 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
/**
* Construct a driver object
*
* @param $config The phpBB configuration
* @param $request The request object
* @param $phpbb_root_path The path to the phpBB root
* @param $phpEx The php file extension
* @param $cache A cache driver
* @param phpbb_config $config The phpBB configuration
* @param phpbb_request $request The request object
* @param string $phpbb_root_path The path to the phpBB root
* @param string $php_ext The php file extension
* @param phpbb_cache_driver_interface $cache A cache driver
*/
public function __construct(phpbb_config $config, phpbb_request $request, $phpbb_root_path, $phpEx, phpbb_cache_driver_interface $cache = null)
public function __construct(phpbb_config $config, phpbb_request $request, $phpbb_root_path, $php_ext, phpbb_cache_driver_interface $cache = null)
{
$this->config = $config;
$this->request = $request;
$this->phpbb_root_path = $phpbb_root_path;
$this->phpEx = $phpEx;
$this->php_ext = $php_ext;
$this->cache = $cache;
}
@@ -170,4 +150,22 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
return $template;
}
/**
* @inheritdoc
*/
public function get_name()
{
return $this->name;
}
/**
* Sets the name of the driver.
*
* @param string $name The driver name
*/
public function set_name($name)
{
$this->name = $name;
}
}