Merge pull request #3601 from nextcloud/enh/php8.1

Add support for PHP 8.1

.github/dependabot.yml

@@ -11,19 +11,6 @@ updates:
   open-pull-requests-limit: 10
   reviewers:
   - juliushaertl
-  - jakobroehrl
-#- package-ecosystem: npm
-#  directory: "/"
-#  target-branch: "stable1.1"
-#  schedule:
-#    interval: weekly
-#    day: saturday
-#    time: "03:00"
-#    timezone: Europe/Paris
-#  open-pull-requests-limit: 10
-#  reviewers:
-#  - juliushaertl
-#  - jakobroehrl
 - package-ecosystem: composer
   directory: "/"
   schedule:
@@ -34,11 +21,16 @@ updates:
   open-pull-requests-limit: 10
   reviewers:
   - juliushaertl
-  ignore:
-  - dependency-name: christophwurst/nextcloud
-    versions:
-    - "< 16"
-    - ">= 15.a"
+- package-ecosystem: composer
+  directory: "/tests/integration"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 10
+  reviewers:
+  - juliushaertl
 - package-ecosystem: github-actions
   directory: "/"
   schedule:

.github/workflows/integration.yml

@@ -54,6 +54,7 @@ jobs:
           auth_header="$(git config --local --get http.https://github.com/.extraheader)"
           git submodule sync --recursive
           git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+          cd build/integration && composer require --dev phpunit/phpunit:~8
 
       - name: Checkout app
         uses: actions/checkout@v3

.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;
 	}
 
-	/**
-	 * 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() {
+	public function jsonSerialize(): array {
 		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,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/LabelMapper.php

@@ -83,14 +83,14 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 	public function deleteLabelAssignments($labelId) {
 		$sql = 'DELETE FROM `*PREFIX*deck_assigned_labels` WHERE label_id = ?';
 		$stmt = $this->db->prepare($sql);
-		$stmt->bindParam(1, $labelId, \PDO::PARAM_INT);
+		$stmt->bindParam(1, $labelId, \PDO::PARAM_INT, 0);
 		$stmt->execute();
 	}
 
 	public function deleteLabelAssignmentsForCard($cardId) {
 		$sql = 'DELETE FROM `*PREFIX*deck_assigned_labels` WHERE card_id = ?';
 		$stmt = $this->db->prepare($sql);
-		$stmt->bindParam(1, $cardId, \PDO::PARAM_INT);
+		$stmt->bindParam(1, $cardId, \PDO::PARAM_INT, 0);
 		$stmt->execute();
 	}
 

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

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

lib/Service/CardService.php

@@ -114,7 +114,7 @@ class CardService {
 		$countComments = $this->commentsManager->getNumberOfCommentsForObject('deckCard', (string)$card->getId());
 		$card->setCommentsUnread($countUnreadComments);
 		$card->setCommentsCount($countComments);
-		
+
 		$stack = $this->stackMapper->find($card->getStackId());
 		$board = $this->boardService->find($stack->getBoardId());
 		$card->setRelatedStack($stack);
@@ -224,7 +224,7 @@ class CardService {
 		$card->setDescription($description);
 		$card->setDuedate($duedate);
 		$card = $this->cardMapper->insert($card);
-		
+
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_CARD_CREATE);
 		$this->changeHelper->cardChanged($card->getId(), false);
 		$this->eventDispatcher->dispatchTyped(new CardCreatedEvent($card));
@@ -253,7 +253,7 @@ class CardService {
 		$card = $this->cardMapper->find($id);
 		$card->setDeletedAt(time());
 		$this->cardMapper->update($card);
-		
+
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_CARD_DELETE);
 		$this->notificationHelper->markDuedateAsRead($card);
 		$this->changeHelper->cardChanged($card->getId(), false);
@@ -338,7 +338,7 @@ class CardService {
 		$resetDuedateNotification = false;
 		if (
 			$card->getDuedate() === null ||
-			(new \DateTime($card->getDuedate())) != (new \DateTime($changes->getBefore()->getDuedate()))
+			(new \DateTime($card->getDuedate())) != (new \DateTime($changes->getBefore()->getDuedate() ?? ''))
 		) {
 			$card->setNotified(false);
 			$resetDuedateNotification = true;

lib/StatusException.php

@@ -31,7 +31,7 @@ namespace OCA\Deck;
  */
 class StatusException extends \Exception {
 	public function __construct($message) {
-		parent::__construct($message);
+		parent::__construct($message ?? '');
 	}
 
 	public function getStatus() {

tests/integration/composer.json

@@ -1,6 +1,6 @@
 {
     "require-dev": {
-        "phpunit/phpunit": "~6.5",
+        "phpunit/phpunit": "~9",
         "behat/behat": "~3.8.0",
         "guzzlehttp/guzzle": "6.5.2",
         "jarnaiz/behat-junit-formatter": "^1.3",

tests/unit/Activity/ActivityManagerTest.php

@@ -103,15 +103,13 @@ class ActivityManagerTest extends TestCase {
 				if ($format !== '') {
 					$this->assertStringContainsString('{user}', $format);
 				} else {
-					/** @noinspection ForgottenDebugOutputInspection */
-					print_r('No activity string found for '. $constant . PHP_EOL);
+					self::addWarning('No activity string found for '. $constant);
 				}
 				$format = $this->activityManager->getActivityFormat('cz', $value, [], true);
 				if ($format !== '') {
 					$this->assertStringStartsWith('You', $format);
 				} else {
-					/** @noinspection ForgottenDebugOutputInspection */
-					print_r('No own activity string found for '. $constant . PHP_EOL);
+					self::addWarning('No own activity string found for '. $constant);
 				}
 			}
 		}