Skip to content

refactor(LazyFolder): drop redundant normalizePath call in getFullPath #57330

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

Closed
joshtrichards wants to merge 1 commit into from
Closed

refactor(LazyFolder): drop redundant normalizePath call in getFullPath #57330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 9 additions & 17 deletions lib/private/Files/Node/LazyFolder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,22 @@
use Override;

/**
* Class LazyFolder
* Folder implementation that defers instantiation of the underlying folder object until needed.
*
* This is a lazy wrapper around a folder. So only
* once it is needed this will get initialized.
* Useful for optimizing performance and resource usage by loading folder data only on demand.
* Supports transparent delegation of most Folder interface methods.
*
* @package OC\Files\Node
*/
class LazyFolder implements Folder {
/** @var \Closure(): Folder */
private \Closure $folderClosure;
protected ?Folder $folder = null;
protected IRootFolder $rootFolder;
protected array $data;

/**
* @param IRootFolder $rootFolder
* @param \Closure(): Folder $folderClosure
* @param array $data
*/
public function __construct(IRootFolder $rootFolder, \Closure $folderClosure, array $data = []) {
$this->rootFolder = $rootFolder;
$this->folderClosure = $folderClosure;
$this->data = $data;
public function __construct(
protected readonly IRootFolder $rootFolder,
/** @var \Closure(): Folder */
private \Closure $folderClosure,
protected array $data = []
) {
}

protected function getRootFolder(): IRootFolder {
Expand Down Expand Up @@ -399,7 +392,6 @@ public function getExtension(): string {
*/
public function getFullPath($path) {
if (isset($this->data['path'])) {
$path = PathHelper::normalizePath($path);
if (!Filesystem::isValidPath($path)) {
throw new NotPermittedException('Invalid path "' . $path . '"');
}
Expand Down
Loading