mirror of
https://github.com/appwrite/appwrite.git
synced 2026-05-26 13:51:13 +00:00
d2230f8fe7
Raises `phpstan.neon` level from 3 to 4 and fixes the 549 new errors
that level 4 surfaces across 157 files. Fixes are root-cause — no
`@phpstan-ignore`, no `@var` casts, no baseline entries, no widened
types. A handful of latent bugs were fixed along the way:
- `app/controllers/general.php`: path-traversal guard was negating
`\substr(...)` before the strict comparison (`!\substr(...) === $base`
was always `false === $base`). Rewritten as `\substr(...) !== $base`.
- `src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php`
and `.../TablesDB/Logs/XList.php`: were importing the raw Matomo
`DeviceDetector` (whose `getDevice()` returns `?int`) but treating the
result as an array with `deviceName/deviceBrand/deviceModel` keys.
Swapped to `Appwrite\Detector\Detector`, matching the wrapper already
used a few lines below for `$os`/`$client`.
- `src/Appwrite/Platform/Modules/Functions/Workers/Builds.php`: a match
key was checking `$resourceKey === 'functions'` when `$resourceKey`
is `'functionId'|'siteId'` — always false. Switched to the intended
`$resource->getCollection() === 'functions'` check.
- `src/Appwrite/OpenSSL/OpenSSL.php`: `encrypt()` return type tightened
to `string|false` to match `openssl_encrypt`; this lets callers'
`=== false` error handling remain meaningful.
- `app/controllers/api/messaging.php`: removed a dead
`array_key_exists('from', [])` branch in the Msg91 provider (empty
array literal; branch was unreachable).
Large cleanup categories across the 549 fixes:
- Removed redundant `?? default` on array offsets and expressions that
PHPStan now knows are non-nullable.
- Removed unreachable statements (mostly `return;` after `throw` or
`markTestSkipped()`).
- Removed redundant `is_array`/`is_string`/`is_bool`/`instanceof` checks
on already-narrowed types.
- Added `default =>` arms (or throwing arms) to non-exhaustive matches
on `string`/`mixed` input.
- Removed dead `$document === false` branches where method return types
were tightened to non-nullable `Document`.
- Removed unused properties (`$version` on Etsy/Zoom OAuth2, `$paths` on
Installer State, `$source` on MigrationsWorker, `$account2` on two
GraphQL auth tests), unused traits (`ApiVectorsDB`, `DatabaseFixture`),
and an unused `cleanupStaleExecutions` task method.
- Replaced `assertTrue(true)` and redundant `assertIsArray`/`assertIsString`/
`assertNotNull` assertions with `addToAssertionCount(1)` or
`assertNotEmpty` where the runtime type was already known.
202 lines
6.8 KiB
PHP
202 lines
6.8 KiB
PHP
<?php
|
|
|
|
namespace Tests\Unit\Utopia;
|
|
|
|
use Appwrite\Utopia\Response;
|
|
use Exception;
|
|
use PHPUnit\Framework\TestCase;
|
|
use ReflectionProperty;
|
|
use Swoole\Http\Response as SwooleResponse;
|
|
use Tests\Unit\Utopia\Response\Filters\First;
|
|
use Tests\Unit\Utopia\Response\Filters\Second;
|
|
use Utopia\Database\Document;
|
|
|
|
class ResponseTest extends TestCase
|
|
{
|
|
protected ?Response $response = null;
|
|
|
|
public function setUp(): void
|
|
{
|
|
$this->response = new Response(new SwooleResponse());
|
|
$this->response->setModel(new Single());
|
|
$this->response->setModel(new Lists());
|
|
$this->response->setModel(new Nested());
|
|
}
|
|
|
|
public function testFilters(): void
|
|
{
|
|
$this->assertFalse($this->response->hasFilters());
|
|
$this->assertEmpty($this->response->getFilters());
|
|
|
|
$this->response->addFilter(new First());
|
|
$this->response->addFilter(new Second());
|
|
|
|
$this->assertTrue($this->response->hasFilters());
|
|
$this->assertCount(2, $this->response->getFilters());
|
|
|
|
$output = $this->response->applyFilters([
|
|
'initial' => true,
|
|
'first' => false
|
|
], 'test');
|
|
|
|
$this->assertArrayHasKey('initial', $output);
|
|
$this->assertTrue($output['initial']);
|
|
$this->assertArrayHasKey('first', $output);
|
|
$this->assertTrue($output['first']);
|
|
$this->assertArrayHasKey('second', $output);
|
|
$this->assertTrue($output['second']);
|
|
$this->assertArrayNotHasKey('deleted', $output);
|
|
}
|
|
|
|
public function testResponseModel(): void
|
|
{
|
|
$output = $this->response->output(new Document([
|
|
'string' => 'lorem ipsum',
|
|
'integer' => 123,
|
|
'boolean' => true,
|
|
'hidden' => 'secret',
|
|
'array' => [
|
|
'string 1',
|
|
'string 2'
|
|
],
|
|
]), 'single');
|
|
|
|
$this->assertArrayHasKey('string', $output);
|
|
$this->assertArrayHasKey('integer', $output);
|
|
$this->assertArrayHasKey('boolean', $output);
|
|
$this->assertArrayNotHasKey('hidden', $output);
|
|
$this->assertIsArray($output['array']);
|
|
|
|
// test optional array
|
|
$output = $this->response->output(new Document([
|
|
'string' => 'lorem ipsum',
|
|
'integer' => 123,
|
|
'boolean' => true,
|
|
'hidden' => 'secret',
|
|
]), 'single');
|
|
$this->assertArrayHasKey('string', $output);
|
|
$this->assertArrayHasKey('integer', $output);
|
|
$this->assertArrayHasKey('boolean', $output);
|
|
$this->assertArrayNotHasKey('hidden', $output);
|
|
$this->assertArrayHasKey('array', $output);
|
|
$this->assertNull($output['array']);
|
|
|
|
}
|
|
|
|
public function testResponseModelRequired(): void
|
|
{
|
|
$output = $this->response->output(new Document([
|
|
'string' => 'lorem ipsum',
|
|
'integer' => 123,
|
|
'boolean' => true,
|
|
]), 'single');
|
|
|
|
$this->assertArrayHasKey('string', $output);
|
|
$this->assertArrayHasKey('integer', $output);
|
|
$this->assertArrayHasKey('boolean', $output);
|
|
$this->assertArrayHasKey('required', $output);
|
|
$this->assertEquals('default', $output['required']);
|
|
}
|
|
|
|
public function testResponseModelRequiredException(): void
|
|
{
|
|
$this->expectException(Exception::class);
|
|
$this->response->output(new Document([
|
|
'integer' => 123,
|
|
'boolean' => true,
|
|
]), 'single');
|
|
}
|
|
|
|
public function testResponseModelLists(): void
|
|
{
|
|
$output = $this->response->output(new Document([
|
|
'singles' => [
|
|
new Document([
|
|
'string' => 'lorem ipsum',
|
|
'integer' => 123,
|
|
'boolean' => true,
|
|
'hidden' => 'secret'
|
|
])
|
|
],
|
|
'hidden' => 'secret',
|
|
]), 'lists');
|
|
|
|
$this->assertArrayHasKey('singles', $output);
|
|
$this->assertArrayNotHasKey('hidden', $output);
|
|
$this->assertCount(1, $output['singles']);
|
|
|
|
$single = $output['singles'][0];
|
|
$this->assertArrayHasKey('string', $single);
|
|
$this->assertArrayHasKey('integer', $single);
|
|
$this->assertArrayHasKey('boolean', $single);
|
|
$this->assertArrayHasKey('required', $single);
|
|
$this->assertArrayNotHasKey('hidden', $single);
|
|
}
|
|
|
|
public function testResponseModelNested(): void
|
|
{
|
|
$output = $this->response->output(new Document([
|
|
'lists' => new Document([
|
|
'singles' => [
|
|
new Document([
|
|
'string' => 'lorem ipsum',
|
|
'integer' => 123,
|
|
'boolean' => true,
|
|
'hidden' => 'secret'
|
|
])
|
|
],
|
|
'hidden' => 'secret',
|
|
]),
|
|
'single' => new Document([
|
|
'string' => 'lorem ipsum',
|
|
'integer' => 123,
|
|
'boolean' => true,
|
|
'hidden' => 'secret'
|
|
]),
|
|
'hidden' => 'secret',
|
|
]), 'nested');
|
|
|
|
$this->assertArrayHasKey('lists', $output);
|
|
$this->assertArrayHasKey('single', $output);
|
|
$this->assertArrayNotHasKey('hidden', $output);
|
|
$this->assertCount(1, $output['lists']['singles']);
|
|
|
|
|
|
$single = $output['single'];
|
|
$this->assertArrayHasKey('string', $single);
|
|
$this->assertArrayHasKey('integer', $single);
|
|
$this->assertArrayHasKey('boolean', $single);
|
|
$this->assertArrayHasKey('required', $single);
|
|
$this->assertArrayNotHasKey('hidden', $single);
|
|
|
|
$singleFromArray = $output['lists']['singles'][0];
|
|
$this->assertArrayHasKey('string', $singleFromArray);
|
|
$this->assertArrayHasKey('integer', $singleFromArray);
|
|
$this->assertArrayHasKey('boolean', $singleFromArray);
|
|
$this->assertArrayHasKey('required', $single);
|
|
$this->assertArrayNotHasKey('hidden', $singleFromArray);
|
|
}
|
|
|
|
public function testShowSensitiveRestoresPreviousState(): void
|
|
{
|
|
$isShowingSensitive = new ReflectionProperty(Response::class, 'showSensitive');
|
|
|
|
$this->assertFalse($isShowingSensitive->getValue($this->response));
|
|
|
|
$payload = $this->response->showSensitive(function () use ($isShowingSensitive) {
|
|
return [
|
|
'outer' => $isShowingSensitive->getValue($this->response),
|
|
'inner' => $this->response->showSensitive(fn () => [
|
|
'state' => $isShowingSensitive->getValue($this->response),
|
|
]),
|
|
'afterInner' => $isShowingSensitive->getValue($this->response),
|
|
];
|
|
});
|
|
|
|
$this->assertTrue($payload['outer']);
|
|
$this->assertTrue($payload['inner']['state']);
|
|
$this->assertTrue($payload['afterInner']);
|
|
$this->assertFalse($isShowingSensitive->getValue($this->response));
|
|
}
|
|
}
|