upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Refactors "strpos" calls in /apps/workflowengine to improve code readability.

Browse source 
Signed-off-by: Faraz Samapoor <f.samapoor@gmail.com>
Signed-off-by: Faraz Samapoor <fsa@adlas.at>
This commit is contained in:
Faraz Samapoor 2023-06-02 14:09:03 +03:30
parent 67709b390a
commit 5db241b942
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/workflowengine/lib/Check/FileMimeType.php
View file

@ -157,11 +157,11 @@ class FileMimeType extends AbstractStringCheck implements IFileCheck {
protected function isWebDAVRequest() {
return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
$this->request->getPathInfo() === '/webdav' ||
strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
str_starts_with($this->request->getPathInfo(), '/webdav/') ||
$this->request->getPathInfo() === '/dav/files' ||
strpos($this->request->getPathInfo(), '/dav/files/') === 0 ||
str_starts_with($this->request->getPathInfo(), '/dav/files/') ||
$this->request->getPathInfo() === '/dav/uploads' ||
strpos($this->request->getPathInfo(), '/dav/uploads/') === 0
str_starts_with($this->request->getPathInfo(), '/dav/uploads/')
);
}
@ -171,7 +171,7 @@ class FileMimeType extends AbstractStringCheck implements IFileCheck {
protected function isPublicWebDAVRequest() {
return substr($this->request->getScriptName(), 0 - strlen('/public.php')) === '/public.php' && (
$this->request->getPathInfo() === '/webdav' ||
strpos($this->request->getPathInfo(), '/webdav/') === 0
str_starts_with($this->request->getPathInfo(), '/webdav/')
);
}

4
apps/workflowengine/lib/Check/RequestURL.php
View file

@ -90,9 +90,9 @@ class RequestURL extends AbstractStringCheck {
}
return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
$this->request->getPathInfo() === '/webdav' ||
strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
str_starts_with($this->request->getPathInfo(), '/webdav/') ||
$this->request->getPathInfo() === '/dav/files' ||
strpos($this->request->getPathInfo(), '/dav/files/') === 0
str_starts_with($this->request->getPathInfo(), '/dav/files/')
);
}
}

4
apps/workflowengine/tests/Check/FileMimeTypeTest.php
View file

@ -68,7 +68,7 @@ class FileMimeTypeTest extends TestCase {
$this->mimeDetector->method('detectPath')
->willReturnCallback(function ($path) {
foreach ($this->extensions as $extension => $mime) {
if (strpos($path, $extension) !== false) {
if (str_contains($path, $extension)) {
return $mime;
}
}
@ -78,7 +78,7 @@ class FileMimeTypeTest extends TestCase {
->willReturnCallback(function ($path) {
$body = file_get_contents($path);
foreach ($this->content as $match => $mime) {
if (strpos($body, $match) !== false) {
if (str_contains($body, $match)) {
return $mime;
}
}