[ticket/16955] Clean up rrouter and fulltext_sphinx

PHPBB3-16955
This commit is contained in:
Marc Alexander 2022-12-26 14:52:50 +01:00
parent 056f786769
commit b90f384466
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 3 additions and 2 deletions

View file

@ -58,12 +58,12 @@ class router implements RouterInterface
protected $php_ext; protected $php_ext;
/** /**
* @var \Symfony\Component\Routing\Matcher\UrlMatcherInterface|null * @var \Symfony\Component\Routing\Matcher\UrlMatcherInterface
*/ */
protected $matcher; protected $matcher;
/** /**
* @var \Symfony\Component\Routing\Generator\UrlGeneratorInterface|null * @var \Symfony\Component\Routing\Generator\UrlGeneratorInterface
*/ */
protected $generator; protected $generator;

View file

@ -855,6 +855,7 @@ class fulltext_sphinx implements search_backend_interface
generate a config for the index. We use a config value generate a config for the index. We use a config value
fulltext_sphinx_id for this, as it should be unique. */ fulltext_sphinx_id for this, as it should be unique. */
$config_object = new \phpbb\search\backend\sphinx\config(); $config_object = new \phpbb\search\backend\sphinx\config();
/** @psalm-suppress UndefinedVariable */
$config_data = array( $config_data = array(
'source source_phpbb_' . $this->id . '_main' => array( 'source source_phpbb_' . $this->id . '_main' => array(
array('type', $this->dbtype . ' # mysql or pgsql'), array('type', $this->dbtype . ' # mysql or pgsql'),