CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-27 02:31:04 +12:00
Code Issues Projects Releases Wiki Activity

Replace nulls with empty strings

Browse source
This commit is contained in:
Matej Bačo 2022-09-19 11:58:41 +00:00
parent 19eb6c7e50
commit 89afad1a32
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/api/functions.php
View file

@ -1066,21 +1066,21 @@ App::post('/v1/functions/:functionId/executions')
} }
$vars = array_reduce($function['vars'] ?? [], function (array $carry, Document $var) { $vars = array_reduce($function['vars'] ?? [], function (array $carry, Document $var) {
$carry[$var->getAttribute('key')] = $var->getAttribute('value'); $carry[$var->getAttribute('key')] = $var->getAttribute('value') ?? '';
return $carry; return $carry;
}, []); }, []);
$vars = \array_merge($vars, [ $vars = \array_merge($vars, [
'APPWRITE_FUNCTION_ID' => $function->getId(), 'APPWRITE_FUNCTION_ID' => $function->getId() ?? '',
'APPWRITE_FUNCTION_NAME' => $function->getAttribute('name', ''), 'APPWRITE_FUNCTION_NAME' => $function->getAttribute('name', ''),
'APPWRITE_FUNCTION_DEPLOYMENT' => $deployment->getId(), 'APPWRITE_FUNCTION_DEPLOYMENT' => $deployment->getId() ?? '',
'APPWRITE_FUNCTION_TRIGGER' => 'http', 'APPWRITE_FUNCTION_TRIGGER' => 'http',
'APPWRITE_FUNCTION_RUNTIME_NAME' => $runtime['name'], 'APPWRITE_FUNCTION_RUNTIME_NAME' => $runtime['name'] ?? '',
'APPWRITE_FUNCTION_RUNTIME_VERSION' => $runtime['version'], 'APPWRITE_FUNCTION_RUNTIME_VERSION' => $runtime['version'] ?? '',
'APPWRITE_FUNCTION_DATA' => $data, 'APPWRITE_FUNCTION_DATA' => $data ?? '',
'APPWRITE_FUNCTION_PROJECT_ID' => $project->getId(), 'APPWRITE_FUNCTION_PROJECT_ID' => $project->getId() ?? '',
'APPWRITE_FUNCTION_USER_ID' => $user->getId(), 'APPWRITE_FUNCTION_USER_ID' => $user->getId() ?? '',
'APPWRITE_FUNCTION_JWT' => $jwt, 'APPWRITE_FUNCTION_JWT' => $jwt ?? '',
]); ]);
/** Execute function */ /** Execute function */

22
app/workers/functions.php
View file

@ -270,18 +270,18 @@ class FunctionsV1 extends Worker
/** Collect environment variables */ /** Collect environment variables */
$vars = \array_merge($vars, [ $vars = \array_merge($vars, [
'APPWRITE_FUNCTION_ID' => $functionId, 'APPWRITE_FUNCTION_ID' => $functionId ?? '',
'APPWRITE_FUNCTION_NAME' => $function->getAttribute('name', ''), 'APPWRITE_FUNCTION_NAME' => $function->getAttribute('name', ''),
'APPWRITE_FUNCTION_DEPLOYMENT' => $deploymentId, 'APPWRITE_FUNCTION_DEPLOYMENT' => $deploymentId ?? '',
'APPWRITE_FUNCTION_RUNTIME_NAME' => $runtime['name'], 'APPWRITE_FUNCTION_RUNTIME_NAME' => $runtime['name'] ?? '',
'APPWRITE_FUNCTION_RUNTIME_VERSION' => $runtime['version'], 'APPWRITE_FUNCTION_RUNTIME_VERSION' => $runtime['version'] ?? '',
'APPWRITE_FUNCTION_TRIGGER' => $trigger, 'APPWRITE_FUNCTION_TRIGGER' => $trigger ?? '',
'APPWRITE_FUNCTION_EVENT' => $event, 'APPWRITE_FUNCTION_EVENT' => $event ?? '',
'APPWRITE_FUNCTION_EVENT_DATA' => $eventData, 'APPWRITE_FUNCTION_EVENT_DATA' => $eventData ?? '',
'APPWRITE_FUNCTION_DATA' => $data, 'APPWRITE_FUNCTION_DATA' => $data ?? '',
'APPWRITE_FUNCTION_PROJECT_ID' => $project->getId(), 'APPWRITE_FUNCTION_PROJECT_ID' => $project->getId() ?? '',
'APPWRITE_FUNCTION_USER_ID' => $user->getId(), 'APPWRITE_FUNCTION_USER_ID' => $user->getId() ?? '',
'APPWRITE_FUNCTION_JWT' => $jwt, 'APPWRITE_FUNCTION_JWT' => $jwt ?? '',
]); ]);
/** Execute function */ /** Execute function */