Skip to content

Conversation

@backportbot
Copy link

@backportbot backportbot bot commented Feb 11, 2025

Backport of #50324

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot bot added the 3. to review Waiting for reviews label Feb 11, 2025
@backportbot backportbot bot added this to the Nextcloud 30.0.6 milestone Feb 11, 2025
Signed-off-by: Robin Appelman <robin@icewind.nl>
…detected an update

Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
Copy link
Member

removed the interface changes

if (!(str_starts_with($storageId, 'home::') || str_starts_with($storageId, 'object::user'))) {
$cache = $this->getCache();
$this->watcher = parent::getWatcher($path, $storage);
if ($cache instanceof Cache && $this->watcher instanceof Watcher) {

Check notice

Code scanning / Psalm

RedundantConditionGivenDocblockType Note

Docblock-defined type OC\Files\Cache\Watcher for $this->watcher is always OC\Files\Cache\Watcher
This was referenced Feb 11, 2025
@AndyScherzinger AndyScherzinger merged commit 094ea5c into stable30 Feb 13, 2025
172 of 175 checks passed
@AndyScherzinger AndyScherzinger deleted the backport/50324/stable30 branch February 13, 2025 15:43
@blizzz blizzz mentioned this pull request Mar 4, 2025
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants