clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Using random_int directly

This commit is contained in:
Philipp Holzer 2018-11-05 21:15:30 +01:00
parent c94936a149
commit 049cd963f3
No known key found for this signature in database
GPG Key ID: 517BE60E2CE5C8A5
2 changed files with 5 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Util/Crypto.php
View File

@ -483,22 +483,17 @@ class Crypto
* *
* @param string $digits The count of digits * @param string $digits The count of digits
* @return int The random Digits * @return int The random Digits
*
* @throws \Exception In case 'random_int' isn't usable
*/ */
public static function randomDigits($digits) public static function randomDigits($digits)
{ {
$rn = ''; $rn = '';
if (!function_exists('random_int')) {
// using rand() function for PHP 5.x compatibility
for ($i = 0; $i < $digits; $i++) {
$rn .= rand(0, 9);
}
} else {
// generating cryptographically secure pseudo-random integers // generating cryptographically secure pseudo-random integers
for ($i = 0; $i < $digits; $i++) { for ($i = 0; $i < $digits; $i++) {
$rn .= random_int(0, 9); $rn .= random_int(0, 9);
} }
}
return $rn; return $rn;
} }

67
tests/src/Util/CryptoTest.php
View File

@ -7,24 +7,6 @@ use PHPUnit\Framework\TestCase;
class CryptoTest extends TestCase class CryptoTest extends TestCase
{ {
/**
* Replaces function_exists results with given mocks
*
* @param array $functions a list from function names and their result
*/
private function setFunctions($functions)
{
global $phpMock;
$phpMock['function_exists'] = function($function) use ($functions) {
foreach ($functions as $name => $value) {
if ($function == $name) {
return $value;
}
}
return '__phpunit_continue__';
};
}
/** /**
* Replaces rand results with given mocks * Replaces rand results with given mocks
* *
@ -53,24 +35,8 @@ class CryptoTest extends TestCase
}; };
} }
public function testRandomDigitsRand()
{
$this->setFunctions(['random_int' => false]);
$this->assertRand(0, 9);
$test = Crypto::randomDigits(1);
$this->assertEquals(1, strlen($test));
$this->assertEquals(1, $test);
$test = Crypto::randomDigits(8);
$this->assertEquals(8, strlen($test));
$this->assertEquals(11111111, $test);
}
public function testRandomDigitsRandomInt() public function testRandomDigitsRandomInt()
{ {
$this->setFunctions(['random_int' => true]);
$this->assertRandomInt(0, 9); $this->assertRandomInt(0, 9);
$test = Crypto::randomDigits(1); $test = Crypto::randomDigits(1);
@ -83,39 +49,6 @@ class CryptoTest extends TestCase
} }
} }
/**
* A workaround to replace the PHP native function_exists() with a mocked function
*
* @param string $function_name the Name of the function
*
* @return bool true or false
*/
function function_exists($function_name)
{
global $phpMock;
if (isset($phpMock['function_exists'])) {
$result = call_user_func_array($phpMock['function_exists'], func_get_args());
if ($result !== '__phpunit_continue__') {
return $result;
}
}
return call_user_func_array('\function_exists', func_get_args());
}
/**
* A workaround to replace the PHP native rand() (< 7.0) with a mocked function
*
* @return int
*/
function rand($min, $max)
{
global $phpMock;
if (isset($phpMock['rand'])) {
$result = call_user_func_array($phpMock['rand'], func_get_args());
return $result;
}
}
/** /**
* A workaround to replace the PHP native random_int() (>= 7.0) with a mocked function * A workaround to replace the PHP native random_int() (>= 7.0) with a mocked function
* *