From e18bf518cdeec4aaa66351a4f1c9d3ae2c1b3da6 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 27 Nov 2020 22:56:16 +0100 Subject: [PATCH] phpstan fixes --- Controller/SearchController.php | 16 ++++++++++------ Controller/TimerecordingController.php | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Controller/SearchController.php b/Controller/SearchController.php index 78a5374..17dcfa1 100755 --- a/Controller/SearchController.php +++ b/Controller/SearchController.php @@ -52,13 +52,17 @@ final class SearchController extends Controller /** @var \Modules\Navigation\Models\NavElement[] $elements */ $elements = NavElementMapper::getAll(); - $search = \mb_strtolower(\substr( - $request->getData('search'), - \stripos( + + $searchIdStartPos = \stripos($request->getData('search'), ':'); + $patternStartPos = $searchIdStartPos === false ? -1 : \stripos( $request->getData('search'), ' ', - \stripos($request->getData('search'), ':') - ) + 1 + $searchIdStartPos + ); + + $search = \mb_strtolower(\substr( + $request->getData('search'), + $patternStartPos + 1 )); $found = null; @@ -81,7 +85,7 @@ final class SearchController extends Controller $response->header->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true); - if ($found === null) { + if ($found === null || $found->uri === null) { $this->fillJsonResponse($request, $response, NotificationLevel::WARNING, 'Command', 'Unknown command "' . $search . '"', $search); $response->header->status = RequestStatusCode::R_400; diff --git a/Controller/TimerecordingController.php b/Controller/TimerecordingController.php index d0d116d..94a15d9 100755 --- a/Controller/TimerecordingController.php +++ b/Controller/TimerecordingController.php @@ -53,7 +53,7 @@ final class TimerecordingController extends Controller $navView = new NavigationView($this->app->l11nManager, $request, $response); $navView->setTemplate('/Modules/Navigation/Theme/Backend/mid'); $navView->setNav($nav->getNav()); - $navView->setParent($pageId); + $navView->parent = $pageId; return $navView; } @@ -145,7 +145,7 @@ final class TimerecordingController extends Controller $navView->setTemplate('/Modules/Navigation/Theme/Timerecording/splash'); $navView->setNav($nav->getNav()); - $navView->setParent($pageId); + $navView->parent = $pageId; return $navView; }