Skip to content

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

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 8 commits into from
Jul 6, 2023
Merged

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

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5640339
fix: expect interface, not a specific implementation
blizzz Jun 2, 2023
e5e9df2
fix: add typehine for IRootFolder
blizzz Jun 2, 2023
d5b69c1
chore: ugly type juggling
blizzz Jun 8, 2023
481cbaf
refactor: declare getMount() and getMountsIn() at IRootFolder
blizzz Jun 15, 2023
c2fdee7
ci: pro forma check of existence of internal method
blizzz Jun 16, 2023
5ca35c9
docs: adjust @since version to backport
blizzz Jun 26, 2023
2930f89
ci: adjust return annotation to older psalm version
blizzz Jun 26, 2023
1eb9f18
fix: adjust to PHP level and codebase
blizzz Jul 4, 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
ci: pro forma check of existence of internal method 
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 <[email protected]>
  • Loading branch information
@blizzz
blizzz committed Jul 4, 2023
commit c2fdee7f6e790051c1a9118ba5a7dfc4619c2711
16 changes: 9 additions & 7 deletions lib/private/Files/Node/Folder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
use OCP\Files\Cache\ICacheEntry;
use OCP\Files\FileInfo;
use OCP\Files\Mount\IMountPoint;
use OCP\Files\Node as INode;
use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
use OCP\Files\Search\ISearchBinaryOperator;
Expand Down Expand Up @@ -108,12 +109,7 @@ public function getDirectoryListing() {
}, $folderContent);
}

/**
* @param string $path
* @param FileInfo $info
* @return File|Folder
*/
protected function createNode($path, FileInfo $info = null) {
protected function createNode(string $path, ?FileInfo $info = null, bool $infoHasSubMountsIncluded = true): INode {
if (is_null($info)) {
$isDir = $this->view->is_dir($path);
} else {
Expand Down Expand Up @@ -329,6 +325,12 @@ protected function getAppDataDirectoryName(): string {
* @return array
*/
protected function getByIdInRootMount(int $id): array {
if (!method_exists($this->root, 'createNode')) {
// Always expected to be false. Being a method of Folder, this is
// always implemented. For it is an internal method and should not
// be exposed and made public, it is not part of an interface.
return [];
}
$mount = $this->root->getMount('');
$storage = $mount->getStorage();
$cacheEntry = $storage?->getCache($this->path)->get($id);
Expand Down Expand Up @@ -384,7 +386,7 @@ public function getNonExistingName($name) {
/**
* @param int $limit
* @param int $offset
* @return \OCP\Files\Node[]
* @return INode[]
*/
public function getRecent($limit, $offset = 0) {
$filterOutNonEmptyFolder = new SearchBinaryOperator(
Expand Down