Jeppe B
ab6c3ba5b6
## Root cause `route_t::hasPermission()` and `requirePermission()` are instance methods. Route code was invoking them with `self::`; the new XL Vask hall-scope helper made that call from a genuinely static context, causing PHP to throw: `Non-static method routes\\xlvaskUsageLogsRoute::hasPermission() cannot be called statically` ## Changes - Invoke route permission methods through `$this` across all 273 executable legacy calls in 45 route classes. - Make `xlvaskUsageLogsRoute::allowedHallIdsForUser()` an instance helper and update all 13 callers. - Preserve the existing all-scope and own-scope hall selection rules. - Add a token-aware regression test that rejects executable `self::hasPermission()` and `self::requirePermission()` calls, while ignoring comments. - Add focused XL Vask tests for global scanner hall scope and group-limited own scope. - Update affected route contract assertions to the instance-call form. ## Verification - PHP lint: all 53 changed PHP files - Focused PHPStan: changed XL Vask route and both new regression tests — clean - Focused regression slice: 58 passed, 748 assertions - Full local unit suite: 1,300 passed, 9,442 assertions (1 unrelated existing warning, 1 environment skip) - Full local API suite: 285 passed, 11,704 assertions - Exact-SHA GitHub Tests workflow: all 7 jobs passed (unit, API, integration, legacy, edge gateway, and supporting checks) - Independent exact-SHA QA gate: PASS, no findings - Independent exact-SHA security gate: PASS, no findings - Independent exact-SHA reviewer gate: PASS, no findings - Remote comparison: exactly one commit ahead of `40b104abed7723a7d1b7028190ecda0e7aeef829`; all 53 remote blob hashes matched the reviewed worktree ## Delivery state Draft only for human review. No merge or deployment is included. Qodana is skipped while the PR remains draft and is therefore not represented as a passed gate.
81 lines
2.9 KiB
PHP
81 lines
2.9 KiB
PHP
<?php
|
|
|
|
namespace routes;
|
|
|
|
use classes\bird;
|
|
use traits\bird_route_helpers_t;
|
|
use traits\route_t;
|
|
|
|
class birdNumbersRoute
|
|
{
|
|
use route_t, bird_route_helpers_t;
|
|
|
|
public function run(): void
|
|
{
|
|
// List owned numbers
|
|
$this->get('/bird/numbers', function () {
|
|
global $response;
|
|
// Permission: list numbers via Bird
|
|
$this->requirePermission('modules_bird_numbers_list');
|
|
$client = new bird();
|
|
$ws = $this->normalizeOptionalString($this->fromQuery('workspaceId'));
|
|
if ($ws === '') {
|
|
$ws = $this->getConfiguredWorkspaceId($client);
|
|
}
|
|
if ($ws === '') {
|
|
$response->error('Missing required parameter: workspaceId', 400);
|
|
}
|
|
$query = $this->getParametersAsArray();
|
|
unset($query['workspaceId']);
|
|
$res = $client->listNumbers($ws, $query);
|
|
$response->success($res ?? []);
|
|
}, [
|
|
'modules_bird_numbers_list' => 'List your numbers via Bird',
|
|
]);
|
|
|
|
// Get a specific number by ID
|
|
$this->get('/bird/numbers/{id}', function () {
|
|
global $response;
|
|
$this->requirePermission('modules_bird_numbers_get');
|
|
$id = (string)$this->fromRoute('id');
|
|
if ($id === '') {
|
|
$response->error('Missing id', 400);
|
|
}
|
|
$client = new bird();
|
|
$ws = $this->normalizeOptionalString($this->fromQuery('workspaceId'));
|
|
if ($ws === '') {
|
|
$ws = $this->getConfiguredWorkspaceId($client);
|
|
}
|
|
if ($ws === '') {
|
|
$response->error('Missing required parameter: workspaceId', 400);
|
|
}
|
|
$res = $client->getNumber($ws, $id);
|
|
$response->success($res ?? []);
|
|
}, [
|
|
'modules_bird_numbers_get' => 'Get a number by ID via Bird',
|
|
]);
|
|
|
|
// Release/delete a number by ID (if supported in your Bird account)
|
|
$this->delete('/bird/numbers/{id}', function () {
|
|
global $response;
|
|
$this->requirePermission('modules_bird_numbers_delete');
|
|
$id = (string)$this->fromRoute('id');
|
|
if ($id === '') {
|
|
$response->error('Missing id', 400);
|
|
}
|
|
$client = new bird();
|
|
$ws = $this->normalizeOptionalString($this->fromRequest('workspaceId') ?? $this->fromQuery('workspaceId'));
|
|
if ($ws === '') {
|
|
$ws = $this->getConfiguredWorkspaceId($client);
|
|
}
|
|
if ($ws === '') {
|
|
$response->error('Missing required parameter: workspaceId', 400);
|
|
}
|
|
$res = $client->deleteNumber($ws, $id);
|
|
$response->success($res ?? ['status' => 'ok']);
|
|
}, [
|
|
'modules_bird_numbers_delete' => 'Delete/release a number via Bird',
|
|
]);
|
|
}
|
|
}
|