-
phpBB 3.3.x takes advantage of new features added in PHP 7.1. We recommend that you upgrade to the latest stable release of PHP to run phpBB. The minimum version required is PHP 7.1.3 and the maximum supported version is the latest stable version of PHP.
+
phpBB 4.0.x takes advantage of new features added in PHP 8.1. We recommend that you upgrade to the latest stable release of PHP to run phpBB. The minimum version required is PHP 8.1.0 and the maximum supported version is the latest stable version of PHP.
Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.
-
This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQLi 4.1.3, 4.x, 5.x, MariaDB 5.x, PostgreSQL 8.x, Oracle 8 and SQLite 3. Versions of PHP used range from 7.1.3 to 7.2.x and 7.3.x without issues.
+
This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQLi 4.1.3, 4.x, 5.x, MariaDB 5.x, PostgreSQL 8.x, Oracle 8 and SQLite 3. Versions of PHP used range from 8.1.x to 8.2.x and 8.3.x.
7.i. Notice on PHP security issues
diff --git a/phpBB/includes/compatibility_globals.php b/phpBB/includes/compatibility_globals.php
index 223c8a0120..df152c81ab 100644
--- a/phpBB/includes/compatibility_globals.php
+++ b/phpBB/includes/compatibility_globals.php
@@ -45,7 +45,7 @@ function register_compatibility_globals()
// Instantiate some basic classes
/* @var $phpbb_dispatcher \phpbb\event\dispatcher */
- $phpbb_dispatcher = $phpbb_container->get('dispatcher');
+ $phpbb_dispatcher = $phpbb_container->get('event_dispatcher');
/* @var $request \phpbb\request\request_interface */
$request = $phpbb_container->get('request');
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 379422b819..61a156ae65 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -36,7 +36,7 @@ function gen_rand_string($num_chars = 8)
$output = '';
for ($i = 0; $i < $num_chars; $i++)
{
- $rand = random_int(0, $size-1);
+ $rand = random_int(0, $size - 1);
$output .= $range[$rand];
}
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index e82b2168b4..337b6ccab8 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1056,7 +1056,8 @@ class parse_message extends bbcode_firstpass
function __construct($message = '')
{
// Init BBCode UID
- $this->bbcode_uid = substr(base_convert(unique_id(), 16, 36), 0, BBCODE_UID_LEN);
+ $unique_id = preg_replace('/[^0-9a-f]/', '', unique_id());
+ $this->bbcode_uid = substr(base_convert($unique_id, 16, 36), 0, BBCODE_UID_LEN);
$this->message = $message;
}
diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php
index 2f4b291213..dac52a025f 100644
--- a/phpBB/includes/startup.php
+++ b/phpBB/includes/startup.php
@@ -23,11 +23,11 @@ $level = E_ALL & ~E_NOTICE & ~E_DEPRECATED;
error_reporting($level);
/**
-* Minimum Requirement: PHP 7.3.0
+* Minimum Requirement: PHP 8.1.0
*/
-if (version_compare(PHP_VERSION, '7.3.0', '<'))
+if (version_compare(PHP_VERSION, '8.1.0', '<'))
{
- die('You are running an unsupported PHP version (' . PHP_VERSION . '). Please upgrade to PHP 7.3.0 or higher before trying to install or update to phpBB 4.0');
+ die('You are running an unsupported PHP version (' . PHP_VERSION . '). Please upgrade to PHP 8.1.0 or higher before trying to install or update to phpBB 4.0');
}
// In PHP 5.3.0 the error level has been raised to E_WARNING which causes problems
diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php
index 5a1ca5b6fe..b8c35a5048 100644
--- a/phpBB/includes/utf/utf_tools.php
+++ b/phpBB/includes/utf/utf_tools.php
@@ -1448,17 +1448,22 @@ function utf8_wordwrap($string, $width = 75, $break = "\n", $cut = false)
* @param string $filename The filename basename() should be applied to
* @return string The basenamed filename
*/
-function utf8_basename($filename)
+function utf8_basename($filename): string
{
+ if (!$filename)
+ {
+ return '';
+ }
+
// We always check for forward slash AND backward slash
// because they could be mixed or "sneaked" in. ;)
// You know, never trust user input...
- if (strpos($filename, '/') !== false)
+ if (str_contains($filename, '/'))
{
$filename = utf8_substr($filename, utf8_strrpos($filename, '/') + 1);
}
- if (strpos($filename, '\\') !== false)
+ if (str_contains($filename, '\\'))
{
$filename = utf8_substr($filename, utf8_strrpos($filename, '\\') + 1);
}
diff --git a/phpBB/install/app.php b/phpBB/install/app.php
index 0cb2ead92a..33114eff58 100644
--- a/phpBB/install/app.php
+++ b/phpBB/install/app.php
@@ -47,7 +47,7 @@ $template->set_custom_style(array(
), $paths);
/** @var $phpbb_dispatcher \phpbb\event\dispatcher */
-$phpbb_dispatcher = $phpbb_installer_container->get('dispatcher');
+$phpbb_dispatcher = $phpbb_installer_container->get('event_dispatcher');
/** @var \phpbb\language\language $language */
$language = $phpbb_installer_container->get('language');
diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php
index a90762ec85..c13efb604b 100755
--- a/phpBB/install/phpbbcli.php
+++ b/phpBB/install/phpbbcli.php
@@ -50,6 +50,6 @@ $language = $phpbb_installer_container->get('language');
$language->add_lang(array('common', 'acp/common', 'acp/board', 'install', 'posting', 'cli'));
$application = new \phpbb\console\application('phpBB Installer', PHPBB_VERSION, $language, $config);
-$application->setDispatcher($phpbb_installer_container->get('dispatcher'));
+$application->setDispatcher($phpbb_installer_container->get('event_dispatcher'));
$application->register_container_commands($phpbb_installer_container->get('console.installer.command_collection'));
$application->run($input);
diff --git a/phpBB/phpbb/auth/provider/ldap.php b/phpBB/phpbb/auth/provider/ldap.php
index 9daad9e5f6..69c0952f1d 100644
--- a/phpBB/phpbb/auth/provider/ldap.php
+++ b/phpBB/phpbb/auth/provider/ldap.php
@@ -201,7 +201,7 @@ class ldap extends base
1
);
- $ldap_result = @ldap_get_entries($ldap, $search);
+ $ldap_result = $search !== false ? @ldap_get_entries($ldap, $search) : [];
if (is_array($ldap_result) && count($ldap_result) > 1)
{
diff --git a/phpBB/phpbb/config/config.php b/phpBB/phpbb/config/config.php
index 92d6857c32..ae2ce658f2 100644
--- a/phpBB/phpbb/config/config.php
+++ b/phpBB/phpbb/config/config.php
@@ -39,7 +39,7 @@ class config implements \ArrayAccess, \IteratorAggregate, \Countable
*
* @return \ArrayIterator An iterator over all config data
*/
- public function getIterator()
+ public function getIterator(): \ArrayIterator
{
return new \ArrayIterator($this->config);
}
@@ -99,7 +99,7 @@ class config implements \ArrayAccess, \IteratorAggregate, \Countable
*
* @return int Number of config options
*/
- public function count()
+ public function count(): int
{
return count($this->config);
}
diff --git a/phpBB/phpbb/console/application.php b/phpBB/phpbb/console/application.php
index 50443cd646..b7ecd3dff6 100644
--- a/phpBB/phpbb/console/application.php
+++ b/phpBB/phpbb/console/application.php
@@ -45,7 +45,7 @@ class application extends \Symfony\Component\Console\Application
/**
* {@inheritdoc}
*/
- protected function getDefaultInputDefinition()
+ protected function getDefaultInputDefinition(): InputDefinition
{
$input_definition = parent::getDefaultInputDefinition();
diff --git a/phpBB/phpbb/console/command/user/add.php b/phpBB/phpbb/console/command/user/add.php
index d26007dfb5..30ce1ff1d3 100644
--- a/phpBB/phpbb/console/command/user/add.php
+++ b/phpBB/phpbb/console/command/user/add.php
@@ -21,6 +21,7 @@ use phpbb\language\language;
use phpbb\passwords\manager;
use phpbb\user;
use Symfony\Component\Console\Command\Command as symfony_command;
+use Symfony\Component\Console\Helper\QuestionHelper;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
@@ -184,6 +185,10 @@ class add extends command
protected function interact(InputInterface $input, OutputInterface $output)
{
$helper = $this->getHelper('question');
+ if (!$helper instanceof QuestionHelper)
+ {
+ return;
+ }
$this->data = array(
'username' => $input->getOption('username'),
diff --git a/phpBB/phpbb/console/command/user/delete.php b/phpBB/phpbb/console/command/user/delete.php
index acd360b57b..727de653f8 100644
--- a/phpBB/phpbb/console/command/user/delete.php
+++ b/phpBB/phpbb/console/command/user/delete.php
@@ -19,6 +19,7 @@ use phpbb\log\log_interface;
use phpbb\user;
use phpbb\user_loader;
use Symfony\Component\Console\Command\Command as symfony_command;
+use Symfony\Component\Console\Helper\QuestionHelper;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
@@ -151,6 +152,10 @@ class delete extends command
protected function interact(InputInterface $input, OutputInterface $output)
{
$helper = $this->getHelper('question');
+ if (!$helper instanceof QuestionHelper)
+ {
+ return;
+ }
$question = new ConfirmationQuestion(
$this->language->lang('CLI_USER_DELETE_CONFIRM', $input->getArgument('username')),
diff --git a/phpBB/phpbb/controller/resolver.php b/phpBB/phpbb/controller/resolver.php
index 1e65b2324b..e2d3e2f193 100644
--- a/phpBB/phpbb/controller/resolver.php
+++ b/phpBB/phpbb/controller/resolver.php
@@ -65,10 +65,10 @@ class resolver implements ControllerResolverInterface
* Load a controller callable
*
* @param Request $request Symfony Request object
- * @return false|Callable Callable or false (fixme: method is returning an array)
+ * @return callable|false Callable or false
* @throws \phpbb\controller\exception
*/
- public function getController(Request $request)
+ public function getController(Request $request): callable|false
{
$controller = $request->attributes->get('_controller');
@@ -160,7 +160,7 @@ class resolver implements ControllerResolverInterface
$arguments[] = $attributes[$param->name];
}
}
- else if ($param->getClass() && $param->getClass()->isInstance($request))
+ else if ($param->getType() && $param->getType() instanceof $request)
{
$arguments[] = $request;
}
diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php
index 6c86433dd9..8509c07d68 100644
--- a/phpBB/phpbb/db/driver/driver.php
+++ b/phpBB/phpbb/db/driver/driver.php
@@ -387,7 +387,7 @@ abstract class driver implements driver_interface
/**
* {@inheritDoc}
*/
- function sql_fetchfield($field, $rownum = false, $query_id = false)
+ function sql_fetchfield($field, $rownum = false, &$query_id = false)
{
global $cache;
@@ -1330,7 +1330,7 @@ abstract class driver implements driver_interface
/**
* {@inheritDoc}
*/
- public function clean_query_id($query_id)
+ public function clean_query_id(mixed $query_id): int|string|null
{
// Some DBMS functions accept/return objects and/or resources instead if identifiers
// Attempting to use objects/resources as array keys will throw error, hence correctly handle all cases
diff --git a/phpBB/phpbb/db/driver/driver_interface.php b/phpBB/phpbb/db/driver/driver_interface.php
index e85e0d19a8..ead8aa6d07 100644
--- a/phpBB/phpbb/db/driver/driver_interface.php
+++ b/phpBB/phpbb/db/driver/driver_interface.php
@@ -268,7 +268,7 @@ interface driver_interface
* @return mixed String value of the field in the selected row,
* false, if the row does not exist
*/
- public function sql_fetchfield($field, $rownum = false, $query_id = false);
+ public function sql_fetchfield($field, $rownum = false, &$query_id = false);
/**
* Fetch current row
@@ -499,9 +499,9 @@ interface driver_interface
/**
* Ensure query ID can be used by cache
*
- * @param resource|int|string $query_id Mixed type query id
+ * @param mixed $query_id Mixed type query id
*
- * @return int|string Query id in string or integer format
+ * @return int|string|null Query id in string or integer format
*/
- public function clean_query_id($query_id);
+ public function clean_query_id(mixed $query_id): int|string|null;
}
diff --git a/phpBB/phpbb/db/driver/factory.php b/phpBB/phpbb/db/driver/factory.php
index a5adae6a90..558f4ec60d 100644
--- a/phpBB/phpbb/db/driver/factory.php
+++ b/phpBB/phpbb/db/driver/factory.php
@@ -294,7 +294,7 @@ class factory implements driver_interface
/**
* {@inheritdoc}
*/
- public function sql_fetchfield($field, $rownum = false, $query_id = false)
+ public function sql_fetchfield($field, $rownum = false, &$query_id = false)
{
return $this->get_driver()->sql_fetchfield($field, $rownum, $query_id);
}
@@ -478,7 +478,7 @@ class factory implements driver_interface
/**
* {@inheritDoc}
*/
- public function clean_query_id($query_id)
+ public function clean_query_id(mixed $query_id): int|string|null
{
return $this->get_driver()->clean_query_id($query_id);
}
diff --git a/phpBB/phpbb/db/driver/postgres.php b/phpBB/phpbb/db/driver/postgres.php
index 3d981bc9c7..17e3681f3a 100644
--- a/phpBB/phpbb/db/driver/postgres.php
+++ b/phpBB/phpbb/db/driver/postgres.php
@@ -298,7 +298,7 @@ class postgres extends \phpbb\db\driver\driver
/**
* {@inheritDoc}
*/
- function sql_fetchfield($field, $rownum = false, $query_id = false)
+ function sql_fetchfield($field, $rownum = false, &$query_id = false)
{
global $cache;
@@ -431,12 +431,12 @@ class postgres extends \phpbb\db\driver\driver
*/
protected function _sql_close(): bool
{
- // Released resources are already closed, return true in this case
- if (!is_resource($this->db_connect_id))
+ // Skip if connection is already closed or not persistent
+ if (!$this->persistency || !$this->db_connect_id instanceof \PgSql\Connection)
{
return true;
}
- return @pg_close($this->db_connect_id);
+ return pg_close($this->db_connect_id);
}
/**
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php
index 972c2d5107..0df548ca90 100644
--- a/phpBB/phpbb/db/migrator.php
+++ b/phpBB/phpbb/db/migrator.php
@@ -91,9 +91,9 @@ class migrator
*
* 'effectively_installed' set and set to true if the migration was effectively_installed
*
- * @var array|false
+ * @var array
*/
- protected $last_run_migration = false;
+ protected $last_run_migration = [];
/**
* The output handler. A null handler is configured by default.
@@ -193,9 +193,9 @@ class migrator
* The array contains 'name', 'class' and 'state'. 'effectively_installed' is set
* and set to true if the last migration was effectively_installed.
*
- * @return array|false Last run migration information or false if no migration has been run yet
+ * @return array Last run migration information or false if no migration has been run yet
*/
- public function get_last_run_migration()
+ public function get_last_run_migration(): array
{
return $this->last_run_migration;
}
@@ -261,9 +261,9 @@ class migrator
*/
public function update()
{
- $this->container->get('dispatcher')->disable();
+ $this->container->get('event_dispatcher')->disable();
$this->update_do();
- $this->container->get('dispatcher')->enable();
+ $this->container->get('event_dispatcher')->enable();
}
/**
@@ -509,9 +509,9 @@ class migrator
*/
public function revert($migration)
{
- $this->container->get('dispatcher')->disable();
+ $this->container->get('event_dispatcher')->disable();
$this->revert_do($migration);
- $this->container->get('dispatcher')->enable();
+ $this->container->get('event_dispatcher')->enable();
}
/**
@@ -630,7 +630,7 @@ class migrator
WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
$this->db->sql_query($sql);
- $this->last_run_migration = false;
+ $this->last_run_migration = [];
unset($this->migration_state[$name]);
$this->output_handler->write(array('MIGRATION_REVERT_SCHEMA_DONE', $name, $total_time), migrator_output_handler_interface::VERBOSITY_NORMAL);
diff --git a/phpBB/phpbb/debug/debug.php b/phpBB/phpbb/debug/debug.php
index c5ffada2e5..af387dbd3d 100644
--- a/phpBB/phpbb/debug/debug.php
+++ b/phpBB/phpbb/debug/debug.php
@@ -13,14 +13,13 @@
namespace phpbb\debug;
-use Symfony\Component\Debug\BufferingLogger;
-use Symfony\Component\Debug\DebugClassLoader;
-use Symfony\Component\Debug\ExceptionHandler;
+use Symfony\Component\ErrorHandler\BufferingLogger;
+use Symfony\Component\ErrorHandler\DebugClassLoader;
/**
* Registers all the debug tools.
- * @see Symfony\Component\Debug\Debug
+ * @see \Symfony\Component\ErrorHandler\Debug
*/
class debug
{
@@ -34,10 +33,10 @@ class debug
* If the Symfony ClassLoader component is available, a special
* class loader is also registered.
*
- * @param int $errorReportingLevel The level of error reporting you want
- * @param bool $displayErrors Whether to display errors (for development) or just log them (for production)
+ * @param int|null $errorReportingLevel The level of error reporting you want
+ * @param bool $displayErrors Whether to display errors (for development) or just log them (for production)
*/
- public static function enable($errorReportingLevel = null, $displayErrors = true)
+ public static function enable(int|null $errorReportingLevel = null, bool $displayErrors = true): void
{
if (static::$enabled)
{
@@ -58,7 +57,6 @@ class debug
if ('cli' !== php_sapi_name())
{
ini_set('display_errors', 0);
- ExceptionHandler::register();
}
else if ($displayErrors && (!ini_get('log_errors') || ini_get('error_log')))
{
@@ -66,15 +64,8 @@ class debug
ini_set('display_errors', 1);
}
- if ($displayErrors)
- {
- error_handler::register(new error_handler(new BufferingLogger()));
- }
- else
- {
- error_handler::register()->throwAt(0, true);
- }
-
DebugClassLoader::enable();
+
+ error_handler::register(new error_handler(new BufferingLogger(), $displayErrors));
}
}
diff --git a/phpBB/phpbb/debug/error_handler.php b/phpBB/phpbb/debug/error_handler.php
index f2b00e6365..f0a1efa3e3 100644
--- a/phpBB/phpbb/debug/error_handler.php
+++ b/phpBB/phpbb/debug/error_handler.php
@@ -13,7 +13,8 @@
namespace phpbb\debug;
-use Symfony\Component\Debug\ErrorHandler;
+use Symfony\Component\ErrorHandler\BufferingLogger;
+use Symfony\Component\ErrorHandler\ErrorHandler;
/**
* @psalm-suppress InvalidExtendClass
@@ -23,13 +24,21 @@ class error_handler extends ErrorHandler
/**
* @psalm-suppress MethodSignatureMismatch
*/
- public function handleError($type, $message, $file, $line)
+ public function __construct(BufferingLogger $bootstrappingLogger = null, private readonly bool $debug = false) // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
{
- if ($type === E_USER_WARNING || $type === E_USER_NOTICE)
+ parent::__construct($bootstrappingLogger, $debug);
+ }
+
+ /**
+ * @psalm-suppress MethodSignatureMismatch
+ */
+ public function handleError(int $type, string $message, string $file, int $line): bool
+ {
+ if (!$this->debug || $type === E_USER_WARNING || $type === E_USER_NOTICE)
{
$handler = defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler';
- $handler($type, $message, $file, $line);
+ return $handler($type, $message, $file, $line);
}
return parent::handleError($type, $message, $file, $line);
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php
index 935aa11efb..4dc91b7409 100644
--- a/phpBB/phpbb/di/container_builder.php
+++ b/phpBB/phpbb/di/container_builder.php
@@ -205,11 +205,11 @@ class container_builder
// Mark all services public
$this->container->addCompilerPass(new pass\markpublic_pass());
- // Event listeners "phpBB style"
- $this->container->addCompilerPass(new RegisterListenersPass('dispatcher', 'event.listener_listener', 'event.listener'));
+ // Convert old event dispatcher syntax
+ $this->container->addCompilerPass(new pass\convert_events());
- // Event listeners "Symfony style"
- $this->container->addCompilerPass(new RegisterListenersPass('dispatcher'));
+ // Event listeners
+ $this->container->addCompilerPass(new RegisterListenersPass());
if ($this->use_extensions)
{
diff --git a/phpBB/phpbb/di/extension/config.php b/phpBB/phpbb/di/extension/config.php
index 775de380ec..041ac20708 100644
--- a/phpBB/phpbb/di/extension/config.php
+++ b/phpBB/phpbb/di/extension/config.php
@@ -60,7 +60,7 @@ class config extends Extension
*
* @return string The alias
*/
- public function getAlias()
+ public function getAlias(): string
{
return 'config';
}
@@ -73,7 +73,7 @@ class config extends Extension
*/
protected function convert_30_acm_type($acm_type)
{
- if (preg_match('#^[a-z]+$#', $acm_type))
+ if (preg_match('#^[a-z]+$#', $acm_type ?? ''))
{
return 'phpbb\\cache\\driver\\' . $acm_type;
}
diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php
index c0725942be..d6679f1c61 100644
--- a/phpBB/phpbb/di/extension/core.php
+++ b/phpBB/phpbb/di/extension/core.php
@@ -62,7 +62,7 @@ class core extends Extension
if ($config['require_dev_dependencies'])
{
- if (!class_exists('Goutte\Client', true))
+ if (!class_exists('Symfony\Component\BrowserKit\HttpBrowser'))
{
trigger_error(
'Composer development dependencies have not been set up for the ' . $container->getParameter('core.environment') . ' environment yet, run ' .
@@ -144,7 +144,7 @@ class core extends Extension
*
* @return string The alias
*/
- public function getAlias()
+ public function getAlias(): string
{
return 'core';
}
diff --git a/phpBB/phpbb/di/extension/tables.php b/phpBB/phpbb/di/extension/tables.php
index 40684b6038..fc3d9e75c6 100644
--- a/phpBB/phpbb/di/extension/tables.php
+++ b/phpBB/phpbb/di/extension/tables.php
@@ -52,7 +52,7 @@ class tables extends Extension
*
* @return string The alias
*/
- public function getAlias()
+ public function getAlias(): string
{
return 'tables';
}
diff --git a/phpBB/phpbb/di/ordered_service_collection.php b/phpBB/phpbb/di/ordered_service_collection.php
index 57b674b986..71f2a089b6 100644
--- a/phpBB/phpbb/di/ordered_service_collection.php
+++ b/phpBB/phpbb/di/ordered_service_collection.php
@@ -46,7 +46,7 @@ class ordered_service_collection extends service_collection
/**
* {@inheritdoc}
*/
- public function getIterator()
+ public function getIterator(): \Iterator
{
if (!$this->is_ordered)
{
@@ -59,27 +59,27 @@ class ordered_service_collection extends service_collection
/**
* {@inheritdoc}
*/
- public function offsetExists($index)
+ public function offsetExists($key): bool
{
if (!$this->is_ordered)
{
$this->sort_services();
}
- return parent::offsetExists($index);
+ return parent::offsetExists($key);
}
/**
* {@inheritdoc}
*/
- public function offsetGet($index)
+ public function offsetGet($key): mixed
{
if (!$this->is_ordered)
{
$this->sort_services();
}
- return parent::offsetGet($index);
+ return parent::offsetGet($key);
}
/**
diff --git a/phpBB/phpbb/di/pass/convert_events.php b/phpBB/phpbb/di/pass/convert_events.php
new file mode 100644
index 0000000000..6fc2db1417
--- /dev/null
+++ b/phpBB/phpbb/di/pass/convert_events.php
@@ -0,0 +1,51 @@
+
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\di\pass;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+
+/**
+ * Converts event types to Symfony ones
+ */
+class convert_events implements CompilerPassInterface
+{
+ /** @var string[] Map for conversions of types */
+ private static array $conversions = [
+ 'event.listener_listener' => 'kernel.event_listener',
+ 'event.listener' => 'kernel.event_subscriber',
+ ];
+
+ /**
+ * Modify the container before it is passed to the rest of the code
+ * Add Symfony event tags to previously used phpBB ones
+ *
+ * @param ContainerBuilder $container ContainerBuilder object
+ * @return void
+ */
+ public function process(ContainerBuilder $container): void
+ {
+ // Add alias for event dispatcher
+ $container->addAliases(['dispatcher' => 'event_dispatcher']);
+
+ foreach (self::$conversions as $from => $to)
+ {
+ foreach ($container->findTaggedServiceIds($from, true) as $id => $tags)
+ {
+ $definition = $container->getDefinition($id);
+ $definition->addTag($to);
+ }
+ }
+ }
+}
diff --git a/phpBB/phpbb/di/service_collection.php b/phpBB/phpbb/di/service_collection.php
index 5c108bbb84..b6f5af5ed9 100644
--- a/phpBB/phpbb/di/service_collection.php
+++ b/phpBB/phpbb/di/service_collection.php
@@ -46,7 +46,7 @@ class service_collection extends \ArrayObject
/**
* {@inheritdoc}
*/
- public function getIterator()
+ public function getIterator(): \Iterator
{
return new service_collection_iterator($this);
}
@@ -54,9 +54,9 @@ class service_collection extends \ArrayObject
/**
* {@inheritdoc}
*/
- public function offsetGet($index)
+ public function offsetGet($key): mixed
{
- return $this->container->get($index);
+ return $this->container->get($key);
}
/**
diff --git a/phpBB/phpbb/di/service_collection_iterator.php b/phpBB/phpbb/di/service_collection_iterator.php
index 31bc156e99..732f677809 100644
--- a/phpBB/phpbb/di/service_collection_iterator.php
+++ b/phpBB/phpbb/di/service_collection_iterator.php
@@ -39,7 +39,7 @@ class service_collection_iterator extends \ArrayIterator
/**
* {@inheritdoc}
*/
- public function current()
+ public function current(): mixed
{
return $this->collection->offsetGet($this->key());
}
diff --git a/phpBB/phpbb/event/recursive_event_filter_iterator.php b/phpBB/phpbb/event/recursive_event_filter_iterator.php
index 22a6861522..f671c474d9 100644
--- a/phpBB/phpbb/event/recursive_event_filter_iterator.php
+++ b/phpBB/phpbb/event/recursive_event_filter_iterator.php
@@ -39,7 +39,7 @@ class recursive_event_filter_iterator extends \RecursiveFilterIterator
*
* @return recursive_event_filter_iterator
*/
- public function getChildren()
+ public function getChildren(): ?\RecursiveFilterIterator
{
$inner_iterator = $this->getInnerIterator();
assert($inner_iterator instanceof \RecursiveIterator);
@@ -49,7 +49,7 @@ class recursive_event_filter_iterator extends \RecursiveFilterIterator
/**
* {@inheritDoc}
*/
- public function accept()
+ public function accept(): bool
{
$relative_path = str_replace(DIRECTORY_SEPARATOR, '/', $this->current());
$filename = $this->current()->getFilename();
diff --git a/phpBB/phpbb/exception/http_exception.php b/phpBB/phpbb/exception/http_exception.php
index cae4a282d4..f22c90128e 100644
--- a/phpBB/phpbb/exception/http_exception.php
+++ b/phpBB/phpbb/exception/http_exception.php
@@ -25,14 +25,14 @@ class http_exception extends runtime_exception implements HttpExceptionInterface
*
* @var integer
*/
- private $status_code;
+ private int $status_code;
/**
* Additional headers to set in the response.
*
* @var array
*/
- private $headers;
+ private array $headers;
/**
* Constructor
@@ -55,7 +55,7 @@ class http_exception extends runtime_exception implements HttpExceptionInterface
/**
* {@inheritdoc}
*/
- public function getStatusCode()
+ public function getStatusCode(): int
{
return $this->status_code;
}
@@ -63,7 +63,7 @@ class http_exception extends runtime_exception implements HttpExceptionInterface
/**
* {@inheritdoc}
*/
- public function getHeaders()
+ public function getHeaders(): array
{
return $this->headers;
}
diff --git a/phpBB/phpbb/extension/di/extension_base.php b/phpBB/phpbb/extension/di/extension_base.php
index fcc358dd79..45ed5c4c19 100644
--- a/phpBB/phpbb/extension/di/extension_base.php
+++ b/phpBB/phpbb/extension/di/extension_base.php
@@ -132,7 +132,7 @@ class extension_base extends Extension
*
* @return string The alias
*/
- public function getAlias()
+ public function getAlias(): string
{
return str_replace('/', '_', $this->extension_name);
}
diff --git a/phpBB/phpbb/files/filespec.php b/phpBB/phpbb/files/filespec.php
index 3063b5db33..6e4c224e39 100644
--- a/phpBB/phpbb/files/filespec.php
+++ b/phpBB/phpbb/files/filespec.php
@@ -137,7 +137,7 @@ class filespec
$this->mimetype = $upload_ary['type'];
// Opera adds the name to the mime type
- $this->mimetype = (strpos($this->mimetype, '; name') !== false) ? str_replace(strstr($this->mimetype, '; name'), '', $this->mimetype) : $this->mimetype;
+ $this->mimetype = ($this->mimetype && str_contains($this->mimetype, '; name')) ? str_replace(strstr($this->mimetype, '; name'), '', $this->mimetype) : $this->mimetype;
if (!$this->mimetype)
{
diff --git a/phpBB/phpbb/files/filespec_storage.php b/phpBB/phpbb/files/filespec_storage.php
index f718d82d74..e775935756 100644
--- a/phpBB/phpbb/files/filespec_storage.php
+++ b/phpBB/phpbb/files/filespec_storage.php
@@ -117,7 +117,7 @@ class filespec_storage
$this->mimetype = $upload_ary['type'];
// Opera adds the name to the mime type
- $this->mimetype = (strpos($this->mimetype, '; name') !== false) ? str_replace(strstr($this->mimetype, '; name'), '', $this->mimetype) : $this->mimetype;
+ $this->mimetype = ($this->mimetype && str_contains($this->mimetype, '; name')) ? str_replace(strstr($this->mimetype, '; name'), '', $this->mimetype) : $this->mimetype;
if (!$this->mimetype)
{
diff --git a/phpBB/phpbb/filesystem/filesystem.php b/phpBB/phpbb/filesystem/filesystem.php
index 67b25907b3..6d34d990e2 100644
--- a/phpBB/phpbb/filesystem/filesystem.php
+++ b/phpBB/phpbb/filesystem/filesystem.php
@@ -606,7 +606,7 @@ class filesystem implements filesystem_interface
protected function phpbb_own_realpath($path)
{
// Replace all directory separators with '/'
- $path = str_replace(DIRECTORY_SEPARATOR, '/', $path);
+ $path = str_replace(DIRECTORY_SEPARATOR, '/', $path ?: '');
$is_absolute_path = false;
$path_prefix = '';
diff --git a/phpBB/phpbb/finder/finder.php b/phpBB/phpbb/finder/finder.php
index 9e7f201ea3..7bad84e36d 100644
--- a/phpBB/phpbb/finder/finder.php
+++ b/phpBB/phpbb/finder/finder.php
@@ -77,7 +77,7 @@ class finder
);
$this->extensions = array();
- $this->cached_queries = ($this->cache) ? $this->cache->get($this->cache_name) : false;
+ $this->cached_queries = $this->cache ? ($this->cache->get($this->cache_name) ?: []) : [];
}
/**
diff --git a/phpBB/phpbb/install/module/install_data/task/create_search_index.php b/phpBB/phpbb/install/module/install_data/task/create_search_index.php
index 9f80e5e784..e5781b34b3 100644
--- a/phpBB/phpbb/install/module/install_data/task/create_search_index.php
+++ b/phpBB/phpbb/install/module/install_data/task/create_search_index.php
@@ -120,7 +120,7 @@ class create_search_index extends database_task
$this->db = $container->get('dbal.conn');
$this->iohandler = $iohandler;
$this->installer_config = $config;
- $this->phpbb_dispatcher = $container->get('dispatcher');
+ $this->phpbb_dispatcher = $container->get('event_dispatcher');
$this->user = $container->get('user');
$this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext;
diff --git a/phpBB/phpbb/notification/type/base.php b/phpBB/phpbb/notification/type/base.php
index 54a9319d26..cf0ce88a62 100644
--- a/phpBB/phpbb/notification/type/base.php
+++ b/phpBB/phpbb/notification/type/base.php
@@ -118,7 +118,7 @@ abstract class base implements \phpbb\notification\type\type_interface
{
// The row from the database (unless this is a new notification we're going to add)
$this->data = $data;
- $this->data['notification_data'] = (isset($this->data['notification_data'])) ? unserialize($this->data['notification_data']) : array();
+ $this->data['notification_data'] = !empty($this->data['notification_data']) ? unserialize($this->data['notification_data']) : [];
}
/**
diff --git a/phpBB/phpbb/profilefields/type/type_date.php b/phpBB/phpbb/profilefields/type/type_date.php
index 5a1a6dbd5c..da76c3cce6 100644
--- a/phpBB/phpbb/profilefields/type/type_date.php
+++ b/phpBB/phpbb/profilefields/type/type_date.php
@@ -150,7 +150,7 @@ class type_date extends type_base
*/
public function validate_profile_field(&$field_value, $field_data)
{
- $field_validate = explode('-', $field_value);
+ $field_validate = explode('-', $field_value ?: '');
$day = (isset($field_validate[0])) ? (int) $field_validate[0] : 0;
$month = (isset($field_validate[1])) ? (int) $field_validate[1] : 0;
@@ -184,7 +184,7 @@ class type_date extends type_base
*/
public function get_profile_value($field_value, $field_data)
{
- $date = explode('-', $field_value);
+ $date = explode('-', $field_value ?: '');
$day = (isset($date[0])) ? (int) $date[0] : 0;
$month = (isset($date[1])) ? (int) $date[1] : 0;
$year = (isset($date[2])) ? (int) $date[2] : 0;
diff --git a/phpBB/phpbb/profilefields/type/type_int.php b/phpBB/phpbb/profilefields/type/type_int.php
index 9dc0181cb8..f22765b171 100644
--- a/phpBB/phpbb/profilefields/type/type_int.php
+++ b/phpBB/phpbb/profilefields/type/type_int.php
@@ -120,7 +120,7 @@ class type_int extends type_base
*/
public function validate_profile_field(&$field_value, $field_data)
{
- if (trim($field_value) === '' && !$field_data['field_required'])
+ if (trim($field_value ?: '') === '' && !$field_data['field_required'])
{
return false;
}
diff --git a/phpBB/phpbb/profilefields/type/type_string_common.php b/phpBB/phpbb/profilefields/type/type_string_common.php
index f5e1992044..6248285e10 100644
--- a/phpBB/phpbb/profilefields/type/type_string_common.php
+++ b/phpBB/phpbb/profilefields/type/type_string_common.php
@@ -63,13 +63,9 @@ abstract class type_string_common extends type_base
*/
public function validate_string_profile_field($field_type, &$field_value, $field_data)
{
- if (trim($field_value) === '' && !$field_data['field_required'])
+ if (trim($field_value ?? '') === '')
{
- return false;
- }
- else if (trim($field_value) === '' && $field_data['field_required'])
- {
- return $this->user->lang('FIELD_REQUIRED', $this->get_field_name($field_data['lang_name']));
+ return $field_data['field_required'] ? $this->user->lang('FIELD_REQUIRED', $this->get_field_name($field_data['lang_name'])) : false;
}
if ($field_data['field_minlen'] && utf8_strlen($field_value) < $field_data['field_minlen'])
diff --git a/phpBB/phpbb/request/deactivated_super_global.php b/phpBB/phpbb/request/deactivated_super_global.php
index ba7111e000..4160c3696b 100644
--- a/phpBB/phpbb/request/deactivated_super_global.php
+++ b/phpBB/phpbb/request/deactivated_super_global.php
@@ -74,7 +74,7 @@ class deactivated_super_global implements \ArrayAccess, \Countable, \IteratorAgg
*
* @return bool Whether the key on the super global exists.
*/
- public function offsetExists($offset)
+ public function offsetExists($offset): bool
{
return $this->request->is_set($offset, $this->super_global);
}
@@ -82,17 +82,17 @@ class deactivated_super_global implements \ArrayAccess, \Countable, \IteratorAgg
/**#@+
* Part of the \ArrayAccess implementation, will always result in a FATAL error.
*/
- public function offsetGet($offset)
+ public function offsetGet($offset): mixed
{
$this->error();
}
- public function offsetSet($offset, $value)
+ public function offsetSet($offset, $value): void
{
$this->error();
}
- public function offsetUnset($offset)
+ public function offsetUnset($offset): void
{
$this->error();
}
@@ -101,9 +101,8 @@ class deactivated_super_global implements \ArrayAccess, \Countable, \IteratorAgg
/**
* Part of the \Countable implementation, will always result in a FATAL error
* @return void
- * @psalm-suppress InvalidReturnType
*/
- public function count()
+ #[\ReturnTypeWillChange] public function count(): void
{
$this->error();
}
@@ -111,9 +110,8 @@ class deactivated_super_global implements \ArrayAccess, \Countable, \IteratorAgg
/**
* Part of the Traversable/IteratorAggregate implementation, will always result in a FATAL error
* @return void
- * @psalm-suppress InvalidReturnType
*/
- public function getIterator()
+ #[\ReturnTypeWillChange] public function getIterator(): void
{
$this->error();
}
diff --git a/phpBB/phpbb/routing/loader_resolver.php b/phpBB/phpbb/routing/loader_resolver.php
index 13fbc6405c..de3adcaa34 100644
--- a/phpBB/phpbb/routing/loader_resolver.php
+++ b/phpBB/phpbb/routing/loader_resolver.php
@@ -33,7 +33,7 @@ class loader_resolver implements LoaderResolverInterface
/**
* {@inheritdoc}
*/
- public function resolve($resource, $type = null)
+ public function resolve($resource, $type = null): false|\Symfony\Component\Config\Loader\LoaderInterface
{
/** @var \Symfony\Component\Config\Loader\LoaderInterface $loader */
foreach ($this->loaders as $loader)
diff --git a/phpBB/phpbb/routing/router.php b/phpBB/phpbb/routing/router.php
index e6f887cca7..18d32ca12b 100644
--- a/phpBB/phpbb/routing/router.php
+++ b/phpBB/phpbb/routing/router.php
@@ -171,7 +171,7 @@ class router implements RouterInterface
/**
* {@inheritdoc}
*/
- public function getContext()
+ public function getContext(): RequestContext
{
return $this->context;
}
@@ -179,7 +179,7 @@ class router implements RouterInterface
/**
* {@inheritdoc}
*/
- public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH)
+ public function generate(string $name, array $parameters = [], int $referenceType = self::ABSOLUTE_PATH): string
{
return $this->get_generator()->generate($name, $parameters, $referenceType);
}
@@ -187,7 +187,7 @@ class router implements RouterInterface
/**
* {@inheritdoc}
*/
- public function match($pathinfo)
+ public function match(string $pathinfo): array
{
return $this->get_matcher()->match($pathinfo);
}
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index ae9624cd49..bd7620b840 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -47,7 +47,7 @@ class session
// First of all, get the request uri...
$script_name = $request->escape($symfony_request->getScriptName(), true);
- $args = $request->escape(explode('&', $symfony_request->getQueryString()), true);
+ $args = $request->escape(explode('&', $symfony_request->getQueryString() ?? ''), true);
// If we are unable to get the script name we use REQUEST_URI as a failover and note it within the page array for easier support...
if (!$script_name)
diff --git a/psalm.xml b/psalm.xml
index cb434cfaf8..da3e19db9d 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -1,8 +1,7 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/tests/attachment/upload_test.php b/tests/attachment/upload_test.php
index 298ffcfd98..609ee99536 100644
--- a/tests/attachment/upload_test.php
+++ b/tests/attachment/upload_test.php
@@ -69,6 +69,9 @@ class phpbb_attachment_upload_test extends \phpbb_database_test_case
/** @var \phpbb\request\request */
protected $request;
+ /** @var string */
+ protected $phpbb_root_path;
+
public function getDataSet()
{
return $this->createXMLDataSet(__DIR__ . '/fixtures/resync.xml');
diff --git a/tests/console/cron/cron_list_test.php b/tests/console/cron/cron_list_test.php
index 0c1b8b1ccc..cdda4fb886 100644
--- a/tests/console/cron/cron_list_test.php
+++ b/tests/console/cron/cron_list_test.php
@@ -97,7 +97,8 @@ class phpbb_console_command_cron_list_test extends phpbb_test_case
);
$mock_container = new phpbb_mock_container_builder();
- $mock_container->set('cron.task_collection', []);
+ $task_collection = new \phpbb\di\service_collection($mock_container);
+ $mock_container->set('cron.task_collection', $task_collection);
$this->cron_manager = new \phpbb\cron\manager($mock_container, $routing_helper, $phpbb_root_path, $pathEx, null);
$this->cron_manager->load_tasks($tasks);
diff --git a/tests/console/cron/run_test.php b/tests/console/cron/run_test.php
index 7de1b3455e..90fa2a9fd0 100644
--- a/tests/console/cron/run_test.php
+++ b/tests/console/cron/run_test.php
@@ -74,7 +74,8 @@ class phpbb_console_command_cron_run_test extends phpbb_database_test_case
);
$mock_container = new phpbb_mock_container_builder();
- $mock_container->set('cron.task_collection', []);
+ $task_collection = new \phpbb\di\service_collection($mock_container);
+ $mock_container->set('cron.task_collection', $task_collection);
$this->cron_manager = new \phpbb\cron\manager($mock_container, $routing_helper, $phpbb_root_path, $phpEx, null);
$this->cron_manager->load_tasks($tasks);
@@ -152,7 +153,8 @@ class phpbb_console_command_cron_run_test extends phpbb_database_test_case
);
$mock_container = new phpbb_mock_container_builder();
- $mock_container->set('cron.task_collection', []);
+ $task_collection = new \phpbb\di\service_collection($mock_container);
+ $mock_container->set('cron.task_collection', $task_collection);
$this->cron_manager = new \phpbb\cron\manager($mock_container, $routing_helper, $phpbb_root_path, $phpEx, null);
$this->cron_manager->load_tasks($tasks);
@@ -199,7 +201,8 @@ class phpbb_console_command_cron_run_test extends phpbb_database_test_case
);
$mock_container = new phpbb_mock_container_builder();
- $mock_container->set('cron.task_collection', []);
+ $task_collection = new \phpbb\di\service_collection($mock_container);
+ $mock_container->set('cron.task_collection', $task_collection);
$this->cron_manager = new \phpbb\cron\manager($mock_container, $routing_helper, $phpbb_root_path, $phpEx, null);
$this->cron_manager->load_tasks($tasks);
diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php
index 0b348fa6ba..03d8e89d87 100644
--- a/tests/controller/controller_test.php
+++ b/tests/controller/controller_test.php
@@ -21,6 +21,9 @@ use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
class phpbb_controller_controller_test extends phpbb_test_case
{
+ /** @var phpbb_mock_extension_manager */
+ protected $extension_manager;
+
protected function setUp(): void
{
$this->extension_manager = new phpbb_mock_extension_manager(
diff --git a/tests/cron/manager_test.php b/tests/cron/manager_test.php
index 658980d0c5..45736e82fe 100644
--- a/tests/cron/manager_test.php
+++ b/tests/cron/manager_test.php
@@ -105,7 +105,8 @@ class phpbb_cron_manager_test extends \phpbb_test_case
);
$mock_container = new phpbb_mock_container_builder();
- $mock_container->set('cron.task_collection', []);
+ $task_collection = new \phpbb\di\service_collection($mock_container);
+ $mock_container->set('cron.task_collection', $task_collection);
$cron_manager = new \phpbb\cron\manager($mock_container, $routing_helper, $phpbb_root_path, $phpEx, null);
$cron_manager->load_tasks($tasks);
diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php
index 67185b9362..5d16fa63ee 100644
--- a/tests/dbal/migrator_test.php
+++ b/tests/dbal/migrator_test.php
@@ -42,6 +42,9 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
/** @var \phpbb\config\config */
protected $config;
+ /** @var \phpbb\extension\manager */
+ protected $extension_manager;
+
public function getDataSet()
{
return $this->createXMLDataSet(__DIR__.'/fixtures/migrator.xml');
@@ -80,7 +83,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
new \phpbb\db\migration\helper()
);
$container->set('migrator', $this->migrator);
- $container->set('dispatcher', new phpbb_mock_event_dispatcher());
+ $container->set('event_dispatcher', new phpbb_mock_event_dispatcher());
$this->extension_manager = new \phpbb\extension\manager(
$container,
@@ -98,6 +101,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
$this->migrator->set_migrations(array('phpbb_dbal_migration_dummy'));
// schema
+ $start_time = time();
$this->migrator->update();
$this->assertFalse($this->migrator->finished());
@@ -106,12 +110,13 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
"SELECT 1 as success
FROM phpbb_migrations
WHERE migration_name = 'phpbb_dbal_migration_dummy'
- AND migration_start_time >= " . (time() - 1) . "
+ AND migration_start_time >= " . ($start_time - 1) . "
AND migration_start_time <= " . (time() + 1),
'Start time set correctly'
);
// data
+ $start_time = time();
$this->migrator->update();
$this->assertTrue($this->migrator->finished());
@@ -127,7 +132,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
FROM phpbb_migrations
WHERE migration_name = 'phpbb_dbal_migration_dummy'
AND migration_start_time <= migration_end_time
- AND migration_end_time >= " . (time() - 1) . "
+ AND migration_end_time >= " . ($start_time - 1) . "
AND migration_end_time <= " . (time() + 1),
'End time set correctly'
);
diff --git a/tests/dbal/migrator_tool_config_test.php b/tests/dbal/migrator_tool_config_test.php
index 01f5d9e54f..853b33b117 100644
--- a/tests/dbal/migrator_tool_config_test.php
+++ b/tests/dbal/migrator_tool_config_test.php
@@ -13,6 +13,12 @@
class phpbb_dbal_migrator_tool_config_test extends phpbb_test_case
{
+ /** @var \phpbb\config\config */
+ protected $config;
+
+ /** @var \phpbb\db\migration\tool\tool_interface */
+ protected $tool;
+
protected function setUp(): void
{
$this->config = new \phpbb\config\config(array());
diff --git a/tests/error_collector_test.php b/tests/error_collector_test.php
index 6073eac6fe..3079ca1ffe 100644
--- a/tests/error_collector_test.php
+++ b/tests/error_collector_test.php
@@ -53,15 +53,14 @@ class phpbb_error_collector_test extends phpbb_test_case
// Division by zero was promoted to fatal error and throws DivisionByZeroError exception in PHP 8+
version_compare(PHP_VERSION, '8', '>=') ? '1b'['0xFF'] : 1/0; $line = __LINE__;
- // Cause a "Notice: unserialize(): Error at offset 0 of 27 bytes in ..."
- // "Undefined array index" used earlier was promoted to warning in PHP 8.0,
- // see https://github.com/php/php-src/commit/c48b745f0090c944e77c1fbcfb6c4df3b54356ad
- unserialize("obvious non-serialized data"); $line2 = __LINE__;
+ // Cause a "Notice: date_default_timezone_set(): Timezone ID 'ThisTimeZoneDoesNotExist' is invalid"
+ // https://github.com/php/php-src/blob/880faa39e8c648bdc3aad7aeca170755c6557831/ext/date/php_date.c#L5205
+ date_default_timezone_set('ThisTimeZoneDoesNotExist'); $line2 = __LINE__;
$collector->uninstall();
// The notice should not be collected
- $this->assertFalse(isset($collector->errors[1]));
+ $this->assertFalse(isset($collector->errors[1]), 'Notice should not be added to errors');
$this->assertEquals(count($collector->errors), 1);
list($errno, $msg_text, $errfile, $errline) = $collector->errors[0];
diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php
index 68e31d0af0..73ac5a51de 100644
--- a/tests/extension/manager_test.php
+++ b/tests/extension/manager_test.php
@@ -30,7 +30,6 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
{
parent::setUp();
- $this->db = null;
$this->extension_manager = $this->create_extension_manager();
}
diff --git a/tests/functional/acp_smilies_test.php b/tests/functional/acp_smilies_test.php
index ebe8717fa7..955a00b488 100644
--- a/tests/functional/acp_smilies_test.php
+++ b/tests/functional/acp_smilies_test.php
@@ -38,6 +38,6 @@ class phpbb_functional_acp_smilies_test extends phpbb_functional_test_case
$crawler = self::submit($form);
$html = $crawler->filter('#preview')->html();
- $this->assertRegexp('(
![]()
]+ alt=">:D" title=">:D"[^>]*>)', $html);
+ $this->assertMatchesRegularExpression('(
![]()
]+ alt=">:D" title=">:D"[^>]*>)', $html);
}
}
diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index c235278d9d..65e726c484 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -105,7 +105,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
{
$crawler = self::request('GET', 'app.php/foo/baz', array(), false);
$this->assert_response_html(500);
- $this->assertStringContainsString('Controller "foo\bar\controller\controller::baz()" requires that you provide a value for the "$test" argument', $crawler->filter('body')->text());
+ $this->assertStringContainsString('Controller "foo\bar\controller\controller::baz" requires that you provide a value for the "$test" argument', $crawler->filter('body')->text());
}
/**
diff --git a/tests/functional/feed_test.php b/tests/functional/feed_test.php
index fc0115a063..984f3da0d5 100644
--- a/tests/functional/feed_test.php
+++ b/tests/functional/feed_test.php
@@ -30,9 +30,9 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
{
parent::__construct($name, $data, $dataName);
- $this->excludeBackupStaticAttributes([
+ $this->backupStaticAttributesExcludeList += [
'phpbb_functional_feed_test' => ['init_values'],
- ]);
+ ];
$this->purge_cache();
}
diff --git a/tests/functional/posting_test.php b/tests/functional/posting_test.php
index 1c1544a533..9f8b299756 100644
--- a/tests/functional/posting_test.php
+++ b/tests/functional/posting_test.php
@@ -78,7 +78,7 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
$crawler = self::request('GET', "posting.php?mode=quote&p={$post['post_id']}&sid={$this->sid}");
- $this->assertRegexp($expected, $crawler->filter('textarea#message')->text());
+ $this->assertMatchesRegularExpression($expected, $crawler->filter('textarea#message')->text());
}
/**
@@ -122,7 +122,7 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
{
$this->set_quote_depth($quote_depth);
$crawler = self::request('GET', $quote_url);
- $this->assertRegexp(
+ $this->assertMatchesRegularExpression(
"(\[quote=admin[^\]]*\]\s?" . preg_quote($expected_text) . "\s?\[\/quote\])",
$crawler->filter('textarea#message')->text()
);
diff --git a/tests/functional/private_messages_test.php b/tests/functional/private_messages_test.php
index 087f6d5891..1f31fda240 100644
--- a/tests/functional/private_messages_test.php
+++ b/tests/functional/private_messages_test.php
@@ -79,7 +79,7 @@ class phpbb_functional_private_messages_test extends phpbb_functional_test_case
$crawler = self::request('GET', 'ucp.php?i=pm&mode=compose&action=quotepost&p=' . $post['post_id'] . '&sid=' . $this->sid);
- $this->assertRegexp($expected, $crawler->filter('textarea#message')->text());
+ $this->assertMatchesRegularExpression($expected, $crawler->filter('textarea#message')->text());
}
public function test_quote_pm()
@@ -92,7 +92,7 @@ class phpbb_functional_private_messages_test extends phpbb_functional_test_case
$crawler = self::request('GET', 'ucp.php?i=pm&mode=compose&action=quote&p=' . $message_id . '&sid=' . $this->sid);
- $this->assertRegexp($expected, $crawler->filter('textarea#message')->text());
+ $this->assertMatchesRegularExpression($expected, $crawler->filter('textarea#message')->text());
}
public function test_quote_forward()
@@ -105,6 +105,6 @@ class phpbb_functional_private_messages_test extends phpbb_functional_test_case
$crawler = self::request('GET', 'ucp.php?i=pm&mode=compose&action=forward&f=0&p=' . $message_id . '&sid=' . $this->sid);
- $this->assertRegexp($expected, $crawler->filter('textarea#message')->text());
+ $this->assertMatchesRegularExpression($expected, $crawler->filter('textarea#message')->text());
}
}
diff --git a/tests/functional/ucp_allow_pm_test.php b/tests/functional/ucp_allow_pm_test.php
index 0b57e4119b..6c275ad916 100644
--- a/tests/functional/ucp_allow_pm_test.php
+++ b/tests/functional/ucp_allow_pm_test.php
@@ -22,9 +22,9 @@ class phpbb_functional_ucp_allow_pm_test extends phpbb_functional_test_case
{
parent::__construct();
- $this->excludeBackupStaticAttributes([
+ $this->backupStaticAttributesExcludeList += [
'phpbb_functional_ucp_allow_pm_test' => ['data'],
- ]);
+ ];
}
// user A sends a PM to user B where B accepts PM
diff --git a/tests/functional/ucp_attachments_test.php b/tests/functional/ucp_attachments_test.php
index dad085498d..fbd352ea28 100644
--- a/tests/functional/ucp_attachments_test.php
+++ b/tests/functional/ucp_attachments_test.php
@@ -134,7 +134,7 @@ class phpbb_functional_ucp_attachments_test extends phpbb_functional_test_case
$attachment_filename = $crawler->filter('.attachment-filename');
$this->assertEquals('valid.jpg', $attachment_filename->attr('title'));
$this->assertStringContainsString('app.php/download/attachment/' . $attach_id . '/valid.jpg', $attachment_filename->attr('href'));
- $this->assertEquals('', $crawler->filter('[name="attachment[' . $attach_id . ']"]')->attr('disabled'));
+ $this->assertFalse($crawler->filter('[name="attachment[' . $attach_id . ']"]')->getNode(0)->hasAttribute('disabled'));
}
public function test_ucp_delete_expired_attachment()
@@ -219,7 +219,7 @@ class phpbb_functional_ucp_attachments_test extends phpbb_functional_test_case
$this->assertEquals('valid.jpg', $attachment_node->attr('title'));
$this->assertStringContainsString('download/attachment/' . $attach_id . '/valid.jpg', $attachment_node->attr('href'));
- $this->assertEquals('disabled', $crawler->filter('[name="attachment[' . $attach_id . ']"]')->attr('disabled'));
+ $this->assertTrue($crawler->filter('[name="attachment[' . $attach_id . ']"]')->getNode(0)->hasAttribute('disabled'));
// It should not be possible to delete the attachment
$crawler = self::request('POST', 'ucp.php?i=ucp_attachments&mode=attachments&sid=' . $this->sid, [
@@ -238,7 +238,7 @@ class phpbb_functional_ucp_attachments_test extends phpbb_functional_test_case
});
$this->assertEquals('valid.jpg', $attachment_node->attr('title'));
$this->assertStringContainsString('download/attachment/' . $attach_id . '/valid.jpg', $attachment_node->attr('href'));
- $this->assertEquals('disabled', $crawler->filter('[name="attachment[' . $attach_id . ']"]')->attr('disabled'));
+ $this->assertTrue($crawler->filter('[name="attachment[' . $attach_id . ']"]')->getNode(0)->hasAttribute('disabled'));
$this->logout();
@@ -327,7 +327,7 @@ class phpbb_functional_ucp_attachments_test extends phpbb_functional_test_case
$this->assertEquals('valid.jpg', $attachment_node->attr('title'));
$this->assertStringContainsString('download/attachment/' . $attach_id . '/valid.jpg', $attachment_node->attr('href'));
- $this->assertEquals('', $crawler->filter('[name="attachment[' . $attach_id . ']"]')->attr('disabled'));
+ $this->assertFalse($crawler->filter('[name="attachment[' . $attach_id . ']"]')->getNode(0)->hasAttribute('disabled'));
// Update message time to 60 minutes later
$sql = 'UPDATE ' . PRIVMSGS_TABLE . '
@@ -347,7 +347,7 @@ class phpbb_functional_ucp_attachments_test extends phpbb_functional_test_case
$this->assertEquals('valid.jpg', $attachment_node->attr('title'));
$this->assertStringContainsString('download/attachment/' . $attach_id . '/valid.jpg', $attachment_node->attr('href'));
- $this->assertEquals('disabled', $crawler->filter('[name="attachment[' . $attach_id . ']"]')->attr('disabled'));
+ $this->assertTrue($crawler->filter('[name="attachment[' . $attach_id . ']"]')->getNode(0)->hasAttribute('disabled'));
$this->set_flood_interval(15);
diff --git a/tests/functions/obtain_online_test.php b/tests/functions/obtain_online_test.php
index f47da03027..1a2d000d0d 100644
--- a/tests/functions/obtain_online_test.php
+++ b/tests/functions/obtain_online_test.php
@@ -162,7 +162,7 @@ class phpbb_functions_obtain_online_test extends phpbb_database_test_case
global $config, $user, $auth, $phpbb_dispatcher;
$config['load_online_guests'] = $display_guests;
- $user = new phpbb_mock_lang();
+ $user = new phpbb_mock_user();
$user->data['user_id'] = 100;
$user->lang = $this->load_language();
$auth = $this->createMock('\phpbb\auth\auth');
diff --git a/tests/migrations/migrations_check_config_added_test.php b/tests/migrations/migrations_check_config_added_test.php
index f4b8067ae1..969a0f5e79 100644
--- a/tests/migrations/migrations_check_config_added_test.php
+++ b/tests/migrations/migrations_check_config_added_test.php
@@ -13,6 +13,36 @@
class migrations_check_config_added_test extends phpbb_test_case
{
+ /** @var \phpbb\config\config */
+ protected $config;
+
+ /** @var \Symfony\Component\DependencyInjection\ContainerInterface */
+ protected $container;
+
+ /** @var \phpbb\db\driver\driver_interface */
+ protected $db;
+
+ /** @var \Doctrine\DBAL\Connection */
+ protected $db_doctrine;
+
+ /** @var \phpbb\db\tools\tools_interface */
+ protected $db_tools;
+
+ /** @var \phpbb\extension\manager */
+ protected $extension_manager;
+
+ /** @var \phpbb\db\migrator */
+ protected $migrator;
+
+ /** @var string */
+ protected $table_prefix;
+
+ /** @var string */
+ protected $phpbb_root_path;
+
+ /** @var string */
+ protected $php_ext;
+
protected function setUp(): void
{
global $phpbb_root_path;
diff --git a/tests/mock/container_builder.php b/tests/mock/container_builder.php
index 29050825db..9200ed0767 100644
--- a/tests/mock/container_builder.php
+++ b/tests/mock/container_builder.php
@@ -56,7 +56,7 @@ class phpbb_mock_container_builder implements ContainerInterface
*
* @api
*/
- public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE)
+ public function get(string $id, int $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE): ?object
{
if ($this->has($id))
{
@@ -79,11 +79,11 @@ class phpbb_mock_container_builder implements ContainerInterface
*
* @param string $id The service identifier
*
- * @return Boolean true if the service is defined, false otherwise
+ * @return bool true if the service is defined, false otherwise
*
* @api
*/
- public function has($id)
+ public function has(string $id): bool
{
return isset($this->services[$id]);
}
@@ -99,7 +99,7 @@ class phpbb_mock_container_builder implements ContainerInterface
*
* @api
*/
- public function getParameter($name)
+ public function getParameter(string $name): mixed
{
if ($this->hasParameter($name))
{
@@ -114,11 +114,11 @@ class phpbb_mock_container_builder implements ContainerInterface
*
* @param string $name The parameter name
*
- * @return Boolean The presence of parameter in container
+ * @return bool The presence of parameter in container
*
* @api
*/
- public function hasParameter($name)
+ public function hasParameter(string $name): bool
{
return isset($this->parameters[$name]);
}
@@ -202,7 +202,7 @@ class phpbb_mock_container_builder implements ContainerInterface
return false;
}
- public function initialized($id)
+ public function initialized($id): bool
{
return true;
}
diff --git a/tests/mock/lang.php b/tests/mock/lang.php
index bebbe5a29b..5de41f5775 100644
--- a/tests/mock/lang.php
+++ b/tests/mock/lang.php
@@ -17,25 +17,25 @@
*/
class phpbb_mock_lang implements ArrayAccess
{
- public function offsetExists($offset)
+ public function offsetExists($offset): bool
{
return true;
}
- public function offsetGet($offset)
+ public function offsetGet($offset): mixed
{
return $offset;
}
- public function offsetSet($offset, $value)
+ public function offsetSet($offset, $value): void
{
}
- public function offsetUnset($offset)
+ public function offsetUnset($offset): void
{
}
- public function lang()
+ public function lang(): string
{
return implode(' ', func_get_args());
}
diff --git a/tests/mock/request.php b/tests/mock/request.php
index 1253e40915..4985d6db2c 100644
--- a/tests/mock/request.php
+++ b/tests/mock/request.php
@@ -41,13 +41,13 @@ class phpbb_mock_request extends \phpbb\request\request
public function variable($var_name, $default, $multibyte = false, $super_global = \phpbb\request\request_interface::REQUEST)
{
- return isset($this->data[$super_global][$var_name]) ? $this->data[$super_global][$var_name] : $default;
+ return $this->data[$super_global][$var_name] ?? $default;
}
public function server($var_name, $default = '')
{
$super_global = \phpbb\request\request_interface::SERVER;
- return isset($this->data[$super_global][$var_name]) ? $this->data[$super_global][$var_name] : $default;
+ return $this->data[$super_global][$var_name] ?? $default;
}
public function header($header_name, $default = '')
@@ -115,7 +115,7 @@ class phpbb_mock_request extends \phpbb\request\request
$this->data[\phpbb\request\request_interface::SERVER][$var_name] = $value;
}
- public function merge($super_global = \phpbb\request\request_interface::REQUEST, $values)
+ public function merge($values, $super_global = \phpbb\request\request_interface::REQUEST): void
{
$this->data[$super_global] = array_merge($this->data[$super_global], $values);
}
diff --git a/tests/notification/base.php b/tests/notification/base.php
index ec1f6e065b..545508eedd 100644
--- a/tests/notification/base.php
+++ b/tests/notification/base.php
@@ -117,7 +117,7 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case
$phpEx
)
);
- $phpbb_container->set('dispatcher', $this->phpbb_dispatcher);
+ $phpbb_container->set('event_dispatcher', $this->phpbb_dispatcher);
$phpbb_container->setParameter('core.root_path', $phpbb_root_path);
$phpbb_container->setParameter('core.php_ext', $phpEx);
$phpbb_container->setParameter('tables.notifications', 'phpbb_notifications');
diff --git a/tests/notification/notification_method_email_test.php b/tests/notification/notification_method_email_test.php
index 12cd802cbd..d9b52cae2d 100644
--- a/tests/notification/notification_method_email_test.php
+++ b/tests/notification/notification_method_email_test.php
@@ -84,7 +84,7 @@ class notification_method_email_test extends phpbb_tests_notification_base
$phpbb_container->set('cache.driver', $cache_driver);
$phpbb_container->set('cache', $cache);
$phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils());
- $phpbb_container->set('dispatcher', $this->phpbb_dispatcher);
+ $phpbb_container->set('event_dispatcher', $this->phpbb_dispatcher);
$phpbb_container->setParameter('core.root_path', $phpbb_root_path);
$phpbb_container->setParameter('core.php_ext', $phpEx);
$phpbb_container->setParameter('tables.notifications', 'phpbb_notifications');
diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php
index db3ad6bd34..e8ad00e5ef 100644
--- a/tests/notification/submit_post_base.php
+++ b/tests/notification/submit_post_base.php
@@ -80,6 +80,7 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c
'num_posts' => 1,
'allow_board_notifications' => true,
'allow_mentions' => true,
+ 'board_startdate' => 1692429414,
));
// Event dispatcher
@@ -113,8 +114,7 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c
);
// Request
- $type_cast_helper = $this->createMock('\phpbb\request\type_cast_helper_interface');
- $request = $this->createMock('\phpbb\request\request');
+ $request = new phpbb_mock_request();
$avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper')
->disableOriginalConstructor()
@@ -146,7 +146,7 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c
$phpEx
)
);
- $phpbb_container->set('dispatcher', $phpbb_dispatcher);
+ $phpbb_container->set('event_dispatcher', $phpbb_dispatcher);
$phpbb_container->set('storage.attachment', $storage);
$phpbb_container->setParameter('core.root_path', $phpbb_root_path);
$phpbb_container->setParameter('core.php_ext', $phpEx);
diff --git a/tests/passwords/drivers_test.php b/tests/passwords/drivers_test.php
index 9c2aa8b160..51da57c278 100644
--- a/tests/passwords/drivers_test.php
+++ b/tests/passwords/drivers_test.php
@@ -13,6 +13,9 @@
class phpbb_passwords_helper_test extends \phpbb_test_case
{
+ /** @var array */
+ protected $passwords_drivers = [];
+
protected function setUp(): void
{
// Prepare dependencies for drivers
@@ -21,7 +24,7 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
$this->driver_helper = new \phpbb\passwords\driver\helper($config);
$phpbb_root_path = __DIR__ . '/../../phpBB/';
$php_ext = 'php';
-
+
// Initialize argon2 default options
$this->argon2_default_cost_options = [
'memory_cost' => 65536,
diff --git a/tests/passwords/manager_test.php b/tests/passwords/manager_test.php
index 2159160273..7b1b9a1cc3 100644
--- a/tests/passwords/manager_test.php
+++ b/tests/passwords/manager_test.php
@@ -13,6 +13,15 @@
class phpbb_passwords_manager_test extends \phpbb_test_case
{
+ /** @var \phpbb\passwords\driver\helper */
+ protected $driver_helper;
+
+ /** @var \phpbb\passwords\helper */
+ protected $helper;
+
+ /** @var \phpbb\passwords\manager */
+ protected $manager;
+
protected $passwords_drivers;
protected $pw_characters = '0123456789abcdefghijklmnopqrstuvwyzABCDEFGHIJKLMNOPQRSTUVXYZ.,_!?/\\';
diff --git a/tests/path_helper/path_helper_test.php b/tests/path_helper/path_helper_test.php
index 73d235e0cd..a2abefb108 100644
--- a/tests/path_helper/path_helper_test.php
+++ b/tests/path_helper/path_helper_test.php
@@ -127,8 +127,8 @@ class phpbb_path_helper_test extends phpbb_test_case
array(
$this->phpbb_root_path . 'test.php',
'/',
- null,
- null,
+ '',
+ '',
'',
),
array(
diff --git a/tests/random/gen_rand_string_test.php b/tests/random/gen_rand_string_test.php
index 13ca0df245..cb89a1703e 100644
--- a/tests/random/gen_rand_string_test.php
+++ b/tests/random/gen_rand_string_test.php
@@ -44,7 +44,7 @@ class phpbb_random_gen_rand_string_test extends phpbb_test_case
$random_string_length == $num_chars,
sprintf('Failed asserting that random string length matches expected length. Expected %1$u, Actual %2$u', $num_chars, $random_string_length)
);
- $this->assertRegExp('#^[A-Z0-9]+$#', $random_string);
+ $this->assertMatchesRegularExpression('#^[A-Z0-9]+$#', $random_string);
}
}
}
@@ -63,7 +63,7 @@ class phpbb_random_gen_rand_string_test extends phpbb_test_case
$random_string_length == $num_chars,
sprintf('Failed asserting that random string length matches expected length. Expected %1$u, Actual %2$u', $num_chars, $random_string_length)
);
- $this->assertRegExp('#^[A-NP-Z1-9]+$#', $random_string);
+ $this->assertMatchesRegularExpression('#^[A-NP-Z1-9]+$#', $random_string);
}
}
}
diff --git a/tests/regex/censor_test.php b/tests/regex/censor_test.php
index 5a516b71de..6da6083e19 100644
--- a/tests/regex/censor_test.php
+++ b/tests/regex/censor_test.php
@@ -37,6 +37,6 @@ class phpbb_regex_censor_test extends phpbb_test_case
{
$regex = get_censor_preg_expression($pattern);
- $this->assertRegExp($regex, $subject);
+ $this->assertMatchesRegularExpression($regex, $subject);
}
}
diff --git a/tests/storage/adapter/local_subfolders_test.php b/tests/storage/adapter/local_subfolders_test.php
index 8421224098..33b232a131 100644
--- a/tests/storage/adapter/local_subfolders_test.php
+++ b/tests/storage/adapter/local_subfolders_test.php
@@ -88,8 +88,8 @@ class phpbb_storage_adapter_local_subfolders_test extends phpbb_local_test_case
$this->adapter->delete('file.txt');
// Then
- $this->assertFileNotExists($this->path . '3d/8e/file.txt');
- $this->assertFileNotExists($this->path . '3d');
+ $this->assertFileDoesNotExist($this->path . '3d/8e/file.txt');
+ $this->assertFileDoesNotExist($this->path . '3d');
}
public function test_rename(): void
@@ -102,9 +102,9 @@ class phpbb_storage_adapter_local_subfolders_test extends phpbb_local_test_case
$this->adapter->rename('file.txt', 'file2.txt');
// Then
- $this->assertFileNotExists($this->path . '3d/8e/file.txt');
+ $this->assertFileDoesNotExist($this->path . '3d/8e/file.txt');
$this->assertFileExists($this->path . '27/36/file2.txt');
- $this->assertFileNotExists($this->path . '3d');
+ $this->assertFileDoesNotExist($this->path . '3d');
// Clean test
unlink($this->path . '27/36/file2.txt');
diff --git a/tests/storage/adapter/local_test.php b/tests/storage/adapter/local_test.php
index 5adee7d916..61d2e1d0c1 100644
--- a/tests/storage/adapter/local_test.php
+++ b/tests/storage/adapter/local_test.php
@@ -77,7 +77,7 @@ class phpbb_storage_adapter_local_test extends phpbb_local_test_case
$this->adapter->delete('file.txt');
// Then
- $this->assertFileNotExists($this->path . 'file.txt');
+ $this->assertFileDoesNotExist($this->path . 'file.txt');
}
public function test_rename(): void
@@ -85,13 +85,13 @@ class phpbb_storage_adapter_local_test extends phpbb_local_test_case
// Given
touch($this->path . 'file.txt');
$this->assertFileExists($this->path . 'file.txt');
- $this->assertFileNotExists($this->path . 'file2.txt');
+ $this->assertFileDoesNotExist($this->path . 'file2.txt');
// When
$this->adapter->rename('file.txt', 'file2.txt');
// Then
- $this->assertFileNotExists($this->path . 'file.txt');
+ $this->assertFileDoesNotExist($this->path . 'file.txt');
$this->assertFileExists($this->path . 'file2.txt');
// Clean test
diff --git a/tests/template/extension_test.php b/tests/template/extension_test.php
index bf8d4f568c..f7e30b35b1 100644
--- a/tests/template/extension_test.php
+++ b/tests/template/extension_test.php
@@ -88,7 +88,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
$class = new ReflectionClass('\phpbb\avatar\manager');
$enabled_drivers = $class->getProperty('enabled_drivers');
$enabled_drivers->setAccessible(true);
- $enabled_drivers->setValue(false);
+ $enabled_drivers->setValue($class, false);
$this->template_path = $this->test_path . '/templates';
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index 73f897749f..8faa52d8ac 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -528,7 +528,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
$filename = 'file_not_found.html';
$this->template->set_filenames(array('test' => $filename));
- $this->assertFileNotExists($this->template_path . '/' . $filename, 'Testing missing file, file cannot exist');
+ $this->assertFileDoesNotExist($this->template_path . '/' . $filename, 'Testing missing file, file cannot exist');
$this->expectException(\Twig\Error\LoaderError::class);
diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php
index 277313ccc3..8131567131 100644
--- a/tests/template/template_test_case_with_tree.php
+++ b/tests/template/template_test_case_with_tree.php
@@ -15,6 +15,12 @@ require_once __DIR__ . '/template_test_case.php';
class phpbb_template_template_test_case_with_tree extends phpbb_template_template_test_case
{
+ /** @var \phpbb\path_helper */
+ protected $phpbb_path_helper;
+
+ /** @var string */
+ protected $parent_template_path;
+
protected function setup_engine(array $new_config = array())
{
global $phpbb_root_path, $phpEx, $user;
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index e8d5a653a6..030c8100ea 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -29,8 +29,6 @@ abstract class phpbb_database_test_case extends TestCase
protected static $install_schema_file;
- protected static $phpunit_version;
-
/**
* @var \Doctrine\DBAL\Connection[]
*/
@@ -40,9 +38,7 @@ abstract class phpbb_database_test_case extends TestCase
{
parent::__construct($name, $data, $dataName);
- self::$phpunit_version = PHPUnit\Runner\Version::id();
-
- $backupStaticAttributesBlacklist = [
+ $this->backupStaticAttributesExcludeList += [
'SebastianBergmann\CodeCoverage\CodeCoverage' => ['instance'],
'SebastianBergmann\CodeCoverage\Filter' => ['instance'],
'SebastianBergmann\CodeCoverage\Util' => ['ignoredLines', 'templateMethods'],
@@ -53,15 +49,6 @@ abstract class phpbb_database_test_case extends TestCase
'phpbb_database_test_case' => ['already_connected'],
];
- if (version_compare(self::$phpunit_version, '9.0', '>='))
- {
- $this->backupStaticAttributesExcludeList += $backupStaticAttributesBlacklist;
- }
- else
- {
- $this->backupStaticAttributesBlacklist += $backupStaticAttributesBlacklist;
- }
-
$this->db_connections = [];
$this->db_connections_doctrine = [];
}
@@ -303,6 +290,7 @@ abstract class phpbb_database_test_case extends TestCase
{
$config = $this->get_database_config();
+ /** @var \phpbb\db\driver\driver_interface $db */
$db = new $config['dbms']();
$db->sql_connect($config['dbhost'], $config['dbuser'], $config['dbpasswd'], $config['dbname'], $config['dbport']);
@@ -410,56 +398,4 @@ abstract class phpbb_database_test_case extends TestCase
return $core_tables;
}
-
- /**
- * PHPUnit deprecates several methods and properties in its recent versions
- * Provide BC layer to be able to test in multiple environment settings
- */
- public function expectException(string $exception): void
- {
- if (version_compare(self::$phpunit_version, '9.0', '>='))
- {
- switch ($exception) {
- case PHPUnit\Framework\Error\Deprecated::class:
- parent::expectDeprecation();
- break;
-
- case PHPUnit\Framework\Error\Error::class:
- parent::expectError();
- break;
-
- case PHPUnit\Framework\Error\Notice::class:
- parent::expectNotice();
- break;
-
- case PHPUnit\Framework\Error\Warning::class:
- parent::expectWarning();
- break;
-
- default:
- parent::expectException($exception);
- break;
- }
- }
- else
- {
- parent::expectException($exception);
- }
- }
-
- /**
- * PHPUnit deprecates several methods and properties in its recent versions
- * Provide BC layer to be able to test in multiple environment settings
- */
- public static function assertFileNotExists(string $filename, string $message = ''): void
- {
- if (version_compare(self::$phpunit_version, '9.0', '>='))
- {
- parent::assertFileDoesNotExist($filename, $message);
- }
- else
- {
- parent::assertFileNotExists($filename, $message);
- }
- }
}
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index c21a8fc95d..db73248f6c 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -520,7 +520,7 @@ class phpbb_database_test_connection_manager
$queries = array();
// Get escaped versions of the table names to synchronise
- $table_names = array_map(array($this->pdo, 'PDO::quote'), array_keys($table_column_map));
+ $table_names = array_map([$this->pdo, 'quote'], array_keys($table_column_map));
switch ($this->config['dbms'])
{
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 1ef7ac6407..a5b16082ff 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -11,12 +11,19 @@
*
*/
use Symfony\Component\BrowserKit\CookieJar;
+use Symfony\Component\BrowserKit\HttpBrowser;
+use Symfony\Component\HttpClient\HttpClient;
+use Symfony\Component\HttpClient\NativeHttpClient;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
require_once __DIR__ . '/mock/phpbb_mock_null_installer_task.php';
class phpbb_functional_test_case extends phpbb_test_case
{
- /** @var \Goutte\Client */
+ /** @var HttpClientInterface */
+ protected static $http_client;
+
+ /** @var HttpBrowser */
protected static $client;
protected static $cookieJar;
protected static $root_url;
@@ -89,7 +96,9 @@ class phpbb_functional_test_case extends phpbb_test_case
$this->bootstrap();
self::$cookieJar = new CookieJar;
- self::$client = new Goutte\Client(array(), null, self::$cookieJar);
+ // Force native client on windows platform
+ self::$http_client = strtolower(substr(PHP_OS, 0, 3)) === 'win' ? new NativeHttpClient() : HttpClient::create();
+ self::$client = new HttpBrowser(self::$http_client, null, self::$cookieJar);
// Clear the language array so that things
// that were added in other tests are gone
@@ -158,6 +167,16 @@ class phpbb_functional_test_case extends phpbb_test_case
*/
static public function submit(Symfony\Component\DomCrawler\Form $form, array $values = array(), $assert_response_html = true)
{
+ // Remove files from form if no file was submitted
+ // See: https://github.com/symfony/symfony/issues/49014
+ foreach ($form->getFiles() as $field_name => $value)
+ {
+ if (!$value['name'] && !$value['tmp_name'])
+ {
+ $form->remove($field_name);
+ }
+ }
+
$crawler = self::$client->submit($form, $values);
if ($assert_response_html)
@@ -189,10 +208,9 @@ class phpbb_functional_test_case extends phpbb_test_case
{
parent::__construct($name, $data, $dataName);
- $backupStaticAttributesBlacklist = [
+ $this->backupStaticAttributesExcludeList += [
'phpbb_functional_test_case' => ['config', 'already_installed'],
];
- $this->excludeBackupStaticAttributes($backupStaticAttributesBlacklist);
}
protected function get_db()
@@ -270,7 +288,7 @@ class phpbb_functional_test_case extends phpbb_test_case
);
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$container->set('migrator', $migrator);
- $container->set('dispatcher', $phpbb_dispatcher);
+ $container->set('event_dispatcher', $phpbb_dispatcher);
$cache = $this->getMockBuilder('\phpbb\cache\service')
->setConstructorArgs([$this->get_cache_driver(), $config, $this->db, $phpbb_dispatcher, $phpbb_root_path, $phpEx])
->setMethods(['deferred_purge'])
diff --git a/tests/test_framework/phpbb_test_case.php b/tests/test_framework/phpbb_test_case.php
index 56d8decbd8..11f9020e4f 100644
--- a/tests/test_framework/phpbb_test_case.php
+++ b/tests/test_framework/phpbb_test_case.php
@@ -16,15 +16,12 @@ use PHPUnit\Framework\TestCase;
class phpbb_test_case extends TestCase
{
protected $test_case_helpers;
- protected static $phpunit_version;
public function __construct($name = NULL, array $data = array(), $dataName = '')
{
parent::__construct($name, $data, $dataName);
- self::$phpunit_version = PHPUnit\Runner\Version::id();
-
- $backupStaticAttributesBlacklist = [
+ $this->backupStaticAttributesExcludeList += [
'SebastianBergmann\CodeCoverage\CodeCoverage' => ['instance'],
'SebastianBergmann\CodeCoverage\Filter' => ['instance'],
'SebastianBergmann\CodeCoverage\Util' => ['ignoredLines', 'templateMethods'],
@@ -34,7 +31,6 @@ class phpbb_test_case extends TestCase
'phpbb_database_test_case' => ['already_connected', 'last_post_timestamp'],
];
- $this->excludeBackupStaticAttributes($backupStaticAttributesBlacklist);
}
public function get_test_case_helpers()
@@ -51,88 +47,4 @@ class phpbb_test_case extends TestCase
{
$this->get_test_case_helpers()->setExpectedTriggerError($errno, $message);
}
-
- /**
- * PHPUnit deprecates several methods and properties in its recent versions
- * Provide BC layer to be able to test in multiple environment settings
- */
- public function excludeBackupStaticAttributes($attributes_array)
- {
- if (version_compare(self::$phpunit_version, '9.0', '>='))
- {
- $this->backupStaticAttributesExcludeList += $attributes_array;
- }
- else
- {
- $this->backupStaticAttributesBlacklist += $attributes_array;
- }
- }
-
- /**
- * PHPUnit deprecates several methods and properties in its recent versions
- * Provide BC layer to be able to test in multiple environment settings
- */
- public static function assertRegExp(string $pattern, string $string, string $message = ''): void
- {
- if (version_compare(self::$phpunit_version, '9.0', '>='))
- {
- parent::assertMatchesRegularExpression($pattern, $string, $message);
- }
- else
- {
- parent::assertRegExp($pattern, $string, $message);
- }
- }
-
- /**
- * PHPUnit deprecates several methods and properties in its recent versions
- * Provide BC layer to be able to test in multiple environment settings
- */
- public function expectException(string $exception): void
- {
- if (version_compare(self::$phpunit_version, '9.0', '>='))
- {
- switch ($exception) {
- case PHPUnit\Framework\Error\Deprecated::class:
- parent::expectDeprecation();
- break;
-
- case PHPUnit\Framework\Error\Error::class:
- parent::expectError();
- break;
-
- case PHPUnit\Framework\Error\Notice::class:
- parent::expectNotice();
- break;
-
- case PHPUnit\Framework\Error\Warning::class:
- parent::expectWarning();
- break;
-
- default:
- parent::expectException($exception);
- break;
- }
- }
- else
- {
- parent::expectException($exception);
- }
- }
-
- /**
- * PHPUnit deprecates several methods and properties in its recent versions
- * Provide BC layer to be able to test in multiple environment settings
- */
- public static function assertFileNotExists(string $filename, string $message = ''): void
- {
- if (version_compare(self::$phpunit_version, '9.0', '>='))
- {
- parent::assertFileDoesNotExist($filename, $message);
- }
- else
- {
- parent::assertFileNotExists($filename, $message);
- }
- }
}
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index c1ab852753..bed719c6bb 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -503,9 +503,9 @@ class phpbb_test_case_helpers
}
// Create an event dispatcher
- if ($container->has('dispatcher'))
+ if ($container->has('event_dispatcher'))
{
- $dispatcher = $container->get('dispatcher');
+ $dispatcher = $container->get('event_dispatcher');
}
else if (isset($phpbb_dispatcher))
{
diff --git a/tests/text_formatter/s9e/factory_test.php b/tests/text_formatter/s9e/factory_test.php
index 7e35c18332..5300b4c52d 100644
--- a/tests/text_formatter/s9e/factory_test.php
+++ b/tests/text_formatter/s9e/factory_test.php
@@ -156,7 +156,7 @@ class phpbb_textformatter_s9e_factory_test extends phpbb_database_test_case
$factory->tidy();
$this->assertFileExists($new_file, 'The current renderer has been deleted');
- $this->assertFileNotExists($old_file, 'The old renderer has not been deleted');
+ $this->assertFileDoesNotExist($old_file, 'The old renderer has not been deleted');
unlink($new_file);
}
diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index c501788829..887cfdee41 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -230,7 +230,7 @@ class phpbb_filespec_test extends phpbb_test_case
$name = $filespec->get('realname');
$this->assertEquals(strlen($name), 32 + strlen(self::PREFIX));
- $this->assertRegExp('#^[A-Za-z0-9]+$#', substr($name, strlen(self::PREFIX)));
+ $this->assertMatchesRegularExpression('#^[A-Za-z0-9]+$#', substr($name, strlen(self::PREFIX)));
$this->assertFalse(isset($filenames[$name]));
$filenames[$name] = true;
}
@@ -246,7 +246,7 @@ class phpbb_filespec_test extends phpbb_test_case
$name = $filespec->get('realname');
$this->assertEquals(strlen($name), 32 + strlen(self::PREFIX) + strlen('.jpg'));
- $this->assertRegExp('#^[A-Za-z0-9]+\.jpg$#', substr($name, strlen(self::PREFIX)));
+ $this->assertMatchesRegularExpression('#^[A-Za-z0-9]+\.jpg$#', substr($name, strlen(self::PREFIX)));
$this->assertFalse(isset($filenames[$name]));
$filenames[$name] = true;
}
diff --git a/vagrant/after.sh b/vagrant/after.sh
index 89874df209..829a28a25d 100755
--- a/vagrant/after.sh
+++ b/vagrant/after.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-PHP_VERSION="7.3"
+PHP_VERSION="8.1"
PHPBB_PATH="/home/vagrant/phpbb"
PHPBB_CONFIG="${PHPBB_PATH}/phpBB/config.php"
PHPBB_INSTALL="${PHPBB_PATH}/vagrant/phpbb-install-config.yml"
diff --git a/vagrant/bootstrap.yaml b/vagrant/bootstrap.yaml
index a6d5fa9983..7deb4e70d7 100644
--- a/vagrant/bootstrap.yaml
+++ b/vagrant/bootstrap.yaml
@@ -14,7 +14,7 @@ keys:
folders:
- map: "."
to: "/home/vagrant/phpbb"
- php: "7.3"
+ php: "8.1"
sites:
- map: phpbb.app