diff --git a/core/Controller/ClientFlowLoginController.php b/core/Controller/ClientFlowLoginController.php index 85a793bd92b1f..2876621c97b38 100644 --- a/core/Controller/ClientFlowLoginController.php +++ b/core/Controller/ClientFlowLoginController.php @@ -368,9 +368,9 @@ public function apptokenRedirect(string $stateToken, string $user, string $passw private function getServerPath(): string { $serverPostfix = ''; - if (strpos($this->request->getRequestUri(), '/index.php') !== false) { + if (str_contains($this->request->getRequestUri(), '/index.php')) { $serverPostfix = substr($this->request->getRequestUri(), 0, strpos($this->request->getRequestUri(), '/index.php')); - } elseif (strpos($this->request->getRequestUri(), '/login/flow') !== false) { + } elseif (str_contains($this->request->getRequestUri(), '/login/flow')) { $serverPostfix = substr($this->request->getRequestUri(), 0, strpos($this->request->getRequestUri(), '/login/flow')); } diff --git a/core/Controller/ClientFlowLoginV2Controller.php b/core/Controller/ClientFlowLoginV2Controller.php index ef16cfbd04bf5..0c12f1a612f45 100644 --- a/core/Controller/ClientFlowLoginV2Controller.php +++ b/core/Controller/ClientFlowLoginV2Controller.php @@ -363,9 +363,9 @@ private function loginTokenForbiddenResponse(): StandaloneTemplateResponse { private function getServerPath(): string { $serverPostfix = ''; - if (strpos($this->request->getRequestUri(), '/index.php') !== false) { + if (str_contains($this->request->getRequestUri(), '/index.php')) { $serverPostfix = substr($this->request->getRequestUri(), 0, strpos($this->request->getRequestUri(), '/index.php')); - } elseif (strpos($this->request->getRequestUri(), '/login/v2') !== false) { + } elseif (str_contains($this->request->getRequestUri(), '/login/v2')) { $serverPostfix = substr($this->request->getRequestUri(), 0, strpos($this->request->getRequestUri(), '/login/v2')); } diff --git a/core/Controller/CssController.php b/core/Controller/CssController.php index 4cd2996835ecd..792be71f9e138 100644 --- a/core/Controller/CssController.php +++ b/core/Controller/CssController.php @@ -101,7 +101,7 @@ public function getCss(string $fileName, string $appName): Response { private function getFile(ISimpleFolder $folder, string $fileName, bool &$gzip): ISimpleFile { $encoding = $this->request->getHeader('Accept-Encoding'); - if (strpos($encoding, 'gzip') !== false) { + if (str_contains($encoding, 'gzip')) { try { $gzip = true; return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz diff --git a/core/Controller/JsController.php b/core/Controller/JsController.php index 885de5491e7d1..6b3e7ff2ed2af 100644 --- a/core/Controller/JsController.php +++ b/core/Controller/JsController.php @@ -99,7 +99,7 @@ public function getJs(string $fileName, string $appName): Response { private function getFile(ISimpleFolder $folder, string $fileName, bool &$gzip): ISimpleFile { $encoding = $this->request->getHeader('Accept-Encoding'); - if (strpos($encoding, 'gzip') !== false) { + if (str_contains($encoding, 'gzip')) { try { $gzip = true; return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php index aa6617c4b6d94..9c64204b8980d 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -275,7 +275,7 @@ private function generateRedirect(?string $redirectUrl): RedirectResponse { $location = $this->urlGenerator->getAbsoluteURL($redirectUrl); // Deny the redirect if the URL contains a @ // This prevents unvalidated redirects like ?redirect_url=:user@domain.com - if (strpos($location, '@') === false) { + if (!str_contains($location, '@')) { return new RedirectResponse($location); } } diff --git a/core/Controller/NavigationController.php b/core/Controller/NavigationController.php index 6b994ca33f10b..a1c3f917fe350 100644 --- a/core/Controller/NavigationController.php +++ b/core/Controller/NavigationController.php @@ -94,10 +94,10 @@ private function generateETag(array $navigation): string { */ private function rewriteToAbsoluteUrls(array $navigation): array { foreach ($navigation as &$entry) { - if (0 !== strpos($entry['href'], $this->urlGenerator->getBaseUrl())) { + if (!str_starts_with($entry['href'], $this->urlGenerator->getBaseUrl())) { $entry['href'] = $this->urlGenerator->getAbsoluteURL($entry['href']); } - if (0 !== strpos($entry['icon'], $this->urlGenerator->getBaseUrl())) { + if (!str_starts_with($entry['icon'], $this->urlGenerator->getBaseUrl())) { $entry['icon'] = $this->urlGenerator->getAbsoluteURL($entry['icon']); } } diff --git a/core/ajax/update.php b/core/ajax/update.php index dae08ad0882f9..fc35a5cc4a53b 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -44,7 +44,7 @@ use OC\Repair\Events\RepairStepEvent; use OC\Repair\Events\RepairWarningEvent; -if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) { +if (!str_contains(@ini_get('disable_functions'), 'set_time_limit')) { @set_time_limit(0); }