diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-07-17 09:50:15 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-07-17 09:50:15 +0200 |
| commit | 04a8c3c0a40dabc37c53822da83d0680ba94c630 (patch) | |
| tree | a4cfdf72c6ad221f8b692137587ccd23cc6b0de2 /phpBB/phpbb | |
| parent | e7975ad4123b9d432784b364f6eeb020ef10a436 (diff) | |
| parent | af7872473d41b4fd82a850e87f9e74a72a5b3230 (diff) | |
| download | forums-04a8c3c0a40dabc37c53822da83d0680ba94c630.tar forums-04a8c3c0a40dabc37c53822da83d0680ba94c630.tar.gz forums-04a8c3c0a40dabc37c53822da83d0680ba94c630.tar.bz2 forums-04a8c3c0a40dabc37c53822da83d0680ba94c630.tar.xz forums-04a8c3c0a40dabc37c53822da83d0680ba94c630.zip | |
Merge pull request #3776 from VSEphpbb/ticket/14033
[ticket/14033] Fix errors in docblocks
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/console/command/reparser/reparse.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/filesystem/filesystem_interface.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/help/manager.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/user.php | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/phpbb/console/command/reparser/reparse.php b/phpBB/phpbb/console/command/reparser/reparse.php index 81d1aa0421..50d4bd01d6 100644 --- a/phpBB/phpbb/console/command/reparser/reparse.php +++ b/phpBB/phpbb/console/command/reparser/reparse.php @@ -35,7 +35,7 @@ class reparse extends \phpbb\console\command\command * Constructor * * @param \phpbb\user $user - * @param \phpbb\di\service_collection $reparser_collection + * @param \phpbb\di\service_collection $reparsers */ public function __construct(\phpbb\user $user, \phpbb\di\service_collection $reparsers) { diff --git a/phpBB/phpbb/filesystem/filesystem_interface.php b/phpBB/phpbb/filesystem/filesystem_interface.php index 21ad8252f8..1093be2499 100644 --- a/phpBB/phpbb/filesystem/filesystem_interface.php +++ b/phpBB/phpbb/filesystem/filesystem_interface.php @@ -64,7 +64,7 @@ interface filesystem_interface * or the user can specify octal values (or any integer if it makes sense). All directories will have * an execution bit appended, if the user group (owner, group or other) has any bit specified. * - * @param string|array|\Traversable $file The file/directory to be chmodded + * @param string|array|\Traversable $files The file/directory to be chmodded * @param int $perms Permissions to set * @param bool $recursive If the permissions should be changed recursively * @param bool $force_chmod_link Try to apply permissions to symlinks as well diff --git a/phpBB/phpbb/help/manager.php b/phpBB/phpbb/help/manager.php index d6991c0733..39f52d343b 100644 --- a/phpBB/phpbb/help/manager.php +++ b/phpBB/phpbb/help/manager.php @@ -49,6 +49,7 @@ class manager * * @param string $block_name Name or language key with the name of the block * @param bool $switch_column Switch the column of the menu + * @param array $questions Array of frequently asked questions */ public function add_block($block_name, $switch_column = false, $questions = array()) { diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index c33070d6f4..fc125f5edc 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -54,8 +54,8 @@ class user extends \phpbb\session /** * Constructor to set the lang path * - * @param string $datetime_class Class name of datetime class - * @param \phpbb\language\language $lang phpBB's Language loader + * @param \phpbb\language\language $lang phpBB's Language loader + * @param string $datetime_class Class name of datetime class */ function __construct(\phpbb\language\language $lang, $datetime_class) { |