Merge pull request #38604 from fsamapoor/replace_strpos_calls_in_workflowengine_app

Refactors "strpos" calls in /apps/workflowengine
pull/39660/head^2
Côme Chilliet 2 years ago committed by GitHub
commit bfe42de8f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      apps/workflowengine/lib/Check/FileMimeType.php
  2. 4
      apps/workflowengine/lib/Check/RequestURL.php
  3. 4
      apps/workflowengine/tests/Check/FileMimeTypeTest.php

@ -151,11 +151,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/')
);
}
@ -165,7 +165,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/')
);
}

@ -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/')
);
}
}

@ -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;
}
}

Loading…
Cancel
Save