Skip to content

fix: Exclude Readme.md files from file locking in the text app #8284

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

Open
rikled wants to merge 6 commits into
base: main
Choose a base branch
from
+4 −1
Open

fix: Exclude Readme.md files from file locking in the text app #8284

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6bf0f96
fix: exclude Readme.md files from file locking in the text app
rikled Feb 19, 2026
8eb2e73
fix: make the check case insensitive
rikled Feb 19, 2026
1ab951c
fixed style issues
rikled Feb 19, 2026
36807db
fix: check if name is null
rikled Feb 20, 2026
ff8dfc3
fix: attempt to make psalm happy
rikled Feb 20, 2026
a48e03d
fix: another attempt to make psalm happy
rikled Feb 20, 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 @@ -129,7 +129,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) {
Comment on lines +134 to +135
Copy link
Member

@juliusknorr juliusknorr Feb 26, 2026

Choose a reason for hiding this comment

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

Suggested change
/** @psalm-suppress RedundantCastGivenDocblockType */
if (!$readOnly && strcasecmp((string)$file->getName(), 'Readme.md') !== 0) {
if (!$readOnly && strcasecmp($file->getName(), 'Readme.md') !== 0) {

I think if the phpunit tests fail on that it is rather due to the file mock not having calls of getName mocked.

Probably just a matter of addding in

text/tests/unit/Service/ApiServiceTest.php

Line 77 in 16f94d8

$file->method('getId')->willReturn($id); 

$file->method('getName')->willReturn('MyFile.md');

Copy link
Member

@juliusknorr juliusknorr Feb 26, 2026

Choose a reason for hiding this comment

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

When running with the real implementation it is always returning a string

https://github.com/nextcloud/server/blob/0d6c5516947cbe0837ab4731b00bbd60f37908d0/lib/public/Files/Node.php#L214
http://github.com/nextcloud/server/blob/0d6c5516947cbe0837ab4731b00bbd60f37908d0/lib/private/Files/Node/Node.php#L313
Especially since basename always returns a string, not null or anything else: https://www.php.net/manual/en/function.basename.php

Copy link
Author

@rikled rikled Feb 27, 2026

Choose a reason for hiding this comment

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

So, shall I fix the tests then?

$isLocked = $this->documentService->lock($file->getId());
if (!$isLocked) {
$readOnly = true;
Expand Down
Loading