fix mapper constructor parameter for nc21

nextcloud · Apr 9, 2021 · 54b01a2 · 54b01a2
1 parent ad98e61
commit 54b01a2
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 21 deletions.
diff --git a/lib/Db/FeelingdataMapper.php b/lib/Db/FeelingdataMapper.php
@@ -25,12 +25,12 @@
 
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
-use OCP\IDbConnection;
+use OCP\IDBConnection;
 use OCP\AppFramework\Db\QBMapper;
 
 class FeelingdataMapper extends QBMapper {
 
-    public function __construct(IDbConnection $db) {
+    public function __construct(IDBConnection $db) {
         parent::__construct($db, 'health_feelingdata', Feelingdata::class);
     }
 

diff --git a/lib/Db/MeasurementdataMapper.php b/lib/Db/MeasurementdataMapper.php
@@ -26,12 +26,12 @@
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
-use OCP\IDbConnection;
+use OCP\IDBConnection;
 use OCP\AppFramework\Db\QBMapper;
 
 class MeasurementdataMapper extends QBMapper {
 
-    public function __construct(IDbConnection $db) {
+    public function __construct(IDBConnection $db) {
         parent::__construct($db, 'health_measurementdata', Measurementdata::class);
     }
 

diff --git a/lib/Db/PersonMapper.php b/lib/Db/PersonMapper.php
@@ -24,17 +24,19 @@
 namespace OCA\Health\Db;
 
 use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
-use OCP\IDbConnection;
+use OCP\IDBConnection;
 use OCP\AppFramework\Db\QBMapper;
 
 class PersonMapper extends QBMapper {
 
-    public function __construct(IDbConnection $db) {
+    public function __construct(IDBConnection $db) {
         parent::__construct($db, 'health_persons', Person::class);
     }
 
-    public function find(int $id, string $userId = "") {
+    public function find(int $id, string $userId = ""): ?Entity
+	{
         $qb = $this->db->getQueryBuilder();
 
         $qb->select('*');
@@ -47,14 +49,13 @@ public function find(int $id, string $userId = "") {
 
 		try {
 			return $this->findEntity($qb);
-		} catch (DoesNotExistException $e) {
+		} catch (DoesNotExistException | MultipleObjectsReturnedException $e) {
         	return null;
-		} catch (MultipleObjectsReturnedException $e) {
-			return null;
 		}
 	}
 
-    public function findAll(string $userId) {
+    public function findAll(string $userId): array
+	{
         $qb = $this->db->getQueryBuilder();
 
         $qb->select('*')

diff --git a/lib/Db/SleepdataMapper.php b/lib/Db/SleepdataMapper.php
@@ -25,12 +25,12 @@
 
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
-use OCP\IDbConnection;
+use OCP\IDBConnection;
 use OCP\AppFramework\Db\QBMapper;
 
 class SleepdataMapper extends QBMapper {
 
-    public function __construct(IDbConnection $db) {
+    public function __construct(IDBConnection $db) {
         parent::__construct($db, 'health_sleepdata', Sleepdata::class);
     }
 

diff --git a/lib/Db/SmokingdataMapper.php b/lib/Db/SmokingdataMapper.php
@@ -23,12 +23,12 @@
 
 namespace OCA\Health\Db;
 
-use OCP\IDbConnection;
+use OCP\IDBConnection;
 use OCP\AppFramework\Db\QBMapper;
 
 class SmokingdataMapper extends QBMapper {
 
-    public function __construct(IDbConnection $db) {
+    public function __construct(IDBConnection $db) {
         parent::__construct($db, 'health_smokingdata', Smokingdata::class);
     }
 

diff --git a/lib/Db/WeightdataMapper.php b/lib/Db/WeightdataMapper.php
@@ -25,12 +25,12 @@
 
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
-use OCP\IDbConnection;
+use OCP\IDBConnection;
 use OCP\AppFramework\Db\QBMapper;
 
 class WeightdataMapper extends QBMapper {
 
-    public function __construct(IDbConnection $db) {
+    public function __construct(IDBConnection $db) {
         parent::__construct($db, 'health_weightdata', Weightdata::class);
     }
 

diff --git a/lib/Services/PersonsService.php b/lib/Services/PersonsService.php
@@ -42,11 +42,20 @@ class PersonsService {
 	protected $permissionService;
 	protected $userManager;
 
-	public function __construct(PersonMapper $pM, $userId, WeightdataService $wdS, FormatHelperService $fhS, PermissionService $permissionService, IUserManager $userManager, FeelingdataService $feelingdataService, SleepdataService $sleepdataService, MeasurementdataService $measurementdataService) {
-		$this->personMapper = $pM;
+	public function __construct(PersonMapper $personMapper,
+								$userId,
+								WeightdataService $weightdataService,
+								FormatHelperService $formatHelperService,
+								PermissionService $permissionService,
+								IUserManager $userManager,
+								FeelingdataService $feelingdataService,
+								SleepdataService $sleepdataService,
+								MeasurementdataService $measurementdataService
+	) {
+		$this->personMapper = $personMapper;
 		$this->userId = $userId;
-		$this->weightdataService = $wdS;
-		$this->formatHelperService = $fhS;
+		$this->weightdataService = $weightdataService;
+		$this->formatHelperService = $formatHelperService;
 		$this->permissionService = $permissionService;
 		$this->userManager = $userManager;
 		$this->sleepdataService = $sleepdataService;