diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2021-01-03 15:28:31 +0100 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2021-01-08 11:45:19 +0100 |
| commit | 8b64e92b9262d2a2eec6345685ce421050f95c66 (patch) | |
| tree | dd51490b8a184b2643414d11867a9fa450aa5065 /lib/private/Files/Cache/Cache.php | |
| parent | 84e6e9f7cf19207041925eaa237d24e1c12c2c2d (diff) | |
| download | nextcloud-server-8b64e92b9262d2a2eec6345685ce421050f95c66.tar.gz nextcloud-server-8b64e92b9262d2a2eec6345685ce421050f95c66.zip | |
Bump doctrine/dbal from 2.12.0 to 3.0.0
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'lib/private/Files/Cache/Cache.php')
| -rw-r--r-- | lib/private/Files/Cache/Cache.php | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index dbe0dd9d778..2513abd525f 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -39,8 +39,8 @@ namespace OC\Files\Cache; -use Doctrine\DBAL\Driver\Statement; use Doctrine\DBAL\Exception\UniqueConstraintViolationException; +use OCP\DB\IResult; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\EventDispatcher\IEventDispatcher; use OCP\Files\Cache\CacheEntryInsertedEvent; @@ -486,7 +486,7 @@ class Cache implements ICache { ->wherePath($file); $result = $query->execute(); - $id = $result->fetchColumn(); + $id = $result->fetchOne(); $result->closeCursor(); return $id === false ? -1 : (int)$id; @@ -746,7 +746,7 @@ class Cache implements ICache { ->wherePath($file); $result = $query->execute(); - $size = $result->fetchColumn(); + $size = $result->fetchOne(); $result->closeCursor(); if ($size !== false) { @@ -793,10 +793,10 @@ class Cache implements ICache { } /** - * @param Statement $result + * @param IResult $result * @return CacheEntry[] */ - private function searchResultToCacheEntries(Statement $result) { + private function searchResultToCacheEntries(IResult $result): array { $files = $result->fetchAll(); return array_map(function (array $data) { @@ -870,7 +870,9 @@ class Cache implements ICache { } $result = $query->execute(); - return $this->searchResultToCacheEntries($result); + $cacheEntries = $this->searchResultToCacheEntries($result); + $result->closeCursor(); + return $cacheEntries; } /** @@ -912,7 +914,7 @@ class Cache implements ICache { ->andWhere($query->expr()->lt('size', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))); $result = $query->execute(); - $size = (int)$result->fetchColumn(); + $size = (int)$result->fetchOne(); $result->closeCursor(); return $size; @@ -1002,7 +1004,7 @@ class Cache implements ICache { ->setMaxResults(1); $result = $query->execute(); - $path = $result->fetchColumn(); + $path = $result->fetchOne(); $result->closeCursor(); return $path; @@ -1022,7 +1024,7 @@ class Cache implements ICache { ->whereFileId($id); $result = $query->execute(); - $path = $result->fetchColumn(); + $path = $result->fetchOne(); $result->closeCursor(); if ($path === false) { |