mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
[ticket/16955] Fix phpdoc annotations and return types
PHPBB3-16955
This commit is contained in:
@@ -161,5 +161,7 @@ class config implements \phpbb\db\migration\tool\tool_interface
|
||||
{
|
||||
return call_user_func_array(array(&$this, $call), $arguments);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
@@ -126,5 +126,7 @@ class config_text implements \phpbb\db\migration\tool\tool_interface
|
||||
{
|
||||
return call_user_func_array(array(&$this, $call), $arguments);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
@@ -339,7 +339,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
|
||||
* Use false to ignore the parent check and check class wide.
|
||||
* @param int|string $module The module id|module_langname
|
||||
* specify that here
|
||||
* @return null
|
||||
* @return void
|
||||
* @throws \phpbb\db\migration\exception
|
||||
*/
|
||||
public function remove($class, $parent = 0, $module = '')
|
||||
@@ -350,7 +350,8 @@ class module implements \phpbb\db\migration\tool\tool_interface
|
||||
if (isset($module['module_langname']))
|
||||
{
|
||||
// Manual Method
|
||||
return $this->remove($class, $parent, $module['module_langname']);
|
||||
$this->remove($class, $parent, $module['module_langname']);
|
||||
return;
|
||||
}
|
||||
|
||||
// Failed.
|
||||
@@ -443,6 +444,8 @@ class module implements \phpbb\db\migration\tool\tool_interface
|
||||
{
|
||||
return call_user_func_array(array(&$this, $call), $arguments);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -470,7 +473,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
|
||||
* key - module_id
|
||||
* value - module_langname
|
||||
*
|
||||
* @return null
|
||||
* @return void
|
||||
*/
|
||||
protected function get_categories_list()
|
||||
{
|
||||
|
@@ -411,7 +411,7 @@ class permission implements \phpbb\db\migration\tool\tool_interface
|
||||
* @param string $type The type (role|group)
|
||||
* @param bool $has_permission True if you want to give them permission,
|
||||
* false if you want to deny them permission
|
||||
* @return null
|
||||
* @return void
|
||||
* @throws \phpbb\db\migration\exception
|
||||
*/
|
||||
public function permission_set($name, $auth_option, $type = 'role', $has_permission = true)
|
||||
@@ -506,7 +506,8 @@ class permission implements \phpbb\db\migration\tool\tool_interface
|
||||
|
||||
if (count($auth_option))
|
||||
{
|
||||
return $this->permission_set($role_name, $auth_option, 'role', $has_permission);
|
||||
$this->permission_set($role_name, $auth_option, 'role', $has_permission);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -570,7 +571,7 @@ class permission implements \phpbb\db\migration\tool\tool_interface
|
||||
* @param string|array $auth_option The auth_option or array of
|
||||
* auth_options you would like to set
|
||||
* @param string $type The type (role|group)
|
||||
* @return null
|
||||
* @return void
|
||||
* @throws \phpbb\db\migration\exception
|
||||
*/
|
||||
public function permission_unset($name, $auth_option, $type = 'role')
|
||||
@@ -643,7 +644,8 @@ class permission implements \phpbb\db\migration\tool\tool_interface
|
||||
throw new \phpbb\db\migration\exception('ROLE_ASSIGNED_NOT_EXIST', $name, $role_id);
|
||||
}
|
||||
|
||||
return $this->permission_unset($role_name, $auth_option, 'role');
|
||||
$this->permission_unset($role_name, $auth_option, 'role');
|
||||
return;
|
||||
}
|
||||
|
||||
$sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . '
|
||||
|
Reference in New Issue
Block a user