Skip to content

[main] Update nextcloud/ocp dependency #8157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
max-nextcloud merged 4 commits into from
Jan 16, 2026
+8 −20
Merged

[main] Update nextcloud/ocp dependency #8157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
817739f
chore(dev-deps): Bump nextcloud/ocp package
nextcloud-command Jan 15, 2026
b262f25
Revert "fix(Db): fix type errors of $id with latest server with snowf…
max-nextcloud Jan 15, 2026
25de9e1
Revert "chore(psalm): add errors to baseline"
max-nextcloud Jan 15, 2026
d089169
chore(psalm): drop superfluous type annotation for id
max-nextcloud Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions lib/Db/Document.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions lib/Db/Session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '';
Expand Down
1 change: 1 addition & 0 deletions lib/Db/Step.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
17 changes: 1 addition & 16 deletions tests/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="6.14.3@d0b040a91f280f071c1abcb1b77ce3822058725a">
<files psalm-version="6.13.1@1e3b7f0a8ab32b23197b91107adc0a7ed8a05b51">
<file src="lib/Controller/WorkspaceController.php">
<UndefinedInterfaceMethod>
<code><![CDATA[open]]></code>
Expand All @@ -10,21 +10,6 @@
<code><![CDATA[ServerPlugin]]></code>
</UndefinedClass>
</file>
<file src="lib/Db/Document.php">
<PropertyNotSetInConstructor>
<code><![CDATA[Document]]></code>
</PropertyNotSetInConstructor>
</file>
<file src="lib/Db/Session.php">
<PropertyNotSetInConstructor>
<code><![CDATA[Session]]></code>
</PropertyNotSetInConstructor>
</file>
<file src="lib/Db/Step.php">
<PropertyNotSetInConstructor>
<code><![CDATA[Step]]></code>
</PropertyNotSetInConstructor>
</file>
<file src="lib/DirectEditing/TextDirectEditor.php">
<UndefinedInterfaceMethod>
<code><![CDATA[getToken]]></code>
Expand Down
Loading