Skip to content

Commit dda3bcc

Browse files
committed
fix: tests
The original PR #4496 targeting **master** already includes the `private TrashManager $trashManager;` property declaration and the `use` import. The diff shows it properly adds both. The backport PR #4497 **lost the property declaration** during the backport process. The PR description even warns about this: "This backport's changes differ from the original and might be incomplete." What likely happened: the `master` branch and `stable32` branch have slightly different property orderings or surrounding context in `TrashBackendTest.php` (e.g., `master` doesn't have the `ACLManager` property, or they're in a different order). When the automated backport tool cherry-picked the changes, the hunk adding `private TrashManager $trashManager;` failed to apply cleanly and was silently dropped, while the code in `setUp()` and the new test method that *uses* `$this->trashManager` did apply — resulting in the mismatch. Signed-off-by: Iva Horn <iva.horn@nextcloud.com>
1 parent e6f352c commit dda3bcc

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

tests/Trash/TrashBackendTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class TrashBackendTest extends TestCase {
3838

3939
private string $folderName;
4040
private TrashBackend $trashBackend;
41+
private TrashManager $trashManager;
4142
private FolderManager $folderManager;
4243
private ACLManager $aclManager;
4344
private RuleManager $ruleManager;
@@ -330,7 +331,7 @@ public function testMoveToTrashSameNameDifferentSubfolders(): void {
330331

331332
// Verify the DB records exist
332333
$dbRows = $this->trashManager->listTrashForFolders([$this->folderId]);
333-
$dbReadmeRows = array_values(array_filter($dbRows, fn ($row) => $row['name'] === 'Readme.md'));
334+
$dbReadmeRows = array_values(array_filter($dbRows, fn (array $row) => $row['name'] === 'Readme.md'));
334335
$this->assertCount(2, $dbReadmeRows, 'Both Readme.md entries should exist in oc_group_folders_trash');
335336

336337
$this->logout();

0 commit comments

Comments
 (0)