Merge branch '3.3.x'

Author: marc1706

mimetype/guesser_interface.php

@@ -42,7 +42,7 @@ public function get_priority();
 	/**
 	* Set the guesser priority
 	*
-	* @param int Guesser priority
+	* @param int $priority Guesser priority
 	*
 	* @return void
 	*/

storage/file_info.php

@@ -56,7 +56,7 @@ public function __construct(adapter_interface $adapter, $path)
 	/**
 	 * Load propertys lazily
 	 *
-	 * @param string	name		The property name.
+	 * @param string	$name		The property name.
 	 *
 	 * @return string	Returns the property value
 	 */

storage/storage.php

@@ -99,8 +99,8 @@ protected function get_adapter()
 	/**
 	 * Dumps content into a file
 	 *
-	 * @param string	path		The file to be written to.
-	 * @param string	content		The data to write into the file.
+	 * @param string	$path		The file to be written to.
+	 * @param string	$content		The data to write into the file.
 	 *
 	 * @throws exception	When the file already exists
 	 * 						When the file cannot be written

template/template.php

@@ -54,7 +54,7 @@ public function set_style($style_directories = array('styles'));
 	* Note: Templates are still compiled to phpBB's cache directory.
 	*
 	* @param string|array $names Array of names or string of name of template(s) in inheritance tree order, used by extensions.
-	* @param string|array or string $paths Array of style paths, relative to current root directory
+	* @param string|array $paths Array of style paths, relative to current root directory
 	* @return \phpbb\template\template $this
 	*/
 	public function set_custom_style($names, $paths);

template/twig/twig.php

@@ -224,7 +224,7 @@ public function set_style($style_directories = array('styles'))
 	*			'name' 		=> 'adm',
 	*			'ext_path' 	=> 'adm/style/',
 	*		)
-	* @param string|array of string $paths Array of style paths, relative to current root directory
+	* @param string|array $paths Array of style paths, relative to current root directory
 	* @return \phpbb\template\template $this
 	*/
 	public function set_custom_style($names, $paths)

user_loader.php

@@ -186,7 +186,7 @@ public function get_username($user_id, $mode, $guest_username = false, $custom_p
 	* @param bool $query Should we query the database if this user has not yet been loaded?
 	* 						Typically this should be left as false and you should make sure
 	* 						you load users ahead of time with load_users()
-	* @param bool @lazy If true, will be lazy loaded (requires JS)
+	* @param bool $lazy If true, will be lazy loaded (requires JS)
 	* @return array
 	*/
 	public function get_avatar($user_id, $query = false, $lazy = false)

version_helper.php

@@ -134,7 +134,7 @@ public function set_current_version($version)
 	/**
 	 * Over-ride the stability to force check to include unstable versions
 	 *
-	 * @param null|string Null to not force stability, 'unstable' or 'stable' to
+	 * @param null|string $stability Null to not force stability, 'unstable' or 'stable' to
 	 * 						force the corresponding stability
 	 * @return version_helper
 	 */