mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-16 21:54:00 +02:00
Code Issues Releases Wiki Activity

[ticket/16955] Fix another batch of docblocks

Browse Source 
PHPBB3-16955
This commit is contained in:
Marc Alexander
2022-12-26 14:50:57 +01:00
parent 96911b7403
commit 5b23dcd606
25 changed files with 93 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/passwords/driver/driver_interface.php
View File

@@ -63,7 +63,7 @@ interface driver_interface
* @param string $hash Password hash
* @param bool $full Return full settings or only settings
* related to the salt
* @return string String containing the hash settings
* @return string|false String containing the hash settings or false if settings are empty or not supported
*/
public function get_settings_only($hash, $full = false);
}

6
phpBB/phpbb/passwords/helper.php
View File

@@ -50,8 +50,8 @@ class helper
* @param string $type Data type of the supplied value
* @param string $value Value that should be put into the data array
*
* @return string|null Return complete combined hash if type is neither
* 'prefix' nor 'settings', nothing if it is
* @return string|false Return complete combined hash if type is neither
* 'prefix' nor 'settings', false if it is
*/
public function combine_hash_output(&$data, $type, $value)
{
@@ -70,6 +70,8 @@ class helper
// Return full hash
return $data['prefix'] . $data['settings'] . '$' . $value;
}
return false;
}
/**

6
phpBB/phpbb/passwords/manager.php
View File

@@ -115,7 +115,7 @@ class manager
/**
* Fill algorithm type map
*
* @param \phpbb\di\service_collection $hashing_algorithms
* @param \phpbb\di\service_collection|array $hashing_algorithms
*/
protected function fill_type_map($hashing_algorithms)
{
@@ -154,7 +154,7 @@ class manager
*
* @param string $hash Password hash that should be checked
*
* @return object|bool The hash type object or false if the specified
* @return array|bool|object The hash type object or false if the specified
* type is not supported
*/
public function detect_algorithm($hash)
@@ -276,7 +276,7 @@ class manager
// First find out what kind of hash we're dealing with
$stored_hash_type = $this->detect_algorithm($hash);
if ($stored_hash_type == false)
if (!$stored_hash_type)
{
// Still check MD5 hashes as that is what the installer
// will default to for the admin user