iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Db::selectOne() should return null if result is empty

This commit is contained in:
Igor Scheller 2018-08-29 18:08:45 +02:00
parent 6ee738f82b
commit 175c335810
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/model/Shifts_model.php
View File

@ -182,7 +182,7 @@ function NeededAngeltypes_by_ShiftsFilter(ShiftsFilter $shiftsFilter)
/** /**
* @param array $shift * @param array $shift
* @param array $angeltype * @param array $angeltype
* @return array * @return array|null
*/ */
function NeededAngeltype_by_Shift_and_Angeltype($shift, $angeltype) function NeededAngeltype_by_Shift_and_Angeltype($shift, $angeltype)
{ {

2
includes/pages/user_myshifts.php
View File

@ -71,7 +71,7 @@ function user_myshifts()
$shifts_user['UID'], $shifts_user['UID'],
] ]
); );
if (count($shift) > 0) { if (!empty($shift)) {
$freeloaded = $shift['freeloaded']; $freeloaded = $shift['freeloaded'];
$freeload_comment = $shift['freeload_comment']; $freeload_comment = $shift['freeload_comment'];

9
src/Database/Db.php
View File

@ -45,14 +45,19 @@ class Db
* *
* @param string $query * @param string $query
* @param array $bindings * @param array $bindings
* @return array * @return array|null
*/ */
public static function selectOne($query, array $bindings = []) public static function selectOne($query, array $bindings = [])
{ {
$result = self::connection()->selectOne($query, $bindings); $result = self::connection()->selectOne($query, $bindings);
// @TODO: remove typecast // @TODO: remove typecast
return (array)$result; $result = (array)$result;
if (empty($result)) {
return null;
}
return $result;
} }
/** /**