Skip to content

Commit c421ce1

Browse files
authored
Merge pull request #8139 from nextcloud/fix/type_error_snowflake
fix(Db): fix type errors of $id with latest server with snowflake IDs
2 parents d109dba + 864ca0c commit c421ce1

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

lib/Db/Document.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
* @method setChecksum(?string $checksum): void
2828
*/
2929
class Document extends Entity implements \JsonSerializable {
30-
public $id = null;
3130
// TODO: Remove obsolete field `currentVersion`
3231
protected int $currentVersion = 0;
3332
protected int $lastSavedVersion = 0;
@@ -38,7 +37,6 @@ class Document extends Entity implements \JsonSerializable {
3837
protected ?string $checksum = null;
3938

4039
public function __construct() {
41-
$this->addType('id', 'integer');
4240
$this->addType('currentVersion', 'integer');
4341
$this->addType('lastSavedVersion', 'integer');
4442
$this->addType('lastSavedVersionTime', 'integer');

lib/Db/Session.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
* @method void setDocumentId(int $documentId)
2828
*/
2929
class Session extends Entity implements JsonSerializable {
30-
public $id;
3130
protected ?string $userId = null;
3231
protected string $token = '';
3332
protected string $color = '';
@@ -37,7 +36,6 @@ class Session extends Entity implements JsonSerializable {
3736
protected int $documentId = 0;
3837

3938
public function __construct() {
40-
$this->addType('id', 'integer');
4139
$this->addType('documentId', 'integer');
4240
$this->addType('lastContact', 'integer');
4341
}

lib/Db/Step.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,13 @@ class Step extends Entity implements JsonSerializable {
3131
*/
3232
public const VERSION_STORED_IN_ID = 2147483647;
3333

34-
public $id = null;
3534
protected string $data = '';
3635
protected int $version = 0;
3736
protected int $sessionId = 0;
3837
protected int $documentId = 0;
3938
protected int $timestamp = 0;
4039

4140
public function __construct() {
42-
$this->addType('id', 'integer');
4341
$this->addType('version', 'integer');
4442
$this->addType('documentId', 'integer');
4543
$this->addType('sessionId', 'integer');

0 commit comments

Comments
 (0)