Merge pull request #4319 from nextcloud/prepare/v3.5.0

dartcafe · web-flow · commit 2d2a26e2313d · 2025-10-03T17:37:22.000+02:00
Prepare v3.5.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,7 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## [8.5.0] - tbd
+## [8.5.0] - 2025-10-03
 ### Fixed
  - Archived polls could not get entered anymore
  - Public users were not displayed correctly right after registration
diff --git a/lib/Command/Db/CleanMigrations.php b/lib/Command/Db/CleanMigrations.php
@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V4\TableManager;
+use OCA\Polls\Db\V5\TableManager;
 use OCP\IDBConnection;
 
 /**
diff --git a/lib/Command/Db/CreateIndices.php b/lib/Command/Db/CreateIndices.php
@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V4\IndexManager;
+use OCA\Polls\Db\V5\IndexManager;
 use OCP\IDBConnection;
 
 /**
diff --git a/lib/Command/Db/FixDB.php b/lib/Command/Db/FixDB.php
@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V4\TableManager;
+use OCA\Polls\Db\V5\TableManager;
 use OCP\IDBConnection;
 
 /**
diff --git a/lib/Command/Db/Purge.php b/lib/Command/Db/Purge.php
@@ -9,7 +9,7 @@
 namespace OCA\Polls\Command\Db;
 
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V4\TableManager;
+use OCA\Polls\Db\V5\TableManager;
 use OCP\IDBConnection;
 
 /**
diff --git a/lib/Command/Db/Rebuild.php b/lib/Command/Db/Rebuild.php
@@ -9,8 +9,8 @@
 namespace OCA\Polls\Command\Db;
 
 use Doctrine\DBAL\Schema\Schema;
-use OCA\Polls\Db\V4\TableManager;
-use OCA\Polls\Db\V4\IndexManager;
+use OCA\Polls\Db\V5\TableManager;
+use OCA\Polls\Db\V5\IndexManager;
 use OCA\Polls\Command\Command;
 use OCP\IDBConnection;
 
diff --git a/lib/Command/Db/RemoveFKConstraints.php b/lib/Command/Db/RemoveFKConstraints.php
@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V4\IndexManager;
+use OCA\Polls\Db\V5\IndexManager;
 use OCP\IDBConnection;
 
 /**
diff --git a/lib/Command/Db/RemoveOptionalIndices.php b/lib/Command/Db/RemoveOptionalIndices.php
@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V4\IndexManager;
+use OCA\Polls\Db\V5\IndexManager;
 use OCP\IDBConnection;
 
 /**
diff --git a/lib/Command/Db/RemoveUniqueIndices.php b/lib/Command/Db/RemoveUniqueIndices.php
@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V4\IndexManager;
+use OCA\Polls\Db\V5\IndexManager;
 use OCP\IDBConnection;
 
 /**
diff --git a/lib/Command/Db/ResetWatch.php b/lib/Command/Db/ResetWatch.php
@@ -10,10 +10,10 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V4\IndexManager;
-use OCA\Polls\Db\V4\TableManager;
+use OCA\Polls\Db\V5\IndexManager;
+use OCA\Polls\Db\V5\TableManager;
 use OCA\Polls\Db\Watch;
-use OCA\Polls\Migration\V4\TableSchema;
+use OCA\Polls\Migration\V5\TableSchema;
 use OCP\IDBConnection;
 
 /**
diff --git a/lib/Cron/JanitorCron.php b/lib/Cron/JanitorCron.php
@@ -15,7 +15,7 @@
 use OCA\Polls\Db\OptionMapper;
 use OCA\Polls\Db\PollMapper;
 use OCA\Polls\Db\ShareMapper;
-use OCA\Polls\Db\V4\TableManager;
+use OCA\Polls\Db\V5\TableManager;
 use OCA\Polls\Db\VoteMapper;
 use OCA\Polls\Helper\Container;
 use OCA\Polls\Model\Settings\AppSettings;
diff --git a/lib/Db/V5/DbManager.php b/lib/Db/V5/DbManager.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Polls\Db\V4;
+namespace OCA\Polls\Db\V5;
 
 use Doctrine\DBAL\Schema\Schema;
 use Exception;
diff --git a/lib/Db/V5/IndexManager.php b/lib/Db/V5/IndexManager.php
@@ -6,11 +6,11 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Polls\Db\V4;
+namespace OCA\Polls\Db\V5;
 
 use Doctrine\DBAL\Schema\Exception\IndexDoesNotExist;
 use Exception;
-use OCA\Polls\Migration\V4\TableSchema;
+use OCA\Polls\Migration\V5\TableSchema;
 use OCP\IConfig;
 use OCP\IDBConnection;
 use Psr\Log\LoggerInterface;
diff --git a/lib/Db/V5/TableManager.php b/lib/Db/V5/TableManager.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Polls\Db\V4;
+namespace OCA\Polls\Db\V5;
 
 use Doctrine\DBAL\Types\Type;
 use Exception;
@@ -20,7 +20,7 @@
 use OCA\Polls\Db\Watch;
 use OCA\Polls\Exceptions\PreconditionException;
 use OCA\Polls\Helper\Hash;
-use OCA\Polls\Migration\V4\TableSchema;
+use OCA\Polls\Migration\V5\TableSchema;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IConfig;
 use OCP\IDBConnection;
diff --git a/lib/Listener/AddMissingIndicesListener.php b/lib/Listener/AddMissingIndicesListener.php
@@ -8,7 +8,7 @@
 
 namespace OCA\Polls\Listener;
 
-use OCA\Polls\Migration\V4\TableSchema;
+use OCA\Polls\Migration\V5\TableSchema;
 use OCP\DB\Events\AddMissingIndicesEvent;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
diff --git a/lib/Migration/FixVotes.php b/lib/Migration/FixVotes.php
@@ -10,7 +10,7 @@
 namespace OCA\Polls\Migration;
 
 use Doctrine\DBAL\Schema\Schema;
-use OCA\Polls\Db\V4\TableManager;
+use OCA\Polls\Db\V5\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/CleanTables.php b/lib/Migration/RepairSteps/CleanTables.php
@@ -12,7 +12,7 @@
 use Doctrine\DBAL\Schema\Schema;
 use Exception;
 use OCA\Polls\Db\Poll;
-use OCA\Polls\Db\V4\TableManager;
+use OCA\Polls\Db\V5\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/CreateIndices.php b/lib/Migration/RepairSteps/CreateIndices.php
@@ -11,7 +11,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Db\Share;
-use OCA\Polls\Db\V4\IndexManager;
+use OCA\Polls\Db\V5\IndexManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/CreateTables.php b/lib/Migration/RepairSteps/CreateTables.php
@@ -10,7 +10,7 @@
 namespace OCA\Polls\Migration\RepairSteps;
 
 use Doctrine\DBAL\Schema\Schema;
-use OCA\Polls\Db\V4\TableManager;
+use OCA\Polls\Db\V5\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/DropOrphanedColumns.php b/lib/Migration/RepairSteps/DropOrphanedColumns.php
@@ -10,7 +10,7 @@
 namespace OCA\Polls\Migration\RepairSteps;
 
 use Doctrine\DBAL\Schema\Schema;
-use OCA\Polls\Db\V4\TableManager;
+use OCA\Polls\Db\V5\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/DropOrphanedTables.php b/lib/Migration/RepairSteps/DropOrphanedTables.php
@@ -10,7 +10,7 @@
 namespace OCA\Polls\Migration\RepairSteps;
 
 use Doctrine\DBAL\Schema\Schema;
-use OCA\Polls\Db\V4\TableManager;
+use OCA\Polls\Db\V5\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/FixNullish.php b/lib/Migration/RepairSteps/FixNullish.php
@@ -9,7 +9,7 @@
 
 namespace OCA\Polls\Migration\RepairSteps;
 
-use OCA\Polls\Db\V4\TableManager;
+use OCA\Polls\Db\V5\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/Install.php b/lib/Migration/RepairSteps/Install.php
@@ -10,7 +10,7 @@
 namespace OCA\Polls\Migration\RepairSteps;
 
 use Doctrine\DBAL\Schema\Schema;
-use OCA\Polls\Db\V4\IndexManager;
+use OCA\Polls\Db\V5\IndexManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/MigratePublicToOpen.php b/lib/Migration/RepairSteps/MigratePublicToOpen.php
@@ -9,7 +9,7 @@
 
 namespace OCA\Polls\Migration\RepairSteps;
 
-use OCA\Polls\Db\V4\TableManager;
+use OCA\Polls\Db\V5\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/RemoveIndices.php b/lib/Migration/RepairSteps/RemoveIndices.php
@@ -9,7 +9,7 @@
 namespace OCA\Polls\Migration\RepairSteps;
 
 use Doctrine\DBAL\Schema\Schema;
-use OCA\Polls\Db\V4\IndexManager;
+use OCA\Polls\Db\V5\IndexManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/RemoveObsoleteMigrations.php b/lib/Migration/RepairSteps/RemoveObsoleteMigrations.php
@@ -9,7 +9,7 @@
 namespace OCA\Polls\Migration\RepairSteps;
 
 use Doctrine\DBAL\Schema\Schema;
-use OCA\Polls\Db\V4\TableManager;
+use OCA\Polls\Db\V5\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/SetLastInteraction.php b/lib/Migration/RepairSteps/SetLastInteraction.php
@@ -9,7 +9,7 @@
 
 namespace OCA\Polls\Migration\RepairSteps;
 
-use OCA\Polls\Db\V4\TableManager;
+use OCA\Polls\Db\V5\TableManager;
 use OCA\Polls\Db\WatchMapper;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
diff --git a/lib/Migration/RepairSteps/UpdateHashes.php b/lib/Migration/RepairSteps/UpdateHashes.php
@@ -9,7 +9,7 @@
 
 namespace OCA\Polls\Migration\RepairSteps;
 
-use OCA\Polls\Db\V4\TableManager;
+use OCA\Polls\Db\V5\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/UpdateInteraction.php b/lib/Migration/RepairSteps/UpdateInteraction.php
@@ -9,7 +9,7 @@
 
 namespace OCA\Polls\Migration\RepairSteps;
 
-use OCA\Polls\Db\V4\TableManager;
+use OCA\Polls\Db\V5\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/V5/TableSchema.php b/lib/Migration/V5/TableSchema.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Polls\Migration\V4;
+namespace OCA\Polls\Migration\V5;
 
 use OCA\Polls\Db\Comment;
 use OCA\Polls\Db\Log;
diff --git a/lib/Migration/Version080301Date20250822153002.php b/lib/Migration/Version080301Date20250822153002.php
@@ -8,8 +8,8 @@
 
 namespace OCA\Polls\Migration;
 
-use OCA\Polls\Db\V4\IndexManager;
-use OCA\Polls\Db\V4\TableManager;
+use OCA\Polls\Db\V5\IndexManager;
+use OCA\Polls\Db\V5\TableManager;
 use OCP\DB\ISchemaWrapper;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
diff --git a/lib/Migration/Version080307Date20250826231102.php b/lib/Migration/Version080307Date20250826231102.php
@@ -9,8 +9,8 @@
 namespace OCA\Polls\Migration;
 
 use OCA\Polls\Db\Share;
-use OCA\Polls\Db\V4\IndexManager;
-use OCA\Polls\Db\V4\TableManager;
+use OCA\Polls\Db\V5\IndexManager;
+use OCA\Polls\Db\V5\TableManager;
 use OCP\DB\ISchemaWrapper;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
