From 263d81368ab8ec5804fe46e7e431ca380a6d9606 Mon Sep 17 00:00:00 2001 From: dartcafe Date: Thu, 5 Sep 2024 19:21:14 +0200 Subject: [PATCH 1/5] remove index removals Signed-off-by: dartcafe --- appinfo/info.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 62c993cf7..024f213d0 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -58,7 +58,6 @@ OCA\Polls\Migration\RepairSteps\RemoveObsoleteMigrations - OCA\Polls\Migration\RepairSteps\RemoveIndices OCA\Polls\Migration\RepairSteps\DropOrphanedTables From 8ff343cd459f14b6abba4115f123d4494d86099f Mon Sep 17 00:00:00 2001 From: dartcafe Date: Thu, 5 Sep 2024 22:07:36 +0200 Subject: [PATCH 2/5] Add a warning to the rebuild command Signed-off-by: dartcafe --- lib/Command/Db/Rebuild.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/Command/Db/Rebuild.php b/lib/Command/Db/Rebuild.php index 834483f3f..283d35780 100644 --- a/lib/Command/Db/Rebuild.php +++ b/lib/Command/Db/Rebuild.php @@ -1,9 +1,9 @@ Date: Thu, 5 Sep 2024 22:22:18 +0200 Subject: [PATCH 3/5] changelog Signed-off-by: dartcafe --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 936f0a939..e95c57bb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ --> # Changelog ## +## [7.2.2] - 2024-09-06 +### Fix + - fix watcher in situations it may fail on pollId 0 + - fix failing routes on tokens with trailing spaces + - Removed index removal from the pre-migration repair steps + ## [7.2.1] - 2024-08-22 ### Fix - Fix deleted user when email share registers From 1ecc983bc26e3d5efa55742fed144932294a99f8 Mon Sep 17 00:00:00 2001 From: dartcafe Date: Fri, 6 Sep 2024 18:39:25 +0200 Subject: [PATCH 4/5] I hate my own typos Signed-off-by: dartcafe --- lib/Db/IndexManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Db/IndexManager.php b/lib/Db/IndexManager.php index 045d9c7ad..07902883a 100644 --- a/lib/Db/IndexManager.php +++ b/lib/Db/IndexManager.php @@ -73,7 +73,7 @@ public function createForeignKeyConstraints(): array { /** * add an on delete fk contraint * - * @param string $parentTableName name of reffered table + * @param string $parentTableName name of referred table * @param string $childTableName name of referring table * @return string log message */ From f33f43dd192cda35a1c83edf77e47b260d2cb6ef Mon Sep 17 00:00:00 2001 From: dartcafe Date: Fri, 6 Sep 2024 18:42:08 +0200 Subject: [PATCH 5/5] cs-fix Signed-off-by: dartcafe --- lib/Service/PreferencesService.php | 2 +- lib/Service/WatchService.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Service/PreferencesService.php b/lib/Service/PreferencesService.php index a63c68933..20781d085 100644 --- a/lib/Service/PreferencesService.php +++ b/lib/Service/PreferencesService.php @@ -30,7 +30,7 @@ public function __construct( public function load(): void { try { $this->preferences = $this->preferencesMapper->find($this->userSession->getCurrentUserId()); - } catch (Exception $e) { + } catch (Exception $e) { $this->preferences = new Preferences; } } diff --git a/lib/Service/WatchService.php b/lib/Service/WatchService.php index 170d85e98..eaa5c0882 100644 --- a/lib/Service/WatchService.php +++ b/lib/Service/WatchService.php @@ -37,7 +37,7 @@ public function __construct( */ public function watchUpdates(int $pollId, ?int $offset = null): array { - if($pollId !== 0) { + if ($pollId !== 0) { $this->pollMapper->find($pollId)->request(Poll::PERMISSION_POLL_VIEW); }