tedkulp/PrivateBin
1
0
Fork 0
mirror of https://github.com/PrivateBin/PrivateBin.git synced 2026-04-18 21:48:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

prefer DirectoryIterator for readability, also test jbo translation, log deletion errors

Browse Source
This commit is contained in:
El RIDO
2025-11-20 09:10:01 +01:00
parent 3146d41609
commit 348d36d6ee
4 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tst/I18nTest.php
+13 -12
View File
@@ -2,6 +2,7 @@
use PHPUnit\Framework\TestCase;
use PrivateBin\I18n;
use PrivateBin\Json;
class I18nMock extends I18n
{
@@ -221,19 +222,19 @@ class I18nTest extends TestCase
{
$messageIds = array();
$languages = array();
$dir = dir(PATH . 'i18n');
while (false !== ($file = $dir->read())) {
if (strlen($file) === 7) {
$language = substr($file, 0, 2);
$languageMessageIds = array_keys(
json_decode(
file_get_contents(PATH . 'i18n' . DIRECTORY_SEPARATOR . $file),
true
)
);
$messageIds = array_unique(array_merge($messageIds, $languageMessageIds));
$languages[$language] = $languageMessageIds;
foreach (new DirectoryIterator(PATH . 'i18n') as $file) {
$fileNameLength = strlen($file->getFilename());
if ($fileNameLength === 7) { // xx.json
$language = substr($file->getFilename(), 0, 2);
} elseif ($fileNameLength === 8) { // jbo.json
$language = substr($file->getFilename(), 0, 3);
} else {
continue;
}
$languageJson = file_get_contents($file->getPathname());
$languageMessageIds = array_keys(Json::decode($languageJson));
$messageIds = array_unique(array_merge($messageIds, $languageMessageIds));
$languages[$language] = $languageMessageIds;
}
foreach ($messageIds as $messageId) {
foreach (array_keys($languages) as $language) {
tst/ViewTest.php
+3 -4
View File
@@ -67,10 +67,9 @@ class ViewTest extends TestCase
$page->assign('CSPHEADER', 'default-src \'none\'');
$page->assign('SRI', array());
$dir = dir(PATH . 'tpl');
while (false !== ($file = $dir->read())) {
if (substr($file, -4) === '.php') {
$template = substr($file, 0, -4);
foreach (new DirectoryIterator(PATH . 'tpl') as $file) {
if ($file->getExtension() === 'php') {
$template = $file->getBasename('.php');
ob_start();
$page->draw($template);
$this->_content[$template] = ob_get_contents();