bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-25 08:00:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated php unit tests to support php 8

Browse Source 
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO 2022-09-14 21:04:57 +02:00
parent 85ccca9acb
commit 08ed11d517
4 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.php.in
View File

@ -360,7 +360,7 @@ define('NOW', time());
* normally you don't have to change anything below * normally you don't have to change anything below
*/ */
require_once 'SYSCONFDIR/piler/config-site.php'; if(file_exists('SYSCONFDIR/piler/config-site.php')) { require_once 'SYSCONFDIR/piler/config-site.php'; }
ini_set('session.cookie_lifetime', $config['SESSION_EXPIRY']); ini_set('session.cookie_lifetime', $config['SESSION_EXPIRY']);

3
webui/system/language.php
View File

@ -12,8 +12,11 @@ class Language {
if($session->get("lang")) { if($session->get("lang")) {
$file = DIR_LANGUAGE . $session->get("lang") . '/messages.php'; $file = DIR_LANGUAGE . $session->get("lang") . '/messages.php';
if(defined('LANG')) {}
else {
define('LANG', $session->get("lang")); define('LANG', $session->get("lang"));
} }
}
else { else {
$pref_langs = $this->get_preferred_languages(); $pref_langs = $this->get_preferred_languages();

21
webui/tests/EmailTest.php
View File

@ -2,12 +2,11 @@
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
define('DIR_BASE', $_ENV['DIR_BASE']); require_once dirname(dirname(__FILE__)) . '/config.php';
define('MAX_EMAIL_LEN', 41); require_once dirname(dirname(__FILE__)) . '/system/model.php';
require_once dirname(dirname(__FILE__)) . '/system/loader.php';
include_once(DIR_BASE . "system/model.php"); require_once dirname(dirname(__FILE__)) . '/system/language.php';
include_once(DIR_BASE . "model/search/search.php"); require_once dirname(dirname(__FILE__)) . '/system/misc.php';
final class SearchSearchTest extends TestCase { final class SearchSearchTest extends TestCase {
@ -27,7 +26,15 @@ final class SearchSearchTest extends TestCase {
*/ */
public function test_get_boundary($input, $expected_result) { public function test_get_boundary($input, $expected_result) {
$result = ModelSearchSearch::fix_email_address_for_sphinx($input); $loader = new Loader();
Registry::set('load', $loader);
$language = new Language();
Registry::set('language', $language);
$loader->load->model('search/search');
$m = new ModelSearchSearch();
$result = $m->fix_email_address_for_sphinx($input);
$this->assertEquals($result, $expected_result); $this->assertEquals($result, $expected_result);
} }

18
webui/tests/FormatTest.php
View File

@ -2,9 +2,11 @@
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
include_once("system/model.php"); require_once dirname(dirname(__FILE__)) . '/config.php';
include_once("system/misc.php"); require_once dirname(dirname(__FILE__)) . '/system/model.php';
include_once("model/health/health.php"); require_once dirname(dirname(__FILE__)) . '/system/loader.php';
require_once dirname(dirname(__FILE__)) . '/system/language.php';
require_once dirname(dirname(__FILE__)) . '/system/misc.php';
final class FormatTest extends TestCase final class FormatTest extends TestCase
{ {
@ -22,7 +24,15 @@ final class FormatTest extends TestCase
*/ */
public function test_format_time_1($timeval, $expected_result) { public function test_format_time_1($timeval, $expected_result) {
$result = ModelHealthHealth::format_time($timeval); $loader = new Loader();
Registry::set('load', $loader);
$language = new Language();
Registry::set('language', $language);
$loader->load->model('health/health');
$m = new ModelHealthHealth();
$result = $m->format_time($timeval);
$this->assertEquals($result, $expected_result); $this->assertEquals($result, $expected_result);
} }