Add typing to jsonSerialize

Signed-off-by: Julius Härtl <jus@bitgrid.net>

.github/workflows/lint.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['7.4', '8.0', "8.1"]
+        php-versions: ['7.4', '8.0', '8.1']
 
     name: php${{ matrix.php-versions }} lint
     steps:

.github/workflows/phpunit.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.0', "8.1"]
+        php-versions: ['7.4', '8.0', '8.1']
         databases: ['sqlite', 'mysql', 'pgsql']
         server-versions: ['master']
 

lib/Activity/ChangeSet.php

@@ -69,15 +69,7 @@ class ChangeSet implements \JsonSerializable {
 		return $this->after;
 	}
 
-	/**
+	public function jsonSerialize(): array {
-	 * Specify data which should be serialized to JSON
-	 *
-	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-	 * @return mixed data which can be serialized by <b>json_encode</b>,
-	 * which is a value of any type other than a resource.
-	 * @since 5.4.0
-	 */
-	public function jsonSerialize() {
 		return [
 			'before' => $this->getBefore(),
 			'after' => $this->getAfter(),

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,7 +98,7 @@ 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);

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) {
+		if ($this->object instanceof JsonSerializable) {
-			$this->object->jsonSerialize();
+			return $this->object->jsonSerialize();
 		} else {
 			throw new \Exception('jsonSerialize is not implemented on ' . get_class($this));
 		}

lib/Db/Stack.php

@@ -45,7 +45,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']);