From d8c0480b372e71b20388f117a8a1a34332c88673 Mon Sep 17 00:00:00 2001 From: MTier Ltd Date: Sun, 26 Mar 2023 16:21:22 +0200 Subject: [PATCH] move the old mapper to a different namespace and fix write operations by using OCP\AppFramework\Db\Entity in the compat mapper fixes #211 --- appinfo/info.xml | 2 +- lib/{ => AppFramework}/Db/OldNextcloudMapper.php | 3 ++- lib/AppInfo/Application.php | 6 +++--- lib/Db/ClientMapper.php | 2 ++ lib/Db/GoalMapper.php | 2 ++ lib/Db/ProjectMapper.php | 2 ++ lib/Db/ReportItemMapper.php | 2 ++ lib/Db/TagMapper.php | 2 ++ lib/Db/TimelineEntryMapper.php | 2 ++ lib/Db/TimelineMapper.php | 2 ++ lib/Db/UserToClientMapper.php | 2 ++ lib/Db/UserToProjectMapper.php | 2 ++ lib/Db/WorkIntervalMapper.php | 2 ++ lib/Db/WorkIntervalToTagMapper.php | 2 ++ lib/Db/WorkItemMapper.php | 2 ++ 15 files changed, 30 insertions(+), 5 deletions(-) rename lib/{ => AppFramework}/Db/OldNextcloudMapper.php (99%) diff --git a/appinfo/info.xml b/appinfo/info.xml index 95d8624..6a14cc6 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -35,7 +35,7 @@ Mit dem integrierten Dashboard lässt sich anhand eines Kuchen-/Donut-Diagramms Diese App wird aktuell noch weiterentwickelt, also: Augen offen halten für neue Features! Und falls Dir irgendwelche Verbesserungsvorschläge, Probleme oder neue Features einfallen, schau mal auf unserem [GitHub Projekt](https://github.com/mtierltd/timetracker) vorbei, vielleicht wird Dein Thema bereits diskutiert! Und falls nicht, starte gerne eine neue Diskussion, wir freuen uns auf Dein Feedback! - 0.0.78 + 0.0.79 agpl MTier Ltd. TimeTracker diff --git a/lib/Db/OldNextcloudMapper.php b/lib/AppFramework/Db/OldNextcloudMapper.php similarity index 99% rename from lib/Db/OldNextcloudMapper.php rename to lib/AppFramework/Db/OldNextcloudMapper.php index aa269da..ee45fb5 100644 --- a/lib/Db/OldNextcloudMapper.php +++ b/lib/AppFramework/Db/OldNextcloudMapper.php @@ -25,9 +25,10 @@ * along with this program. If not, see * */ -namespace OCA\TimeTracker\Db; +namespace OCA\TimeTracker\AppFramework\Db; use OCP\AppFramework\Db\DoesNotExistException; +use OCP\AppFramework\Db\Entity; use OCP\AppFramework\Db\MultipleObjectsReturnedException; use OCP\IDBConnection; diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 86b5f64..de801d7 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -26,11 +26,11 @@ class Application extends App { public function __construct(array $urlParams=array()){ parent::__construct('timetracker', $urlParams); - if (!\class_exists('\OCA\TimeTracker\Db\CompatibleMapper')) { + if (!\class_exists('\OCA\TimeTracker\AppFramework\Db\CompatibleMapper')) { if (\class_exists(\OCP\AppFramework\Db\Mapper::class)) { - \class_alias(\OCP\AppFramework\Db\Mapper::class, 'OCA\TimeTracker\Db\CompatibleMapper'); + \class_alias(\OCP\AppFramework\Db\Mapper::class, 'OCA\TimeTracker\AppFramework\Db\CompatibleMapper'); } else { - \class_alias(\OCA\TimeTracker\Db\OldNextcloudMapper::class, 'OCA\TimeTracker\Db\CompatibleMapper'); + \class_alias(\OCA\TimeTracker\AppFramework\Db\OldNextcloudMapper::class, 'OCA\TimeTracker\AppFramework\Db\CompatibleMapper'); } } diff --git a/lib/Db/ClientMapper.php b/lib/Db/ClientMapper.php index da862b9..1cee7ba 100644 --- a/lib/Db/ClientMapper.php +++ b/lib/Db/ClientMapper.php @@ -5,6 +5,8 @@ use OCP\IDBConnection; +use OCA\TimeTracker\AppFramework\Db\CompatibleMapper; + class ClientMapper extends CompatibleMapper { public function __construct(IDBConnection $db) { diff --git a/lib/Db/GoalMapper.php b/lib/Db/GoalMapper.php index 1dc6091..a3ccf76 100644 --- a/lib/Db/GoalMapper.php +++ b/lib/Db/GoalMapper.php @@ -5,6 +5,8 @@ use OCP\IDBConnection; +use OCA\TimeTracker\AppFramework\Db\CompatibleMapper; + class GoalMapper extends CompatibleMapper { public function __construct(IDBConnection $db) { diff --git a/lib/Db/ProjectMapper.php b/lib/Db/ProjectMapper.php index d8fbbda..8c23921 100644 --- a/lib/Db/ProjectMapper.php +++ b/lib/Db/ProjectMapper.php @@ -5,6 +5,8 @@ use OCP\IDBConnection; +use OCA\TimeTracker\AppFramework\Db\CompatibleMapper; + class ProjectMapper extends CompatibleMapper { public function __construct(IDBConnection $db) { diff --git a/lib/Db/ReportItemMapper.php b/lib/Db/ReportItemMapper.php index c2b0fdb..6728175 100644 --- a/lib/Db/ReportItemMapper.php +++ b/lib/Db/ReportItemMapper.php @@ -5,6 +5,8 @@ use OCP\IDBConnection; +use OCA\TimeTracker\AppFramework\Db\CompatibleMapper; + class ReportItemMapper extends CompatibleMapper { diff --git a/lib/Db/TagMapper.php b/lib/Db/TagMapper.php index a15a452..187252f 100644 --- a/lib/Db/TagMapper.php +++ b/lib/Db/TagMapper.php @@ -5,6 +5,8 @@ use OCP\IDBConnection; +use OCA\TimeTracker\AppFramework\Db\CompatibleMapper; + class TagMapper extends CompatibleMapper { public function __construct(IDBConnection $db) { diff --git a/lib/Db/TimelineEntryMapper.php b/lib/Db/TimelineEntryMapper.php index 7d8a5d8..c0216c4 100644 --- a/lib/Db/TimelineEntryMapper.php +++ b/lib/Db/TimelineEntryMapper.php @@ -5,6 +5,8 @@ use OCP\IDBConnection; +use OCA\TimeTracker\AppFramework\Db\CompatibleMapper; + class TimelineEntryMapper extends CompatibleMapper { public function __construct(IDBConnection $db) { diff --git a/lib/Db/TimelineMapper.php b/lib/Db/TimelineMapper.php index 9ae20b3..4f434fb 100644 --- a/lib/Db/TimelineMapper.php +++ b/lib/Db/TimelineMapper.php @@ -5,6 +5,8 @@ use OCP\IDBConnection; +use OCA\TimeTracker\AppFramework\Db\CompatibleMapper; + class TimelineMapper extends CompatibleMapper { public function __construct(IDBConnection $db) { diff --git a/lib/Db/UserToClientMapper.php b/lib/Db/UserToClientMapper.php index 9dc7e43..816598f 100644 --- a/lib/Db/UserToClientMapper.php +++ b/lib/Db/UserToClientMapper.php @@ -5,6 +5,8 @@ use OCP\IDBConnection; +use OCA\TimeTracker\AppFramework\Db\CompatibleMapper; + class UserToClientMapper extends CompatibleMapper { public function __construct(IDBConnection $db) { diff --git a/lib/Db/UserToProjectMapper.php b/lib/Db/UserToProjectMapper.php index cfbf1d7..6337603 100644 --- a/lib/Db/UserToProjectMapper.php +++ b/lib/Db/UserToProjectMapper.php @@ -5,6 +5,8 @@ use OCP\IDBConnection; +use OCA\TimeTracker\AppFramework\Db\CompatibleMapper; + class UserToProjectMapper extends CompatibleMapper { public function __construct(IDBConnection $db) { diff --git a/lib/Db/WorkIntervalMapper.php b/lib/Db/WorkIntervalMapper.php index 8bad59b..4a94ec4 100644 --- a/lib/Db/WorkIntervalMapper.php +++ b/lib/Db/WorkIntervalMapper.php @@ -5,6 +5,8 @@ use OCP\IDBConnection; +use OCA\TimeTracker\AppFramework\Db\CompatibleMapper; + class WorkIntervalMapper extends CompatibleMapper { private $dbengine; diff --git a/lib/Db/WorkIntervalToTagMapper.php b/lib/Db/WorkIntervalToTagMapper.php index 211516d..d7bd2a5 100644 --- a/lib/Db/WorkIntervalToTagMapper.php +++ b/lib/Db/WorkIntervalToTagMapper.php @@ -5,6 +5,8 @@ use OCP\IDBConnection; +use OCA\TimeTracker\AppFramework\Db\CompatibleMapper; + class WorkIntervalToTagMapper extends CompatibleMapper { public function __construct(IDBConnection $db) { diff --git a/lib/Db/WorkItemMapper.php b/lib/Db/WorkItemMapper.php index 409fe12..8517fc6 100644 --- a/lib/Db/WorkItemMapper.php +++ b/lib/Db/WorkItemMapper.php @@ -5,6 +5,8 @@ use OCP\IDBConnection; +use OCA\TimeTracker\AppFramework\Db\CompatibleMapper; + class WorkItemMapper extends CompatibleMapper { public function __construct(IDBConnection $db) {