[ticket/11768] Updated various annotations

PHPBB3-11768

5 files changed, 24 insertions, 28 deletions

diff --git a/phpBB/phpbb/textformatter/data_access.php b/phpBB/phpbb/textformatter/data_access.php
index 2dfba27960..8938d66935 100644
--- a/phpBB/phpbb/textformatter/data_access.php
+++ b/phpBB/phpbb/textformatter/data_access.php
@@ -27,7 +27,7 @@ class data_access
 	protected $bbcodes_table;
 
 	/**
-	* @var \phpbb_db_driver_interface
+	* @var \phpbb\db\driver\driver_interface
 	*/
 	protected $db;
 
@@ -54,13 +54,12 @@ class data_access
 	/**
 	* Constructor
 	*
-	* @param  \phpbb\db\driver\driver_interface $db Database connection
-	* @param  string $bbcodes_table Name of the BBCodes table
-	* @param  string $smilies_table Name of the smilies table
-	* @param  string $styles_table  Name of the styles table
-	* @param  string $words_table   Name of the words table
-	* @param  string $styles_path   Path to the styles dir
-	* @return null
+	* @param \phpbb\db\driver\driver_interface $db Database connection
+	* @param string $bbcodes_table Name of the BBCodes table
+	* @param string $smilies_table Name of the smilies table
+	* @param string $styles_table  Name of the styles table
+	* @param string $words_table   Name of the words table
+	* @param string $styles_path   Path to the styles dir
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, $bbcodes_table, $smilies_table, $styles_table, $words_table, $styles_path)
 	{
diff --git a/phpBB/phpbb/textformatter/parser_interface.php b/phpBB/phpbb/textformatter/parser_interface.php
index 37d538470d..3cb9f8e977 100644
--- a/phpBB/phpbb/textformatter/parser_interface.php
+++ b/phpBB/phpbb/textformatter/parser_interface.php
@@ -104,7 +104,7 @@ interface parser_interface
 	/**
 	* Set multiple variables to be used by the parser
 	*
-	* @param  array Associative array of [name => value]
+	* @param  array $vars Associative array of [name => value]
 	* @return null
 	*/
 	public function set_vars(array $vars);
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php
index aa37beeef6..f3df2ad7a5 100644
--- a/phpBB/phpbb/textformatter/s9e/factory.php
+++ b/phpBB/phpbb/textformatter/s9e/factory.php
@@ -23,7 +23,7 @@ use s9e\TextFormatter\Configurator\Items\UnsafeTemplate;
 class factory implements \phpbb\textformatter\cache_interface
 {
 	/**
-	* @var \phpbb\cache\driver_interface $cache
+	* @var \phpbb\cache\driver\driver_interface
 	*/
 	protected $cache;
 
@@ -103,12 +103,11 @@ class factory implements \phpbb\textformatter\cache_interface
 	/**
 	* Constructor
 	*
-	* @param  \phpbb\textformatter\data_access $data_access
-	* @param  \phpbb\cache\driver\driver_interface $cache
-	* @param  string $cache_dir          Path to the cache dir
-	* @param  string $cache_key_parser   Cache key used for the parser
-	* @param  string $cache_key_renderer Cache key used for the renderer
-	* @return null
+	* @param \phpbb\textformatter\data_access $data_access
+	* @param \phpbb\cache\driver\driver_interface $cache
+	* @param string $cache_dir          Path to the cache dir
+	* @param string $cache_key_parser   Cache key used for the parser
+	* @param string $cache_key_renderer Cache key used for the renderer
 	*/
 	public function __construct(\phpbb\textformatter\data_access $data_access, \phpbb\cache\driver\driver_interface $cache, $cache_dir, $cache_key_parser, $cache_key_renderer)
 	{
diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index f3e437b163..2f4a03d4c2 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -34,11 +34,10 @@ class parser implements \phpbb\textformatter\parser_interface
 	/**
 	* Constructor
 	*
-	* @param  \phpbb\cache\driver_interface $cache
-	* @param  string $key Cache key
-	* @param  \phpbb\user $user
-	* @param  factory $factory
-	* @return null
+	* @param \phpbb\cache\driver_interface $cache
+	* @param string $key Cache key
+	* @param \phpbb\user $user
+	* @param factory $factory
 	*/
 	public function __construct(\phpbb\cache\driver\driver_interface $cache, $key, \phpbb\user $user, factory $factory)
 	{
@@ -194,7 +193,7 @@ class parser implements \phpbb\textformatter\parser_interface
 	/**
 	* Return the instance of s9e\TextFormatter\Parser used by this object
 	*
-	* @return s9e\TextFormatter\Parser
+	* @return \s9e\TextFormatter\Parser
 	*/
 	public function get_parser()
 	{
diff --git a/phpBB/phpbb/textformatter/s9e/renderer.php b/phpBB/phpbb/textformatter/s9e/renderer.php
index c896c9f1c7..882a19b4ac 100644
--- a/phpBB/phpbb/textformatter/s9e/renderer.php
+++ b/phpBB/phpbb/textformatter/s9e/renderer.php
@@ -51,11 +51,10 @@ class renderer implements \phpbb\textformatter\renderer_interface
 	/**
 	* Constructor
 	*
-	* @param  \phpbb\cache\driver\driver_interface $cache
-	* @param  string $cache_dir Path to the cache dir
-	* @param  string $key Cache key
-	* @param  factory $factory
-	* @return null
+	* @param \phpbb\cache\driver\driver_interface $cache
+	* @param string $cache_dir Path to the cache dir
+	* @param string $key Cache key
+	* @param factory $factory
 	*/
 	public function __construct(\phpbb\cache\driver\driver_interface $cache, $cache_dir, $key, factory $factory)
 	{
@@ -153,7 +152,7 @@ class renderer implements \phpbb\textformatter\renderer_interface
 	/**
 	* Return the instance of s9e\TextFormatter\Renderer used by this object
 	*
-	* @return s9e\TextFormatter\Renderer
+	* @return \s9e\TextFormatter\Renderer
 	*/
 	public function get_renderer()
 	{