diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2021-03-11 21:03:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-11 21:03:15 +0100 |
| commit | a1757f83a30c48d0e6582c1ce1bc05e4b21bf2fd (patch) | |
| tree | 1775e055420987b998ae09d0ec5d5acc94d237dd | |
| parent | 2cbc2710ec52408f8fb9d1f87a0a8e5c6a1ca3ce (diff) | |
| parent | 8008b33b8dd52dcdcc834d4f60783fa3999b2b60 (diff) | |
| download | nextcloud-server-a1757f83a30c48d0e6582c1ce1bc05e4b21bf2fd.tar.gz nextcloud-server-a1757f83a30c48d0e6582c1ce1bc05e4b21bf2fd.zip | |
Merge pull request #26067 from nextcloud/techdept/psalm/trashbin/execute
Cleanp execute usage in the trashbin
| -rw-r--r-- | apps/files_trashbin/lib/Trashbin.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php index 7a7307ab470..537f774efaa 100644 --- a/apps/files_trashbin/lib/Trashbin.php +++ b/apps/files_trashbin/lib/Trashbin.php @@ -133,7 +133,7 @@ class Trashbin { $query->select('id', 'timestamp', 'location') ->from('files_trash') ->where($query->expr()->eq('user', $query->createNamedParameter($user))); - $result = $query->execute(); + $result = $query->executeQuery(); $array = []; while ($row = $result->fetch()) { if (isset($array[$row['id']])) { @@ -162,7 +162,7 @@ class Trashbin { ->andWhere($query->expr()->eq('id', $query->createNamedParameter($filename))) ->andWhere($query->expr()->eq('timestamp', $query->createNamedParameter($timestamp))); - $result = $query->execute(); + $result = $query->executeQuery(); $row = $result->fetch(); $result->closeCursor(); @@ -226,7 +226,7 @@ class Trashbin { ->setValue('timestamp', $query->createNamedParameter($timestamp)) ->setValue('location', $query->createNamedParameter($targetLocation)) ->setValue('user', $query->createNamedParameter($user)); - $result = $query->execute(); + $result = $query->executeUpdate(); if (!$result) { \OC::$server->getLogger()->error('trash bin database couldn\'t be updated for the files owner', ['app' => 'files_trashbin']); } @@ -353,7 +353,7 @@ class Trashbin { ->setValue('timestamp', $query->createNamedParameter($timestamp)) ->setValue('location', $query->createNamedParameter($location)) ->setValue('user', $query->createNamedParameter($owner)); - $result = $query->execute(); + $result = $query->executeUpdate(); if (!$result) { \OC::$server->getLogger()->error('trash bin database couldn\'t be updated', ['app' => 'files_trashbin']); } @@ -516,7 +516,7 @@ class Trashbin { ->where($query->expr()->eq('user', $query->createNamedParameter($user))) ->andWhere($query->expr()->eq('id', $query->createNamedParameter($filename))) ->andWhere($query->expr()->eq('timestamp', $query->createNamedParameter($timestamp))); - $query->execute(); + $query->executeUpdate(); } return true; @@ -606,7 +606,7 @@ class Trashbin { $query = \OC::$server->getDatabaseConnection()->getQueryBuilder(); $query->delete('files_trash') ->where($query->expr()->eq('user', $query->createNamedParameter($user))); - $query->execute(); + $query->executeUpdate(); // Bulk PostDelete-Hook \OC_Hook::emit('\OCP\Trashbin', 'deleteAll', ['paths' => $filePaths]); @@ -660,7 +660,7 @@ class Trashbin { ->where($query->expr()->eq('user', $query->createNamedParameter($user))) ->andWhere($query->expr()->eq('id', $query->createNamedParameter($filename))) ->andWhere($query->expr()->eq('timestamp', $query->createNamedParameter($timestamp))); - $query->execute(); + $query->executeUpdate(); $file = $filename . '.d' . $timestamp; } else { @@ -746,7 +746,7 @@ class Trashbin { $query = \OC::$server->getDatabaseConnection()->getQueryBuilder(); $query->delete('files_trash') ->where($query->expr()->eq('user', $query->createNamedParameter($uid))); - return (bool) $query->execute(); + return (bool) $query->executeUpdate(); } /** @@ -1003,7 +1003,7 @@ class Trashbin { ->andWhere($query->expr()->eq('parent', $query->createNamedParameter($parentId))) ->andWhere($query->expr()->iLike('name', $query->createNamedParameter($pattern))); - $result = $query->execute(); + $result = $query->executeQuery(); $entries = $result->fetchAll(); $result->closeCursor(); |