Commit dda3bcc
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
1 file changed
+2
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| 41 | + | |
41 | 42 | | |
42 | 43 | | |
43 | 44 | | |
| |||
330 | 331 | | |
331 | 332 | | |
332 | 333 | | |
333 | | - | |
| 334 | + | |
334 | 335 | | |
335 | 336 | | |
336 | 337 | | |
| |||
0 commit comments