Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-10 05:58:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-09-22 01:42:19 +00:00
parent 662651236e
commit 650789ba16
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Security/EncryptionHelper.php
View File

@ -193,7 +193,9 @@ final class EncryptionHelper
continue; continue;
} }
$ciphertext = \mb_substr($buffer, \SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, null, '8bit'); // $ciphertext = \mb_substr($buffer, \SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, null, '8bit'); Not required due to previous nonce fread
$ciphertext = $buffer;
$plaintext = \sodium_crypto_secretbox_open($ciphertext, $nonce, $secretKey); $plaintext = \sodium_crypto_secretbox_open($ciphertext, $nonce, $secretKey);
if ($plaintext === false) { if ($plaintext === false) {

14
Security/PhpCode.php
View File

@ -92,8 +92,18 @@ final class PhpCode
*/ */
public static function hasUnicode(string $source) : bool public static function hasUnicode(string $source) : bool
{ {
return ((bool) \preg_match("/[\x01-\x7f]/", $source)) $length = \mb_strlen($source, 'UTF-8');
|| ((bool) \preg_match("/(0|\\\)x([a-fA-F0-9]){2}/", $source));
for ($i = 0; $i < $length; ++$i) {
$char = \mb_substr($source, $i, 1, 'UTF-8');
$codePoint = \ord($char);
if ($codePoint > 127) {
return true;
}
}
return false;
} }
/** /**

2
Utils/IO/Spreadsheet/SpreadsheetDatabaseMapper.php
View File

@ -104,8 +104,6 @@ class SpreadsheetDatabaseMapper implements IODatabaseMapper
$cells[] = $workSheet->getCell(StringUtils::intToAlphabet($j) . $line)->getCalculatedValue(); $cells[] = $workSheet->getCell(StringUtils::intToAlphabet($j) . $line)->getCalculatedValue();
} }
\var_dump($cells);
++$line; ++$line;
$query->values(...$cells); $query->values(...$cells);

3
tests/Router/SocketRouterTest.php
View File

@ -15,6 +15,7 @@ declare(strict_types=1);
namespace phpOMS\tests\Router; namespace phpOMS\tests\Router;
use phpOMS\Account\Account; use phpOMS\Account\Account;
use phpOMS\Account\NullAccount;
use phpOMS\Account\PermissionAbstract; use phpOMS\Account\PermissionAbstract;
use phpOMS\Account\PermissionType; use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb; use phpOMS\Router\RouteVerb;
@ -134,7 +135,7 @@ final class SocketRouterTest extends \PHPUnit\Framework\TestCase
PermissionType::READ PermissionType::READ
) extends PermissionAbstract {}; ) extends PermissionAbstract {};
$account = new Account(); $account = new NullAccount(1);
$account->addPermission($perm); $account->addPermission($perm);
self::assertEquals( self::assertEquals(