GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[FIX] Fix bug in DATABASE.php, since findBy can return different types

Browse Source
This commit is contained in:
Hugo Sales 2020-07-25 01:55:39 +00:00 committed by Hugo Sales
parent 72bf62adc3
commit 7c35fde8bc
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Core/DB/DB.php
View File

@ -34,6 +34,7 @@ use App\Util\Formatting;
use Doctrine\Common\Collections\Criteria; use Doctrine\Common\Collections\Criteria;
use Doctrine\Common\Collections\ExpressionBuilder; use Doctrine\Common\Collections\ExpressionBuilder;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Exception;
abstract class DB abstract class DB
{ {
@ -44,8 +45,8 @@ abstract class DB
} }
private static array $find_by_ops = ['or', 'and', 'eq', 'neq', 'lt', 'lte', private static array $find_by_ops = ['or', 'and', 'eq', 'neq', 'lt', 'lte',
'gt', 'gte', 'is_null', 'in', 'not_in', 'gt', 'gte', 'is_null', 'in', 'not_in',
'contains', 'member_of', 'starts_with', 'ends_with', ]; 'contains', 'member_of', 'starts_with', 'ends_with', ];
private static function buildExpression(ExpressionBuilder $eb, array $criteria) private static function buildExpression(ExpressionBuilder $eb, array $criteria)
{ {
@ -84,7 +85,16 @@ abstract class DB
public static function findOneBy(string $table, array $criteria, ?array $orderBy = null, ?int $offset = null) public static function findOneBy(string $table, array $criteria, ?array $orderBy = null, ?int $offset = null)
{ {
return self::findBy($table, $criteria, $orderBy, 1, $offset)->first(); $res = self::findBy($table, $criteria, $orderBy, 1, $offset);
if (is_array($res)) {
if (count($res)) {
return $res[0];
} else {
throw new Exception("No value in table {$table} matches the requested criteria");
}
} else {
return $res->first();
}
} }
public static function __callStatic(string $name, array $args) public static function __callStatic(string $name, array $args)