mirror of
https://github.com/Vateron-Media/XC_VM.git
synced 2026-09-17 12:01:38 +02:00
Divarion_D
a788a450a5
Admin-API boot runs ResellerAPI::init() on the login page (pre-auth), where the $rPermissions global is still null. It passes that null straight into ServerRepository::getStreamingSimple()/getProxySimple(), whose strict `array $rPermissions` hint turned it into a fatal TypeError at boot: ServerRepository::getStreamingSimple(): Argument #1 ($rPermissions) must be of type array, null given, called in .../ResellerAPI.php on line 72 Both methods only read $rPermissions via isset($rPermissions['is_reseller']), so null is functionally equivalent to "no reseller restriction". Make the param `?array $rPermissions = null` on both (restoring pre-typing tolerance) rather than patching all ~28 call sites that feed the global. The strict `array` type stays on every other repository method that runs post-auth with a real array. Add ServerRepositorySimpleTest as a regression (null perms, online filter, reseller name masking, proxy list) against the SQLite TestDb.
62 lines
2.3 KiB
PHP
62 lines
2.3 KiB
PHP
<?php
|
|
|
|
use XcVm\Domain\Server\ServerRepository;
|
|
use PHPUnit\Framework\TestCase;
|
|
|
|
/**
|
|
* ServerRepository::getStreamingSimple / getProxySimple — server lists for the
|
|
* admin/reseller UI, filtered by permissions.
|
|
*
|
|
* Regression: these run during admin-API boot on the login page, where the
|
|
* $rPermissions global is still null. A strict `array $rPermissions` hint made
|
|
* that a fatal TypeError at boot; the parameter must accept null (the methods
|
|
* only read it via isset()). Also covers the online filter and reseller name
|
|
* masking. Driven against the SQLite TestDb via setDb().
|
|
*/
|
|
final class ServerRepositorySimpleTest extends TestCase {
|
|
|
|
private TestDb $db;
|
|
|
|
protected function setUp(): void {
|
|
$this->db = new TestDb();
|
|
$now = time();
|
|
$this->db->exec(
|
|
'CREATE TABLE servers (id INTEGER PRIMARY KEY, server_type INTEGER, status INTEGER, last_check_ago INTEGER, is_main INTEGER, `order` INTEGER, server_name TEXT);'
|
|
);
|
|
$this->db->query(
|
|
'INSERT INTO servers (id, server_type, status, last_check_ago, is_main, `order`, server_name) VALUES
|
|
(1, 0, 1, ?, 0, 0, "Stream-1"),
|
|
(2, 0, 2, ?, 0, 0, "Stream-2"),
|
|
(3, 1, 1, ?, 0, 0, "Proxy-1");',
|
|
$now,
|
|
$now - 100000,
|
|
$now
|
|
);
|
|
ServerRepository::setDb($this->db);
|
|
}
|
|
|
|
public function testGetStreamingSimpleAcceptsNullPermissions(): void {
|
|
// Regression: null perms (login-page boot) must not throw.
|
|
$servers = ServerRepository::getStreamingSimple(null);
|
|
|
|
$this->assertSame([1], array_keys($servers), 'only the online streaming server');
|
|
$this->assertSame('Stream-1', $servers[1]['server_name'], 'name not masked without reseller perms');
|
|
}
|
|
|
|
public function testGetStreamingSimpleAllTypeReturnsOfflineToo(): void {
|
|
$servers = ServerRepository::getStreamingSimple(null, 'all');
|
|
$this->assertSame([1, 2], array_keys($servers), 'both streaming servers, proxy excluded');
|
|
}
|
|
|
|
public function testGetStreamingSimpleMasksNamesForResellers(): void {
|
|
$servers = ServerRepository::getStreamingSimple(['is_reseller' => 1], 'all');
|
|
$this->assertSame('Server #1', $servers[1]['server_name']);
|
|
$this->assertSame('Server #2', $servers[2]['server_name']);
|
|
}
|
|
|
|
public function testGetProxySimpleAcceptsNullPermissions(): void {
|
|
$proxies = ServerRepository::getProxySimple(null);
|
|
$this->assertSame([3], array_keys($proxies), 'only proxy-type servers');
|
|
}
|
|
}
|