Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

update: use helpers.

Browse Source
This commit is contained in:
Darshan
2026-01-26 18:06:36 +05:30
parent cff11cae5a
commit f59796e290
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Appwrite/Platform/Installer/HttpHandler.php
+7 -2
View File
@@ -152,7 +152,7 @@ class HttpHandler
}
$data = $this->state->readProgressFile($installId);
if (is_array($data) && isset($data['payload']) && is_array($data['payload'])) {
if ($this->hasPayload($data)) {
unset($data['payload']['opensslKey'], $data['payload']['assistantOpenAIKey']);
}
echo json_encode(['success' => true, 'progress' => $data]);
@@ -413,7 +413,7 @@ class HttpHandler
'_APP_ASSISTANT_OPENAI_API_KEY' => $input['assistantOpenAIKey'] ?? '',
];
if (is_array($existing) && isset($existing['payload']) && is_array($existing['payload'])) {
if ($this->hasPayload($existing)) {
$stored = $existing['payload'];
$fieldsToCompare = [
'httpPort',
@@ -636,6 +636,11 @@ class HttpHandler
return $details;
}
private function hasPayload(mixed $data): bool
{
return is_array($data) && isset($data['payload']) && is_array($data['payload']);
}
private function handleInstallationError(\Throwable $e, string $installId, bool $wantsStream): void
{
http_response_code(self::HTTP_INTERNAL_SERVER_ERROR);
src/Appwrite/Platform/Installer/Runtime/Config.php
+11 -7
View File
@@ -41,16 +41,16 @@ final class Config
public function apply(array $values): void
{
if (array_key_exists('defaultHttpPort', $values) && $values['defaultHttpPort'] !== null && $values['defaultHttpPort'] !== '') {
if ($this->hasValidStringValue($values, 'defaultHttpPort')) {
$this->setDefaultHttpPort((string) $values['defaultHttpPort']);
}
if (array_key_exists('defaultHttpsPort', $values) && $values['defaultHttpsPort'] !== null && $values['defaultHttpsPort'] !== '') {
if ($this->hasValidStringValue($values, 'defaultHttpsPort')) {
$this->setDefaultHttpsPort((string) $values['defaultHttpsPort']);
}
if (array_key_exists('organization', $values) && $values['organization'] !== null && $values['organization'] !== '') {
if ($this->hasValidStringValue($values, 'organization')) {
$this->setOrganization((string) $values['organization']);
}
if (array_key_exists('image', $values) && $values['image'] !== null && $values['image'] !== '') {
if ($this->hasValidStringValue($values, 'image')) {
$this->setImage((string) $values['image']);
}
if (array_key_exists('noStart', $values) && $values['noStart'] !== null) {
@@ -69,15 +69,19 @@ final class Config
$hostPath = $values['hostPath'];
$this->setHostPath($hostPath !== null && $hostPath !== '' ? (string) $hostPath : null);
}
if (array_key_exists('lockedDatabase', $values) && $values['lockedDatabase'] !== null && $values['lockedDatabase'] !== '') {
$locked = $values['lockedDatabase'];
$this->setLockedDatabase($locked !== null && $locked !== '' ? (string) $locked : null);
if ($this->hasValidStringValue($values, 'lockedDatabase')) {
$this->setLockedDatabase((string) $values['lockedDatabase']);
}
if (array_key_exists('vars', $values) && is_array($values['vars'])) {
$this->setVars($values['vars']);
}
}
private function hasValidStringValue(array $values, string $key): bool
{
return array_key_exists($key, $values) && $values[$key] !== null && $values[$key] !== '';
}
private function containsKnownKeys(array $values): bool
{
foreach (self::KNOWN_KEYS as $key) {