Skip to content

[stable27] fix: don't return null for SharedStorage::getWrapperStorage with share recursion #44415

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
sorbaugh merged 2 commits into from
Mar 25, 2024
Merged

[stable27] fix: don't return null for SharedStorage::getWrapperStorage with share recursion #44415

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
459c174
fix: don't return null for SharedStorage::getWrapperStorage with shar…
icewind1991 Mar 11, 2024
7982645
chore: improve typing for SharedStorage::$storage
icewind1991 Mar 11, 2024
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
chore: improve typing for SharedStorage::$storage 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @backportbot
icewind1991 authored and backportbot[bot] committed Mar 22, 2024
commit 7982645f6676aeb2bb7f2bdcea98dbd1580a4b9b
9 changes: 9 additions & 0 deletions apps/files_sharing/lib/SharedStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto

private static int $initDepth = 0;

/**
* @psalm-suppress NonInvariantDocblockPropertyType
* @var ?\OC\Files\Storage\Storage $storage
*/
protected $storage;

public function __construct($arguments) {
$this->ownerView = $arguments['ownerView'];
$this->logger = \OC::$server->getLogger();
Expand Down Expand Up @@ -136,6 +142,9 @@ private function getSourceRootInfo() {
return $this->sourceRootInfo;
}

/**
* @psalm-assert \OC\Files\Storage\Storage $this->storage
*/
private function init() {
if ($this->initialized) {
if (!$this->storage) {
Expand Down