From 7de3b16dc364a33688fd07bacd281f6136e56ab4 Mon Sep 17 00:00:00 2001 From: Art4 Date: Fri, 1 Nov 2024 21:46:09 +0000 Subject: [PATCH] Fix namespace for CryptoTest --- tests/src/Util/CryptoTest.php | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/tests/src/Util/CryptoTest.php b/tests/src/Util/CryptoTest.php index 7fd5befce5..eeb99b1bb9 100644 --- a/tests/src/Util/CryptoTest.php +++ b/tests/src/Util/CryptoTest.php @@ -6,14 +6,16 @@ // SPDX-License-Identifier: AGPL-3.0-or-later /// @todo Use right namespace - needs alternative way of mocking random_int() -namespace Friendica\Util; +namespace Friendica\Test\src\Util; -use phpseclib\Crypt\RSA; -use phpseclib\Math\BigInteger; +use Friendica\Util\Crypto; +use phpmock\phpunit\PHPMock; use PHPUnit\Framework\TestCase; class CryptoTest extends TestCase { + use PHPMock; + public static function tearDownAfterClass(): void { // Reset mocking @@ -39,6 +41,14 @@ class CryptoTest extends TestCase public function testRandomDigitsRandomInt() { + $random_int = $this->getFunctionMock(__NAMESPACE__, 'random_int'); + $random_int->expects($this->any())->willReturnCallback(function($min, $max) { + global $phpMock; + if (isset($phpMock['random_int'])) { + return call_user_func_array($phpMock['random_int'], func_get_args()); + } + }); + self::assertRandomInt(0, 9); $test = Crypto::randomDigits(1); @@ -78,16 +88,3 @@ class CryptoTest extends TestCase ]; } } - -/** - * A workaround to replace the PHP native random_int() (>= 7.0) with a mocked function - * - * @return int - */ -function random_int($min, $max) -{ - global $phpMock; - if (isset($phpMock['random_int'])) { - return call_user_func_array($phpMock['random_int'], func_get_args()); - } -} -- 2.39.5