Add PHP8.1 support

Signed-off-by: Christoph Wurst <[email protected]>

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: [7.4, 8.0]
+        php-versions: ['7.4', '8.0', '8.1']
     name: php${{ matrix.php-versions }} lint
     steps:
     - name: Checkout
@@ -41,7 +41,7 @@ jobs:
     - name: Set up php
       uses: shivammathur/setup-php@master
       with:
-        php-version: 7.4
+        php-version: '8.0'
         coverage: none
     - name: Install dependencies
       run: composer i

.github/workflows/test.yml

@@ -12,16 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: [7.4]
+        php-versions: ['8.0']
         nextcloud-versions: ['stable22', 'stable23']
         include:
             - php-versions: 7.4
               nextcloud-versions: stable24
-            - php-versions: 8.0
-              nextcloud-versions: stable24
-            - php-versions: 7.4
-              nextcloud-versions: master
-            - php-versions: 8.0
+            - php-versions: 8.1
               nextcloud-versions: master
     name: Nextcloud ${{ matrix.nextcloud-versions }} php${{ matrix.php-versions }} unit tests
     steps:
@@ -49,11 +45,18 @@ jobs:
     - name: Run tests
       working-directory: nextcloud/apps/mail
       run: composer run test:unit
+      if: ${{ matrix.php-versions == '8.0' }}
       env:
         XDEBUG_MODE: coverage
+    - name: Run tests
+      working-directory: nextcloud/apps/mail
+      run: composer run test:unit
+      if: ${{ matrix.php-versions != '8.0' }}
+      env:
+        XDEBUG_MODE: off
     - name: Report coverage
       uses: codecov/[email protected]
-      if: ${{ always() && matrix.nextcloud-versions == 'master' }}
+      if: ${{ always() && matrix.php-versions == '8.0' }}
       with:
         file: ./nextcloud/apps/mail/tests/clover.unit.xml
         flags: unittests
@@ -63,9 +66,19 @@ jobs:
       runs-on: ubuntu-latest
       strategy:
           matrix:
-              php-versions: [7.4, 8.0]
+              php-versions: ['8.0']
               nextcloud-versions: ['master']
               db: ['sqlite', 'mysql', 'pgsql']
+              include:
+                - php-versions: 7.4
+                  nextcloud-versions: stable22
+                  db: 'mysql'
+                - php-versions: 8.0
+                  nextcloud-versions: stable23
+                  db: 'mysql'
+                - php-versions: 8.1
+                  nextcloud-versions: stable24
+                  db: 'pgsql'
       name: php${{ matrix.php-versions }}-${{ matrix.db }} integration tests
       services:
           mail-service:
@@ -138,12 +151,16 @@ jobs:
               echo "SET GLOBAL log_output = 'table';" | mysql -h 127.0.0.1 -u root -pmy-secret-pw
           - name: Run tests
             working-directory: nextcloud/apps/mail
-            run: |
-                ss -tunlp
-                true | openssl s_client -crlf -connect 127.0.0.1:993
-                composer run test:integration
+            if: ${{ matrix.db == 'mysql' }}
+            run: composer run test:integration
             env:
                 XDEBUG_MODE: coverage
+          - name: Run tests
+            working-directory: nextcloud/apps/mail
+            if: ${{ matrix.db != 'mysql' }}
+            run: composer run test:integration
+            env:
+                XDEBUG_MODE: off
           - name: Read slow queries
             if: ${{ always() }}
             run: echo "SELECT * FROM mysql.slow_log WHERE sql_text LIKE '%oc_mail%' AND sql_text NOT LIKE '%information_schema%'" | mysql -h 127.0.0.1 -u root -pmy-secret-pw

appinfo/info.xml

@@ -29,7 +29,7 @@
 	<repository type="git">https://github.com/nextcloud/mail.git</repository>
 	<screenshot>https://user-images.githubusercontent.com/1374172/79554966-278e1600-809f-11ea-82ea-7a0d72a2704f.png</screenshot>
 	<dependencies>
-		<php min-version="7.4" max-version="8.0" />
+		<php min-version="7.4" max-version="8.1" />
 		<nextcloud min-version="22" max-version="25" />
 	</dependencies>
 	<background-jobs>

composer.json

@@ -16,7 +16,7 @@
 		}
 	},
 	"require": {
-		"php": ">=7.4",
+		"php": ">=7.4 <=8.1",
 		"arthurhoaro/favicon": "^1.2",
 		"bamarni/composer-bin-plugin": "^1.4",
 		"bytestream/horde-exception": "^2.1",

lib/Account.php

@@ -50,6 +50,7 @@
 use OCP\ICacheFactory;
 use OCP\IConfig;
 use OCP\Security\ICrypto;
+use ReturnTypeWillChange;
 
 class Account implements JsonSerializable {
 
@@ -189,9 +190,7 @@ public function getMailbox($folderId) {
 		);
 	}
 
-	/**
-	 * @return array
-	 */
+	#[ReturnTypeWillChange]
 	public function jsonSerialize() {
 		return $this->account->toJson();
 	}

lib/Address.php

@@ -28,6 +28,7 @@
 
 use Horde_Mail_Rfc822_Address;
 use JsonSerializable;
+use ReturnTypeWillChange;
 
 /**
  * @psalm-immutable
@@ -99,10 +100,8 @@ public function toHorde(): Horde_Mail_Rfc822_Address {
 		return $this->wrapped;
 	}
 
-	/**
-	 * @return array
-	 */
-	public function jsonSerialize(): array {
+	#[ReturnTypeWillChange]
+	public function jsonSerialize() {
 		return [
 			'label' => $this->getLabel(),
 			'email' => $this->getEmail(),

lib/AddressList.php

@@ -31,6 +31,7 @@
 use Horde_Mail_Rfc822_List;
 use Horde_Mail_Rfc822_Object;
 use JsonSerializable;
+use ReturnTypeWillChange;
 
 /**
  * @psalm-immutable
@@ -95,9 +96,7 @@ public function first() {
 		return $this->addresses[0];
 	}
 
-	/**
-	 * @return array
-	 */
+	#[ReturnTypeWillChange]
 	public function jsonSerialize() {
 		return array_map(function (Address $address) {
 			return $address->jsonSerialize();

lib/Db/Alias.php

@@ -25,6 +25,7 @@
 
 use JsonSerializable;
 use OCP\AppFramework\Db\Entity;
+use ReturnTypeWillChange;
 
 /**
  * @method void setAccountId(int $accountId)
@@ -66,7 +67,8 @@ public function isProvisioned(): bool {
 		return $this->getProvisioningId() !== null;
 	}
 
-	public function jsonSerialize(): array {
+	#[ReturnTypeWillChange]
+	public function jsonSerialize() {
 		return [
 			'id' => $this->getId(),
 			'name' => $this->getName(),

lib/Db/LocalAttachment.php

@@ -26,6 +26,7 @@
 
 use JsonSerializable;
 use OCP\AppFramework\Db\Entity;
+use ReturnTypeWillChange;
 
 /**
  * @method string getUserId()
@@ -56,6 +57,7 @@ class LocalAttachment extends Entity implements JsonSerializable {
 	/** @var int|null */
 	protected $localMessageId;
 
+	#[ReturnTypeWillChange]
 	public function jsonSerialize() {
 		return [
 			'id' => $this->id,

lib/Db/LocalMessage.php

@@ -27,6 +27,7 @@
 
 use JsonSerializable;
 use OCP\AppFramework\Db\Entity;
+use ReturnTypeWillChange;
 use function array_filter;
 
 /**
@@ -92,9 +93,7 @@ public function __construct() {
 		$this->addType('html', 'boolean');
 	}
 
-	/**
-	 * @return array
-	 */
+	#[ReturnTypeWillChange]
 	public function jsonSerialize() {
 		return [
 			'id' => $this->getId(),

lib/Db/Mailbox.php

@@ -28,6 +28,7 @@
 use JsonSerializable;
 use OCA\Mail\IMAP\MailboxStats;
 use OCP\AppFramework\Db\Entity;
+use ReturnTypeWillChange;
 use function base64_encode;
 use function in_array;
 use function json_decode;
@@ -146,6 +147,7 @@ public function getStats(): MailboxStats {
 		return new MailboxStats($this->getMessages(), $this->getUnseen());
 	}
 
+	#[ReturnTypeWillChange]
 	public function jsonSerialize() {
 		$specialUse = $this->getSpecialUseParsed();
 		return [

lib/Db/Message.php

@@ -29,6 +29,7 @@
 use JsonSerializable;
 use OCA\Mail\AddressList;
 use OCP\AppFramework\Db\Entity;
+use ReturnTypeWillChange;
 use function in_array;
 use function json_decode;
 use function json_encode;
@@ -274,6 +275,7 @@ public function setFlag(string $flag, bool $value = true) {
 		}
 	}
 
+	#[ReturnTypeWillChange]
 	public function jsonSerialize() {
 		$tags = $this->getTags();
 		$indexed = array_combine(

lib/Db/Provisioning.php

@@ -28,6 +28,7 @@
 use JsonSerializable;
 use OCP\AppFramework\Db\Entity;
 use OCP\IUser;
+use ReturnTypeWillChange;
 
 /**
  * @method string getProvisioningDomain()
@@ -97,9 +98,7 @@ public function __construct() {
 		$this->addType('ldapAliasesProvisioning', 'boolean');
 	}
 
-	/**
-	 * @return array
-	 */
+	#[ReturnTypeWillChange]
 	public function jsonSerialize() {
 		return [
 			'id' => $this->getId(),

lib/Db/Recipient.php

@@ -28,6 +28,7 @@
 
 use JsonSerializable;
 use OCP\AppFramework\Db\Entity;
+use ReturnTypeWillChange;
 
 /**
  * @method int|null getMessageId()
@@ -72,7 +73,8 @@ public function __construct() {
 		$this->addType('mailboxType', 'integer');
 	}
 
-	public function jsonSerialize(): array {
+	#[ReturnTypeWillChange]
+	public function jsonSerialize() {
 		return [
 			'id' => $this->getId(),
 			'messageId' => $this->getMessageId(),

lib/Db/Tag.php

@@ -27,6 +27,7 @@
 
 use JsonSerializable;
 use OCP\AppFramework\Db\Entity;
+use ReturnTypeWillChange;
 
 /**
  * @method string getUserId()
@@ -56,9 +57,8 @@ class Tag extends Entity implements JsonSerializable {
 	public function __construct() {
 		$this->addType('isDefaultTag', 'boolean');
 	}
-	/**
-	 * @return array
-	 */
+
+	#[ReturnTypeWillChange]
 	public function jsonSerialize() {
 		return [
 			'id' => $this->getId(),

lib/Db/TrustedSender.php

@@ -27,6 +27,7 @@
 
 use JsonSerializable;
 use OCP\AppFramework\Db\Entity;
+use ReturnTypeWillChange;
 
 /**
  * @method setEmail(string $email): void
@@ -47,6 +48,7 @@ class TrustedSender extends Entity implements JsonSerializable {
 	/** @var string */
 	protected $type;
 
+	#[ReturnTypeWillChange]
 	public function jsonSerialize() {
 		return [
 			'id' => $this->id,

lib/IMAP/MailboxStats.php

@@ -27,6 +27,7 @@
 namespace OCA\Mail\IMAP;
 
 use JsonSerializable;
+use ReturnTypeWillChange;
 
 class MailboxStats implements JsonSerializable {
 
@@ -55,6 +56,7 @@ public function getUnread(): int {
 		return $this->unread;
 	}
 
+	#[ReturnTypeWillChange]
 	public function jsonSerialize() {
 		return [
 			'total' => $this->total,