Merge branch 'master' into bugfix/deck_mapper/use_qb_mapper

lib/Db/Board.php

@@ -58,7 +58,7 @@ class Board extends RelationalEntity {
 		$this->shared = -1;
 	}
 
-	public function jsonSerialize() {
+	public function jsonSerialize(): array {
 		$json = parent::jsonSerialize();
 		if ($this->shared === -1) {
 			unset($json['shared']);

lib/Db/Card.php

@@ -50,7 +50,7 @@ class Card extends RelationalEntity {
 	protected $deletedAt = 0;
 	protected $commentsUnread = 0;
 	protected $commentsCount = 0;
-	
+
 	protected $relatedStack = null;
 	protected $relatedBoard = null;
 
@@ -78,7 +78,7 @@ class Card extends RelationalEntity {
 		$this->addRelation('commentsUnread');
 		$this->addRelation('commentsCount');
 		$this->addResolvable('owner');
-		
+
 		$this->addRelation('relatedStack');
 		$this->addRelation('relatedBoard');
 	}
@@ -98,22 +98,21 @@ class Card extends RelationalEntity {
 		return $dt->format('c');
 	}
 
-	public function jsonSerialize() {
+	public function jsonSerialize(): array {
 		$json = parent::jsonSerialize();
 		$json['overdue'] = self::DUEDATE_FUTURE;
-		$due = strtotime($this->duedate);
-
-		$today = new DateTime();
-		$today->setTime(0, 0);
-
-		$match_date = new DateTime($this->duedate);
-
-		$match_date->setTime(0, 0);
-
-		$diff = $today->diff($match_date);
-		$diffDays = (integer) $diff->format('%R%a'); // Extract days count in interval
-
+		$due = $this->duedate ? strtotime($this->duedate) : false;
 		if ($due !== false) {
+			$today = new DateTime();
+			$today->setTime(0, 0);
+
+			$match_date = new DateTime($this->duedate);
+
+			$match_date->setTime(0, 0);
+
+			$diff = $today->diff($match_date);
+			$diffDays = (integer) $diff->format('%R%a'); // Extract days count in interval
+
 			if ($diffDays === 1) {
 				$json['overdue'] = self::DUEDATE_NEXT;
 			}

lib/Db/CardMapper.php

@@ -551,7 +551,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
 	public function isOwner($userId, $cardId): bool {
 		$sql = 'SELECT owner FROM `*PREFIX*deck_boards` WHERE `id` IN (SELECT board_id FROM `*PREFIX*deck_stacks` WHERE id IN (SELECT stack_id FROM `*PREFIX*deck_cards` WHERE id = ?))';
 		$stmt = $this->db->prepare($sql);
-		$stmt->bindParam(1, $cardId, \PDO::PARAM_INT);
+		$stmt->bindParam(1, $cardId, \PDO::PARAM_INT, 0);
 		$stmt->execute();
 		$row = $stmt->fetch();
 		return ($row['owner'] === $userId);

lib/Db/RelationalEntity.php

@@ -63,7 +63,7 @@ class RelationalEntity extends Entity implements \JsonSerializable {
 	 * @return array serialized data
 	 * @throws \ReflectionException
 	 */
-	public function jsonSerialize() {
+	public function jsonSerialize(): array {
 		$properties = get_object_vars($this);
 		$reflection = new \ReflectionClass($this);
 		$json = [];

lib/Db/RelationalObject.php

@@ -23,7 +23,9 @@
 
 namespace OCA\Deck\Db;
 
-class RelationalObject implements \JsonSerializable {
+use JsonSerializable;
+
+class RelationalObject implements JsonSerializable {
 	protected $primaryKey;
 	protected $object;
 
@@ -38,7 +40,7 @@ class RelationalObject implements \JsonSerializable {
 		$this->object = $object;
 	}
 
-	public function jsonSerialize() {
+	public function jsonSerialize(): array {
 		return array_merge(
 			['primaryKey' => $this->primaryKey],
 			$this->getObjectSerialization()
@@ -51,8 +53,8 @@ class RelationalObject implements \JsonSerializable {
 	 * @throws \Exception
 	 */
 	public function getObjectSerialization() {
-		if ($this->object instanceof \JsonSerializable) {
-			$this->object->jsonSerialize();
+		if ($this->object instanceof JsonSerializable) {
+			return $this->object->jsonSerialize();
 		} else {
 			throw new \Exception('jsonSerialize is not implemented on ' . get_class($this));
 		}

lib/Db/Stack.php

@@ -52,7 +52,7 @@ class Stack extends RelationalEntity {
 		$this->cards = $cards;
 	}
 
-	public function jsonSerialize() {
+	public function jsonSerialize(): array {
 		$json = parent::jsonSerialize();
 		if (empty($this->cards)) {
 			unset($json['cards']);