Skip to content

[stable26] fix: expect interface, not a specific implementation #38977

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
blizzz merged 7 commits into from
Jul 4, 2023
Merged

[stable26] fix: expect interface, not a specific implementation #38977

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e095311
fix: expect interface, not a specific implementation
blizzz Jun 2, 2023
ae48fc8
fix: add typehine for IRootFolder
blizzz Jun 2, 2023
3813b95
chore: ugly type juggling
blizzz Jun 8, 2023
2b27a4c
refactor: declare getMount() and getMountsIn() at IRootFolder
blizzz Jun 15, 2023
aec67f4
ci: pro forma check of existence of internal method
blizzz Jun 16, 2023
1465824
docs: adjust @since version to backport
blizzz Jun 26, 2023
013d349
ci: adjust return annotation to older psalm version
blizzz Jun 26, 2023
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
Prev Previous commit
Next Next commit
fix: add typehine for IRootFolder 
Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
@blizzz @backportbot-nextcloud
blizzz authored and backportbot-nextcloud[bot] committed Jun 23, 2023
commit ae48fc86d229e9575f3ca49ad659cd73b31a0c36
12 changes: 5 additions & 7 deletions lib/private/Files/Node/Node.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
use OC\Files\Utils\PathHelper;
use OCP\Files\FileInfo;
use OCP\Files\InvalidPathException;
use OCP\Files\IRootFolder;
use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
use OCP\Lock\LockedException;
Expand All @@ -47,10 +48,7 @@ class Node implements \OCP\Files\Node {
*/
protected $view;

/**
* @var \OC\Files\Node\Root $root
*/
protected $root;
protected IRootFolder $root;

/**
* @var string $path Absolute path to the node (e.g. /admin/files/folder/file)
Expand All @@ -72,7 +70,7 @@ class Node implements \OCP\Files\Node {
* @param string $path
* @param FileInfo $fileInfo
*/
public function __construct($root, $view, $path, $fileInfo = null, ?Node $parent = null, bool $infoHasSubMountsIncluded = true) {
public function __construct(IRootFolder $root, $view, $path, $fileInfo = null, ?Node $parent = null, bool $infoHasSubMountsIncluded = true) {
if (Filesystem::normalizePath($view->getRoot()) !== '/') {
throw new PreConditionNotMetException('The view passed to the node should not have any fake root set');
}
Expand Down Expand Up @@ -402,7 +400,7 @@ public function unlock($type) {

/**
* @param string $targetPath
* @return \OC\Files\Node\Node
* @return \OCP\Files\Node
* @throws InvalidPathException
* @throws NotFoundException
* @throws NotPermittedException if copy not allowed or failed
Expand All @@ -428,7 +426,7 @@ public function copy($targetPath) {

/**
* @param string $targetPath
* @return \OC\Files\Node\Node
* @return \OCP\Files\Node
* @throws InvalidPathException
* @throws NotFoundException
* @throws NotPermittedException if move not allowed or failed
Expand Down