Skip to content

Backport/8284/stable31 #8341

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

Closed
JuliaKirschenheuter wants to merge 7 commits into from
Closed

Backport/8284/stable31 #8341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ace5f26
fix: exclude Readme.md files from file locking in the text app
rikled Feb 19, 2026
297cd68
fix: make the check case insensitive
rikled Feb 19, 2026
b8ac1d7
fixed style issues
rikled Feb 19, 2026
423efd9
fix: check if name is null
rikled Feb 20, 2026
cdec259
fix: attempt to make psalm happy
rikled Feb 20, 2026
255580e
fix: another attempt to make psalm happy
rikled Feb 20, 2026
d31adc7
removed psalm suppress and cast, fixed tests
rikled Mar 4, 2026
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
5 changes: 4 additions & 1 deletion lib/Service/ApiService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,10 @@ public function create(?int $fileId = null, ?string $filePath = null, ?string $b

$hasOwner = $file->getOwner() !== null;

if (!$readOnly) {
// Disable file locking for Readme.md files, because in the
// current setup, this makes it almost impossible to delete these files.
/** @psalm-suppress RedundantCastGivenDocblockType */
if (!$readOnly && strcasecmp((string)$file->getName(), 'Readme.md') !== 0) {
Copy link
Contributor

@rikled rikled Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we don't need the string cast anymore since I added a name in the ApiServiceTest.php

Copy link
Contributor

@rikled rikled Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then you should also be able to remove /** @psalm-suppress RedundantCastGivenDocblockType */

Copy link
Contributor Author

@JuliaKirschenheuter JuliaKirschenheuter Mar 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you @rikled! Then it will look like:

if (!$readOnly) {

Copy link
Contributor

@rikled rikled Mar 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I think it should look like this:

		// Disable file locking for Readme.md files, because in the
		// current setup, this makes it almost impossible to delete these files.
		if (!$readOnly && strcasecmp($file->getName(), 'Readme.md') !== 0) {

so just remove the string cast and the psalm suppress command. Then hopefully the php unit tests will still pass.

$isLocked = $this->documentService->lock($file->getId());
if (!$isLocked) {
$readOnly = true;
Expand Down
1 change: 1 addition & 0 deletions tests/unit/Service/ApiServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ private function mockFile(int $id, ?string $owner) {
$file->method('getStorage')->willReturn($storage);
$file->method('getId')->willReturn($id);
$file->method('getOwner')->willReturn($owner);
$file->method('getName')->willReturn('name');
return $file;
}

Expand Down
Loading