From 0970d784ff895ca0b67cbfa79189075f78c3d729 Mon Sep 17 00:00:00 2001 From: Khushboo Verma <43381712+vermakhushboo@users.noreply.github.com> Date: Tue, 16 Jul 2024 16:10:17 +0530 Subject: [PATCH 1/4] Handle false appended to string --- docker-compose.yml | 2 +- src/Appwrite/Utopia/Fetch/BodyMultipart.php | 2 +- src/Executor/Executor.php | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7be1225eaa..225ee073f7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -851,7 +851,7 @@ services: hostname: exc1 <<: *x-logging stop_signal: SIGINT - image: openruntimes/executor:0.6.1 + image: openruntimes/executor:0.6.2 restart: unless-stopped networks: - appwrite diff --git a/src/Appwrite/Utopia/Fetch/BodyMultipart.php b/src/Appwrite/Utopia/Fetch/BodyMultipart.php index 3869150758..170de835a7 100644 --- a/src/Appwrite/Utopia/Fetch/BodyMultipart.php +++ b/src/Appwrite/Utopia/Fetch/BodyMultipart.php @@ -136,7 +136,7 @@ class BodyMultipart } $query .= $eol . $eol; - $query .= $value . $eol; + $query .= $value == false ? 0 . $eol : $value . $eol; $query .= '--' . $this->boundary; } diff --git a/src/Executor/Executor.php b/src/Executor/Executor.php index 29ed756932..72b2b9f968 100644 --- a/src/Executor/Executor.php +++ b/src/Executor/Executor.php @@ -162,6 +162,7 @@ class Executor * @param string $source * @param string $entrypoint * @param string $runtimeEntrypoint + * @param bool $logging * * @return array */ From 81eb0f85073c7612029b338cc3d8828169bc66d8 Mon Sep 17 00:00:00 2001 From: Khushboo Verma <43381712+vermakhushboo@users.noreply.github.com> Date: Tue, 16 Jul 2024 16:33:34 +0530 Subject: [PATCH 2/4] Small fix --- src/Appwrite/Utopia/Fetch/BodyMultipart.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Appwrite/Utopia/Fetch/BodyMultipart.php b/src/Appwrite/Utopia/Fetch/BodyMultipart.php index 170de835a7..dab7773565 100644 --- a/src/Appwrite/Utopia/Fetch/BodyMultipart.php +++ b/src/Appwrite/Utopia/Fetch/BodyMultipart.php @@ -136,7 +136,7 @@ class BodyMultipart } $query .= $eol . $eol; - $query .= $value == false ? 0 . $eol : $value . $eol; + $query .= $value === false ? 0 . $eol : $value . $eol; $query .= '--' . $this->boundary; } From e42e7e91fb74945ea22c85c30c85e04ee35782af Mon Sep 17 00:00:00 2001 From: Khushboo Verma <43381712+vermakhushboo@users.noreply.github.com> Date: Tue, 16 Jul 2024 19:19:38 +0530 Subject: [PATCH 3/4] Update compose.phtml as well --- app/views/install/compose.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index fb88db4f39..64682ab896 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -765,7 +765,7 @@ $image = $this->getParam('image', ''); <<: *x-logging restart: unless-stopped stop_signal: SIGINT - image: openruntimes/executor:0.5.5 + image: openruntimes/executor:0.6.2 networks: - appwrite - runtimes From 57bd180fd404c1d614f72a74ef9ab9a1ca5e1afa Mon Sep 17 00:00:00 2001 From: Khushboo Verma <43381712+vermakhushboo@users.noreply.github.com> Date: Mon, 29 Jul 2024 11:22:32 +0530 Subject: [PATCH 4/4] Make code verbose --- src/Appwrite/Utopia/Fetch/BodyMultipart.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Appwrite/Utopia/Fetch/BodyMultipart.php b/src/Appwrite/Utopia/Fetch/BodyMultipart.php index dab7773565..c697b4e5c0 100644 --- a/src/Appwrite/Utopia/Fetch/BodyMultipart.php +++ b/src/Appwrite/Utopia/Fetch/BodyMultipart.php @@ -136,7 +136,11 @@ class BodyMultipart } $query .= $eol . $eol; - $query .= $value === false ? 0 . $eol : $value . $eol; + if ($value === false) { + $query .= 0 . $eol; + } else { + $query .= $value . $eol; + } $query .= '--' . $this->boundary; }