diff --git a/rector.php b/rector.php index d0654af14..be2a4b6d8 100644 --- a/rector.php +++ b/rector.php @@ -14,5 +14,5 @@ return RectorConfig::configure() ]) ->withImportNames(importShortClasses: false) ->withAttributesSets(doctrine: true) - ->withPhpSets(php55: true) + ->withPhpSets(php70: true) ->withTypeCoverageLevel(0); diff --git a/src/Controller/EntryController.php b/src/Controller/EntryController.php index 7f184d2b5..e1ee1212c 100644 --- a/src/Controller/EntryController.php +++ b/src/Controller/EntryController.php @@ -626,7 +626,7 @@ class EntryController extends AbstractController private function showEntries($type, Request $request, $page) { $searchTerm = (isset($request->query->all('search_entry')['term']) ? trim($request->query->all('search_entry')['term']) : ''); - $currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : ''); + $currentRoute = $request->query->get('currentRoute') ?? ''; $currentEntryId = $request->attributes->getInt('id'); $formOptions = []; diff --git a/src/Controller/ExportController.php b/src/Controller/ExportController.php index ce622a956..64f75c3a2 100644 --- a/src/Controller/ExportController.php +++ b/src/Controller/ExportController.php @@ -77,8 +77,8 @@ class ExportController extends AbstractController $title = 'Tag ' . $tag->getLabel(); } elseif ('search' === $category) { - $searchTerm = (isset($request->query->all('search_entry')['term']) ? $request->query->all('search_entry')['term'] : ''); - $currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : ''); + $searchTerm = $request->query->all('search_entry')['term'] ?? ''; + $currentRoute = $request->query->get('currentRoute') ?? ''; $entries = $entryRepository->getBuilderForSearchByUser( $this->getUser()->getId(), diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php index 5be29a6cc..58e069926 100644 --- a/src/Controller/UserController.php +++ b/src/Controller/UserController.php @@ -161,7 +161,7 @@ class UserController extends AbstractController $form->handleRequest($request); if ($form->isSubmitted() && $form->isValid()) { - $searchTerm = (isset($request->query->all('search_user')['term']) ? $request->query->all('search_user')['term'] : ''); + $searchTerm = $request->query->all('search_user')['term'] ?? ''; $qb = $userRepository->getQueryBuilderForSearch($searchTerm); } diff --git a/src/Helper/ContentProxy.php b/src/Helper/ContentProxy.php index bfdc9f163..aefa8eeb0 100644 --- a/src/Helper/ContentProxy.php +++ b/src/Helper/ContentProxy.php @@ -59,7 +59,7 @@ class ContentProxy $fetchedContent['title'] = $this->sanitizeContentTitle( $fetchedContent['title'], - isset($fetchedContent['headers']['content-type']) ? $fetchedContent['headers']['content-type'] : '' + $fetchedContent['headers']['content-type'] ?? '' ); // when content is imported, we have information in $content diff --git a/src/SiteConfig/ArraySiteConfigBuilder.php b/src/SiteConfig/ArraySiteConfigBuilder.php index d150650c4..188ca42c9 100644 --- a/src/SiteConfig/ArraySiteConfigBuilder.php +++ b/src/SiteConfig/ArraySiteConfigBuilder.php @@ -25,10 +25,6 @@ class ArraySiteConfigBuilder implements SiteConfigBuilder $host = substr($host, 4); } - if (isset($this->configs[$host])) { - return $this->configs[$host]; - } - - return false; + return $this->configs[$host] ?? false; } }