demostf/api
1
0
Fork 0
mirror of https://codeberg.org/demostf/api.git synced 2026-06-03 09:54:17 +02:00
Code Issues Releases Wiki Activity

remove depricated dbal usage

Browse source
This commit is contained in:
Robin Appelman 2022-05-15 19:02:48 +02:00
commit eb997b5ba2
7 changed files with 38 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Demo/ChatMessage.php
View file

@ -43,4 +43,12 @@ class ChatMessage implements JsonSerializable {
'message' => $this->message,
];
}
public static function fromRow(array $row): ChatMessage {
return new ChatMessage(
$row['from'],
(int) $row['time'],
$row['text']
);
}
}

12
src/Providers/ChatProvider.php
View file

@ -19,15 +19,11 @@ class ChatProvider extends BaseProvider {
->orderBy('time', 'ASC')
->addOrderBy('id', 'ASC');
$result = $query->execute();
$result = $query->executeQuery();
return array_map(function (array $row) {
return new ChatMessage(
$row['from'],
(int) $row['time'],
$row['text']
);
}, $result->fetchAll());
return ChatMessage::fromRow($row);
}, $result->fetchAllAssociative());
}
public function storeChatMessage(int $demoId, ChatMessage $message): void {
@ -39,6 +35,6 @@ class ChatProvider extends BaseProvider {
'"from"' => $query->createNamedParameter($message->getUser()),
'time' => $query->createNamedParameter($message->getTime(), PDO::PARAM_INT),
]);
$query->execute();
$query->executeStatement();
}
}

16
src/Providers/DemoListProvider.php
View file

@ -17,14 +17,14 @@ class DemoListProvider extends BaseProvider {
*
* @return Demo[]
*/
public function listUploads(string $steamId, int $page, array $where = [], string $order = 'DESC') {
public function listUploads(string $steamId, int $page, array $where = [], string $order = 'DESC'): array {
$query = $this->getQueryBuilder();
$query->select('id')
->from('users')
->where($query->expr()->eq('steamid', $query->createNamedParameter($steamId, PDO::PARAM_STR)));
$result = $query->execute();
$userId = $result->fetch(PDO::FETCH_COLUMN);
$result = $query->executeQuery();
$userId = $result->fetchOne();
$result->free();
$where['uploader'] = $userId;
@ -48,8 +48,8 @@ class DemoListProvider extends BaseProvider {
->from('users')
->where($query->expr()->in('steamid',
$query->createNamedParameter($players, Connection::PARAM_STR_ARRAY)));
$result = $query->execute();
$userIds = $result->fetchAll(PDO::FETCH_COLUMN);
$result = $query->executeQuery();
$userIds = $result->fetchFirstColumn();
$result->free();
$query = $this->getQueryBuilder();
@ -80,8 +80,8 @@ class DemoListProvider extends BaseProvider {
$this->addWhere($query, $where);
}
$result = $query->execute();
$demoIds = $result->fetchAll(PDO::FETCH_COLUMN);
$result = $query->executeQuery();
$demoIds = $result->fetchFirstColumn();
$result->free();
$query = $this->getQueryBuilder();
@ -149,7 +149,7 @@ class DemoListProvider extends BaseProvider {
->setMaxResults(50)
->setFirstResult($offset);
$demos = $query->execute()->fetchAll(PDO::FETCH_ASSOC);
$demos = $query->executeQuery()->fetchAllAssociative();
return $this->formatList($demos);
}

10
src/Providers/DemoProvider.php
View file

@ -26,7 +26,7 @@ class DemoProvider extends BaseProvider {
$query->select('*')
->from('demos')
->where($query->expr()->eq('id', $query->createNamedParameter($id, PDO::PARAM_INT)));
$row = $query->execute()->fetch();
$row = $query->executeQuery()->fetchAssociative();
return $row ? Demo::fromRow($row) : null;
}
@ -47,7 +47,7 @@ class DemoProvider extends BaseProvider {
if ($fetchDetails) {
$uploader = $this->userProvider->getById($demo->getUploader());
$playerQuery = $this->connection->executeQuery($sql, [$demo->getId()]);
$players = $playerQuery->fetchAll(PDO::FETCH_ASSOC);
$players = $playerQuery->fetchAllAssociative();
$demo->setUploaderUser($uploader);
$uniquePlayers = [];
@ -71,7 +71,7 @@ class DemoProvider extends BaseProvider {
->from('demos')
->where($query->expr()->eq('hash', $query->createNamedParameter($hash)));
return (int) $query->execute()->fetchOne();
return (int) $query->executeQuery()->fetchOne();
}
public function storeDemo(Demo $demo, string $backend, string $path): int {
@ -97,7 +97,7 @@ class DemoProvider extends BaseProvider {
'"playerCount"' => $query->createNamedParameter($demo->getPlayerCount(), PDO::PARAM_INT),
'hash' => $query->createNamedParameter($demo->getHash()),
])
->execute();
->executeStatement();
return (int) $this->connection->lastInsertId();
}
@ -109,6 +109,6 @@ class DemoProvider extends BaseProvider {
->set('url', $query->createNamedParameter($url))
->set('path', $query->createNamedParameter($path))
->where($query->expr()->eq('id', $query->createNamedParameter($id, PDO::PARAM_INT)))
->execute();
->executeStatement();
}
}

6
src/Providers/InfoProvider.php
View file

@ -15,9 +15,9 @@ class InfoProvider extends BaseProvider {
$query->select('map')
->from('map_list')
->orderBy('count', 'DESC');
$result = $query->execute();
$result = $query->executeQuery();
return $result->fetchAll(PDO::FETCH_COLUMN);
return $result->fetchFirstColumn();
}
private function count(string $table): int {
@ -25,7 +25,7 @@ class InfoProvider extends BaseProvider {
$query->select('count(*)')
->from($table);
return $query->execute()->fetch(PDO::FETCH_COLUMN);
return $query->executeQuery()->fetchOne();
}
/**

2
src/Providers/PlayerProvider.php
View file

@ -21,7 +21,7 @@ class PlayerProvider extends BaseProvider {
'assists' => $query->createNamedParameter($player->getAssists()),
'deaths' => $query->createNamedParameter($player->getDeaths()),
]);
$query->execute();
$query->executeStatement();
return (int) $this->connection->lastInsertId();
}

18
src/Providers/UserProvider.php
View file

@ -38,7 +38,7 @@ class UserProvider extends BaseProvider {
'avatar' => $query->createNamedParameter(''),
'token' => $query->createNamedParameter($token),
])->add('orderBy', 'ON CONFLICT DO NOTHING')// hack to append arbitrary string to sql
->execute();
->executeStatement();
$user = $this->get($steamId->getSteamId64());
@ -53,7 +53,7 @@ class UserProvider extends BaseProvider {
->from('users_named')
->where($query->expr()->eq('steamid', $query->createNamedParameter($steamid)));
$row = $query->execute()->fetch();
$row = $query->executeQuery()->fetchAssociative();
if (!$row) {
// if the user is newly inserted it wont be in our view yet
@ -63,7 +63,7 @@ class UserProvider extends BaseProvider {
->from('users')
->where($query->expr()->eq('steamid', $query->createNamedParameter($steamid)));
$row = $query->execute()->fetch();
$row = $query->executeQuery()->fetchAssociative();
}
return $row ? User::fromRow($row) : null;
@ -80,7 +80,7 @@ class UserProvider extends BaseProvider {
->from('users_named')
->where($query->expr()->eq('id', $query->createNamedParameter($userId, \PDO::PARAM_INT)));
$row = $query->execute()->fetch();
$row = $query->executeQuery()->fetchAssociative();
if (!$row) {
// if the user is newly inserted it wont be in our view yet
@ -90,7 +90,7 @@ class UserProvider extends BaseProvider {
->from('users')
->where($query->expr()->eq('id', $query->createNamedParameter($userId, \PDO::PARAM_INT)));
$row = $query->execute()->fetch();
$row = $query->executeQuery()->fetchAssociative();
}
return $row ? User::fromRow($row) : null;
@ -106,7 +106,7 @@ class UserProvider extends BaseProvider {
->orderBy('count(demo_id)', 'DESC')
->setMaxResults(1);
$row = $query->execute()->fetch();
$row = $query->executeQuery()->fetchAssociative();
if ($row) {
return new SteamUser($row['id'], $row['steamid'], $row['name']);
} else {
@ -132,8 +132,8 @@ class UserProvider extends BaseProvider {
->orWhere($query->expr()->comparison('name', '~*', $nameParameter))
->orderBy('count', 'DESC')
->setMaxResults(100);
$result = $query->execute();
$players = $result->fetchAll(PDO::FETCH_ASSOC);
$result = $query->executeQuery();
$players = $result->fetchAllAssociative();
usort($players, function ($b, $a) use ($query) {
if ($a['steamid'] === $query && $a['steamid'] !== $query) {
@ -166,7 +166,7 @@ class UserProvider extends BaseProvider {
->from('users')
->where($query->expr()->eq('token', $query->createNamedParameter($key)));
$row = $query->execute()->fetch();
$row = $query->executeQuery()->fetchAssociative();
return $row ? User::fromRow($row) : null;
}