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

[CORE][DB] Rename parameters 'orderBy' to 'order_by'

Browse Source
This commit is contained in:
Hugo Sales 2021-11-26 23:30:20 +00:00
parent 42f40f9ebe
commit cdc8886bb8
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -193,17 +193,17 @@ class DB
* `['and' => ['lt' => ['foo' => 4], 'gte' => ['bar' => 2]]]` or * `['and' => ['lt' => ['foo' => 4], 'gte' => ['bar' => 2]]]` or
* `['in' => ['foo', 'bar']]` * `['in' => ['foo', 'bar']]`
*/ */
public static function findBy(string $table, array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array public static function findBy(string $table, array $criteria, ?array $order_by = null, ?int $limit = null, ?int $offset = null): array
{ {
$criteria = array_change_key_case($criteria, \CASE_LOWER); $criteria = array_change_key_case($criteria, \CASE_LOWER);
$ops = array_intersect(array_keys($criteria), self::$find_by_ops); $ops = array_intersect(array_keys($criteria), self::$find_by_ops);
/** @var EntityRepository */ /** @var EntityRepository */
$repo = self::getRepository($table); $repo = self::getRepository($table);
if (empty($ops)) { if (empty($ops)) {
return $repo->findBy($criteria, $orderBy, $limit, $offset); return $repo->findBy($criteria, $order_by, $limit, $offset);
} else { } else {
$eb = Criteria::expr(); $eb = Criteria::expr();
$criteria = new Criteria($eb->andX(...self::buildExpression($eb, $criteria)), $orderBy, $offset, $limit); $criteria = new Criteria($eb->andX(...self::buildExpression($eb, $criteria)), $order_by, $offset, $limit);
return $repo->matching($criteria)->toArray(); // Always work with array or it becomes really complicated return $repo->matching($criteria)->toArray(); // Always work with array or it becomes really complicated
} }
} }
@ -211,9 +211,9 @@ class DB
/** /**
* Return the first element of the result of @see self::findBy * Return the first element of the result of @see self::findBy
*/ */
public static function findOneBy(string $table, array $criteria, ?array $orderBy = null, ?int $offset = null) public static function findOneBy(string $table, array $criteria, ?array $order_by = null, ?int $offset = null)
{ {
$res = self::findBy($table, $criteria, $orderBy, 2, $offset); // Use limit 2 to check for consistency $res = self::findBy($table, $criteria, $order_by, 2, $offset); // Use limit 2 to check for consistency
switch (\count($res)) { switch (\count($res)) {
case 0: case 0:
throw new NotFoundException("No value in table {$table} matches the requested criteria"); throw new NotFoundException("No value in table {$table} matches the requested criteria");