Skip to content

[stable30] Ci fixes #48205

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
icewind1991 merged 17 commits into from
Sep 19, 2024
Merged

[stable30] Ci fixes #48205

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
337df1f
fix: Drop unnecessary exit
artonge Sep 17, 2024
5bcd74a
fix: get source file before moving the cache item in objectstore move…
icewind1991 Sep 18, 2024
9b07b7d
fix: create intermediate directories for objectstore moveFromStorage
icewind1991 Sep 18, 2024
e8c7216
fix: cleanup objectstore file_put_content
icewind1991 Sep 18, 2024
1e03bd5
fix: fix object store id for test object store
icewind1991 Sep 18, 2024
7b1b552
fix: verify that parent exists in cache when inserting
icewind1991 Sep 18, 2024
e82ab78
test: fix incorrect ltrim usage in test
icewind1991 Sep 18, 2024
dd68f67
fix: ensure parent folder exists when writing a file to object storage
icewind1991 Sep 18, 2024
8b8508c
test: put parent items into cache in tests
icewind1991 Sep 18, 2024
8a15676
test: fix service overwrite in PartFileInRootUploadTest
icewind1991 Sep 18, 2024
bf480bb
test: fix ShareAPIControllerTest.php
icewind1991 Sep 18, 2024
d2d475a
test: fix trashbin StorageTest
icewind1991 Sep 18, 2024
25449de
test: fix ShareControllerTest.php
icewind1991 Sep 18, 2024
8bff8d2
fix: Override start method of \Sabre\DAV\Server to remove exception o…
artonge Sep 18, 2024
b44ac82
fix(tests): Remove deprecated tests for ServerTest
come-nc Sep 17, 2024
61da345
fix(tests): Fix Folder tests
come-nc Sep 17, 2024
767af54
fix: Prevent duplicate creation of print_exception function
artonge Sep 18, 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
Next Next commit
fix: fix object store id for test object store 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed Sep 19, 2024
commit 1e03bd5d18f087e10ab8aca29f8d3737a99406c5
4 changes: 2 additions & 2 deletions lib/private/Files/ObjectStore/StorageObjectStore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ public function __construct(IStorage $storage) {
* @return string the container or bucket name where objects are stored
* @since 7.0.0
*/
public function getStorageId() {
$this->storage->getId();
public function getStorageId(): string {
return $this->storage->getId();
}

/**
Expand Down