Cutlery/beestat
1
0
Fork 0
mirror of https://github.com/beestat/app.git synced 2025-05-31 20:26:32 -04:00
Code Actions Packages Releases Activity

Minor changes for PHP8

Browse Source
This commit is contained in:
Jon Ziebell 2023-01-21 22:01:08 -05:00
parent 5942b04ca9
commit d7146e23ab
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/address.php
View File

@ -71,7 +71,7 @@ class address extends cora\crud {
'smarty_streets', 'smarty_streets',
'smarty_streets_api', 'smarty_streets_api',
[ [
'street' => $address_string, 'address_string' => $address_string,
'country' => $country 'country' => $country
] ]
); );

3
api/cora/database.php
View File

@ -355,6 +355,7 @@ final class database extends \mysqli {
* @return mixed The result directly from $mysqli->query. * @return mixed The result directly from $mysqli->query.
*/ */
public function query($query, $resultmode = null) { public function query($query, $resultmode = null) {
// public function query($query, $result_mode = \MYSQLI_STORE_RESULT): \mysqli_result|bool {
// If this was an insert, update or delete, start a transaction // If this was an insert, update or delete, start a transaction
$query_type = substr(trim($query), 0, 6); $query_type = substr(trim($query), 0, 6);
if( if(
@ -518,7 +519,7 @@ final class database extends \mysqli {
} }
} }
foreach($json_fields as $json_field) { foreach($json_fields as $json_field) {
$row[$json_field] = json_decode($row[$json_field], true); $row[$json_field] = $row[$json_field] === null ? null : json_decode($row[$json_field], true);
} }

11
api/cora/request.php
View File

@ -302,7 +302,7 @@ final class request {
'user_id' => $session->get_user_id(), 'user_id' => $session->get_user_id(),
'api_user_id' => $this->api_user['api_user_id'], 'api_user_id' => $this->api_user['api_user_id'],
'ip_address' => ip2long($_SERVER['REMOTE_ADDR']), 'ip_address' => ip2long($_SERVER['REMOTE_ADDR']),
'timestamp' => date('Y-m-d H:i:s', $this->begin_timestamp), 'timestamp' => date('Y-m-d H:i:s', intval($this->begin_timestamp)),
'request' => $this->request, 'request' => $this->request,
'response' => $this->response, 'response' => $this->response,
'error_code' => $this->response['data']['error_code'], 'error_code' => $this->response['data']['error_code'],
@ -320,7 +320,7 @@ final class request {
'user_id' => $session->get_user_id(), 'user_id' => $session->get_user_id(),
'api_user_id' => $this->api_user['api_user_id'], 'api_user_id' => $this->api_user['api_user_id'],
'ip_address' => ip2long($_SERVER['REMOTE_ADDR']), 'ip_address' => ip2long($_SERVER['REMOTE_ADDR']),
'timestamp' => date('Y-m-d H:i:s', $this->begin_timestamp), 'timestamp' => date('Y-m-d H:i:s', intval($this->begin_timestamp)),
'request' => $this->request, 'request' => $this->request,
'response' => ($user['debug'] === true) ? $this->response : null, 'response' => ($user['debug'] === true) ? $this->response : null,
'total_time' => $this->total_time, 'total_time' => $this->total_time,
@ -522,7 +522,12 @@ final class request {
// Send data to Sentry for error logging. // Send data to Sentry for error logging.
// https://docs.sentry.io/development/sdk-dev/event-payloads/ // https://docs.sentry.io/development/sdk-dev/event-payloads/
$api_user_id = $this->api_user['api_user_id']; if($this->api_user !== null) {
$api_user_id = $this->api_user['api_user_id'];
} else {
$api_user_id = null;
}
if ( if (
$reportable === true && $reportable === true &&
$setting->get('sentry_key') !== null && $setting->get('sentry_key') !== null &&

2
api/runtime.php
View File

@ -195,7 +195,7 @@ class runtime extends cora\api {
'Y-m-d H:i:s', 'Y-m-d H:i:s',
max( max(
$sync_end, $sync_end,
strtotime($thermostat['sync_end']) $thermostat['sync_end'] === null ? null : strtotime($thermostat['sync_end'])
) )
) )
] ]