From df9ec711c52d7724389c64a69fe080bb4f30128f Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 23 May 2024 11:58:54 +0200 Subject: [PATCH] fix: JSON_UNESCAPED_UNICODE --- app/Actions/CoolifyTask/RunRemoteProcess.php | 8 ++++---- app/Jobs/ServerStatusJob.php | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/Actions/CoolifyTask/RunRemoteProcess.php b/app/Actions/CoolifyTask/RunRemoteProcess.php index 2c90750e67..f8a613bfb2 100644 --- a/app/Actions/CoolifyTask/RunRemoteProcess.php +++ b/app/Actions/CoolifyTask/RunRemoteProcess.php @@ -60,7 +60,7 @@ public static function decodeOutput(?Activity $activity = null): string $decoded = json_decode( data_get($activity, 'description'), associative: true, - flags: JSON_THROW_ON_ERROR + flags: JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE ); } catch (\JsonException $exception) { return ''; @@ -164,7 +164,7 @@ protected function elapsedTime(): int public function encodeOutput($type, $output) { - $outputStack = json_decode($this->activity->description, associative: true, flags: JSON_THROW_ON_ERROR); + $outputStack = json_decode($this->activity->description, associative: true, flags: JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE); $outputStack[] = [ 'type' => $type, @@ -174,12 +174,12 @@ public function encodeOutput($type, $output) 'order' => $this->getLatestCounter(), ]; - return json_encode($outputStack, flags: JSON_THROW_ON_ERROR); + return json_encode($outputStack, flags: JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE); } protected function getLatestCounter(): int { - $description = json_decode($this->activity->description, associative: true, flags: JSON_THROW_ON_ERROR); + $description = json_decode($this->activity->description, associative: true, flags: JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE); if ($description === null || count($description) === 0) { return 1; } diff --git a/app/Jobs/ServerStatusJob.php b/app/Jobs/ServerStatusJob.php index aa4dced8e4..5266b0842d 100644 --- a/app/Jobs/ServerStatusJob.php +++ b/app/Jobs/ServerStatusJob.php @@ -57,7 +57,6 @@ public function handle() } private function check_docker_engine() { - ray('Checking Docker Engine'); $version = instant_remote_process([ "docker info", ], $this->server, false);