From b90f38446618766fef442ced66b7abd4948a14fa Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 26 Dec 2022 14:52:50 +0100 Subject: [PATCH] [ticket/16955] Clean up rrouter and fulltext_sphinx PHPBB3-16955 --- phpBB/phpbb/routing/router.php | 4 ++-- phpBB/phpbb/search/backend/fulltext_sphinx.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/routing/router.php b/phpBB/phpbb/routing/router.php index 18285c06d5..e6f887cca7 100644 --- a/phpBB/phpbb/routing/router.php +++ b/phpBB/phpbb/routing/router.php @@ -58,12 +58,12 @@ class router implements RouterInterface protected $php_ext; /** - * @var \Symfony\Component\Routing\Matcher\UrlMatcherInterface|null + * @var \Symfony\Component\Routing\Matcher\UrlMatcherInterface */ protected $matcher; /** - * @var \Symfony\Component\Routing\Generator\UrlGeneratorInterface|null + * @var \Symfony\Component\Routing\Generator\UrlGeneratorInterface */ protected $generator; diff --git a/phpBB/phpbb/search/backend/fulltext_sphinx.php b/phpBB/phpbb/search/backend/fulltext_sphinx.php index 709690b4f2..5092f67ae5 100644 --- a/phpBB/phpbb/search/backend/fulltext_sphinx.php +++ b/phpBB/phpbb/search/backend/fulltext_sphinx.php @@ -855,6 +855,7 @@ class fulltext_sphinx implements search_backend_interface generate a config for the index. We use a config value fulltext_sphinx_id for this, as it should be unique. */ $config_object = new \phpbb\search\backend\sphinx\config(); + /** @psalm-suppress UndefinedVariable */ $config_data = array( 'source source_phpbb_' . $this->id . '_main' => array( array('type', $this->dbtype . ' # mysql or pgsql'),