From 784d60e36844e2b8550f516d99006c2ac6f75424 Mon Sep 17 00:00:00 2001 From: Jeroen De Meerleer Date: Sat, 29 May 2021 15:50:19 +0200 Subject: [PATCH] Resolved some warning and errors --- src/Repository/Job.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Repository/Job.php b/src/Repository/Job.php index 27a0c25..4d88df2 100644 --- a/src/Repository/Job.php +++ b/src/Repository/Job.php @@ -108,14 +108,14 @@ class Job extends Repository if(!empty($job['data']['vars'])) { foreach($job['data']['vars'] as $key => $var) { - $job['data']['basicauth-username'] = str_replace('{' . $key . '}', $var['value'], $job['data']['basicauth-username']); + if (isset($job['data']['basicauth-username'])) $job['data']['basicauth-username'] = str_replace('{' . $key . '}', $var['value'], $job['data']['basicauth-username']); $job['data']['url'] = str_replace('{' . $key . '}', $var['value'], $job['data']['url']); } } $url = $job['data']['url']; $options['http_errors'] = false; - $options['auth'] = [$job['data']['basicauth-username'], $job['data']['basicauth-password']]; + $options['auth'] = isset($job['data']['basicauth-username']) ? [$job['data']['basicauth-username'], $job['data']['basicauth-password']] : NULL; $res = $client->request('GET', $url, $options); $return['exitcode'] = $res->getStatusCode(); @@ -172,11 +172,9 @@ class Job extends Repository $return['exitcode'] = 255; return $return; } - $command .= ';echo "[return_code:$?]"'; - $output = $ssh->exec($command); - preg_match( '/\[return_code:(.*?)\]/', $output, $match ); - $return['output'] = str_replace($match[0] . "\n", '', $output); - $return['exitcode'] = $match[1]; + $return['output'] = $ssh->exec($command); + $return['exitcode'] = $ssh->getExitStatus(); + $return['exitcode'] = (empty($return['exitcode'])) ? 0 : $return['exitcode']; return $return; }