From 817739f78e5771b5bd3bf6b958701c587b979e4e Mon Sep 17 00:00:00 2001 From: nextcloud-command Date: Thu, 15 Jan 2026 12:57:13 +0000 Subject: [PATCH 1/4] chore(dev-deps): Bump nextcloud/ocp package Signed-off-by: GitHub --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 66be7f61311..0ec79e77641 100644 --- a/composer.lock +++ b/composer.lock @@ -240,12 +240,12 @@ "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "6c1e5686d00c40f57abd83e8ad268e9ab34825bb" + "reference": "337b923504c089c84bbdb0166b5c2dc7a29966dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/6c1e5686d00c40f57abd83e8ad268e9ab34825bb", - "reference": "6c1e5686d00c40f57abd83e8ad268e9ab34825bb", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/337b923504c089c84bbdb0166b5c2dc7a29966dc", + "reference": "337b923504c089c84bbdb0166b5c2dc7a29966dc", "shasum": "" }, "require": { @@ -281,7 +281,7 @@ "issues": "https://github.com/nextcloud-deps/ocp/issues", "source": "https://github.com/nextcloud-deps/ocp/tree/master" }, - "time": "2026-01-09T00:57:54+00:00" + "time": "2026-01-15T00:55:13+00:00" }, { "name": "nikic/php-parser", From b262f25c9c5d666f05c25655f24c09a61b693926 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 15 Jan 2026 14:09:12 +0100 Subject: [PATCH 2/4] Revert "fix(Db): fix type errors of $id with latest server with snowflake IDs" This reverts commit 864ca0c8fab9b9effb28ed0100ab05b1bcc3ffef. Signed-off-by: Max --- lib/Db/Document.php | 2 ++ lib/Db/Session.php | 2 ++ lib/Db/Step.php | 2 ++ 3 files changed, 6 insertions(+) diff --git a/lib/Db/Document.php b/lib/Db/Document.php index 7513181d183..443a3b61244 100644 --- a/lib/Db/Document.php +++ b/lib/Db/Document.php @@ -27,6 +27,7 @@ * @method setChecksum(?string $checksum): void */ class Document extends Entity implements \JsonSerializable { + public $id = null; // TODO: Remove obsolete field `currentVersion` protected int $currentVersion = 0; protected int $lastSavedVersion = 0; @@ -37,6 +38,7 @@ class Document extends Entity implements \JsonSerializable { protected ?string $checksum = null; public function __construct() { + $this->addType('id', 'integer'); $this->addType('currentVersion', 'integer'); $this->addType('lastSavedVersion', 'integer'); $this->addType('lastSavedVersionTime', 'integer'); diff --git a/lib/Db/Session.php b/lib/Db/Session.php index 8a6df51bf6a..748ea84fad9 100644 --- a/lib/Db/Session.php +++ b/lib/Db/Session.php @@ -27,6 +27,7 @@ * @method void setDocumentId(int $documentId) */ class Session extends Entity implements JsonSerializable { + public $id; protected ?string $userId = null; protected string $token = ''; protected string $color = ''; @@ -36,6 +37,7 @@ class Session extends Entity implements JsonSerializable { protected int $documentId = 0; public function __construct() { + $this->addType('id', 'integer'); $this->addType('documentId', 'integer'); $this->addType('lastContact', 'integer'); } diff --git a/lib/Db/Step.php b/lib/Db/Step.php index bd615cb25b4..cecb8440a01 100644 --- a/lib/Db/Step.php +++ b/lib/Db/Step.php @@ -31,6 +31,7 @@ class Step extends Entity implements JsonSerializable { */ public const VERSION_STORED_IN_ID = 2147483647; + public $id = null; protected string $data = ''; protected int $version = 0; protected int $sessionId = 0; @@ -38,6 +39,7 @@ class Step extends Entity implements JsonSerializable { protected int $timestamp = 0; public function __construct() { + $this->addType('id', 'integer'); $this->addType('version', 'integer'); $this->addType('documentId', 'integer'); $this->addType('sessionId', 'integer'); From 25de9e1f962180374974f30cf719fd42cd1d15ea Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 15 Jan 2026 14:13:12 +0100 Subject: [PATCH 3/4] Revert "chore(psalm): add errors to baseline" This reverts commit bdc4847bb4d4dabff6a6c617f416d212450c08ed. Signed-off-by: Max --- tests/psalm-baseline.xml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml index c7959851eeb..556c8562761 100644 --- a/tests/psalm-baseline.xml +++ b/tests/psalm-baseline.xml @@ -1,5 +1,5 @@ - + @@ -10,21 +10,6 @@ - - - - - - - - - - - - - - - From d08916957417a511efa5a58e9f6442a422d74944 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 15 Jan 2026 18:44:40 +0100 Subject: [PATCH 4/4] chore(psalm): drop superfluous type annotation for id See https://github.com/nextcloud/text/pull/8157#pullrequestreview-3665715128 and following. Signed-off-by: Max --- lib/Db/Document.php | 1 - lib/Db/Session.php | 1 - lib/Db/Step.php | 1 - 3 files changed, 3 deletions(-) diff --git a/lib/Db/Document.php b/lib/Db/Document.php index 443a3b61244..5fdcdffa212 100644 --- a/lib/Db/Document.php +++ b/lib/Db/Document.php @@ -38,7 +38,6 @@ class Document extends Entity implements \JsonSerializable { protected ?string $checksum = null; public function __construct() { - $this->addType('id', 'integer'); $this->addType('currentVersion', 'integer'); $this->addType('lastSavedVersion', 'integer'); $this->addType('lastSavedVersionTime', 'integer'); diff --git a/lib/Db/Session.php b/lib/Db/Session.php index 748ea84fad9..7bcf39d6c48 100644 --- a/lib/Db/Session.php +++ b/lib/Db/Session.php @@ -37,7 +37,6 @@ class Session extends Entity implements JsonSerializable { protected int $documentId = 0; public function __construct() { - $this->addType('id', 'integer'); $this->addType('documentId', 'integer'); $this->addType('lastContact', 'integer'); } diff --git a/lib/Db/Step.php b/lib/Db/Step.php index cecb8440a01..dbc4d08ed92 100644 --- a/lib/Db/Step.php +++ b/lib/Db/Step.php @@ -39,7 +39,6 @@ class Step extends Entity implements JsonSerializable { protected int $timestamp = 0; public function __construct() { - $this->addType('id', 'integer'); $this->addType('version', 'integer'); $this->addType('documentId', 'integer'); $this->addType('sessionId', 'integer');