Skip to content
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.

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

[stable28] Ci fixes #48213

Open
wants to merge 18 commits into
base: stable28
Choose a base branch
from
Open

[stable28] Ci fixes #48213

wants to merge 18 commits into from

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Sep 19, 2024

Backport of #48205

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

Todo

  • Review and resolve any conflicts
  • Remove all the empty commits
  • 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 bug 3. to review Waiting for reviews php Pull requests that update Php code CI labels Sep 19, 2024
@backportbot backportbot bot added this to the Nextcloud 28.0.11 milestone Sep 19, 2024
@artonge artonge changed the title [stable28] [stable30] Ci fixes [stable28] Ci fixes Sep 19, 2024
artonge and others added 16 commits September 19, 2024 18:07
Signed-off-by: Louis Chemineau <louis@chmn.me>
…FromStorage

Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
…utput

Signed-off-by: Louis Chemineau <louis@chmn.me>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Louis Chemineau <louis@chmn.me>
if (!($trashStorage->instanceOfStorage(ObjectStoreStorage::class) && $trashStorage->getId() === $sourceStorage->getId())) {
$trashStorage->moveFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath);
}
if ($trashStorage->getCache()->inCache($sourceInternalPath)) {

Check notice

Code scanning / Psalm

PossiblyUndefinedVariable Note

Possibly undefined variable $trashStorage, first seen on line 296
if (!($trashStorage->instanceOfStorage(ObjectStoreStorage::class) && $trashStorage->getId() === $sourceStorage->getId())) {
$trashStorage->moveFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath);
}
if ($trashStorage->getCache()->inCache($sourceInternalPath)) {
$trashStorage->getUpdater()->renameFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath);

Check notice

Code scanning / Psalm

PossiblyUndefinedVariable Note

Possibly undefined variable $trashStorage, first seen on line 296
@icewind1991 icewind1991 marked this pull request as ready for review September 19, 2024 19:40
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
Copy link
Member

had to include a variation of #48224 here: 774227d

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 bug CI php Pull requests that update Php code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants