Skip to content
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.

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

[stable25] fix: expect interface, not a specific implementation #39154

Merged
merged 8 commits into from
Jul 6, 2023

Conversation

blizzz
Copy link
Member

@blizzz blizzz commented Jul 4, 2023

backport of #38625

blizzz added 8 commits July 4, 2023 23:06
- fixes a regression when deleting folders while music app was enabled,
  for a LazyRoot was passed to this method.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
createNode() is protected and used by Folder, but being an internal-only
method it shall not be exposed in the Folder or IRootFolder interface.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz blizzz added bug 3. to review Waiting for reviews regression labels Jul 4, 2023
@blizzz blizzz added this to the Nextcloud 25.0.9 milestone Jul 4, 2023
@blizzz blizzz requested review from marcelklehr, icewind1991, bigcat88, a team, ArtificialOwl and come-nc and removed request for a team July 4, 2023 21:38
@@ -285,7 +286,8 @@
}

/**
* @return Node
* @return INode|IRootFolder

Check failure

Code scanning / Psalm

LessSpecificImplementedReturnType

The inherited return type 'OCP\Files\Folder' for OCP\Files\Node::getParent is more specific than the implemented return type for OC\Files\Node\Node::getparent 'OCP\Files\IRootFolder|OCP\Files\Node'
@@ -339,7 +336,7 @@
}

/**
* @return Node
* @return INode|IRootFolder

Check failure

Code scanning / Psalm

LessSpecificImplementedReturnType

The inherited return type 'OCP\Files\Folder' for OCP\Files\Node::getParent is more specific than the implemented return type for OC\Files\Node\Root::getparent 'OCP\Files\IRootFolder|OCP\Files\Node'
@blizzz blizzz requested a review from provokateurin July 4, 2023 21:46
@blizzz blizzz merged commit 48a7a20 into stable25 Jul 6, 2023
@blizzz blizzz deleted the backport/38625/stable25 branch July 6, 2023 11:37
@blizzz blizzz mentioned this pull request Jul 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants