[ticket/16649] Upgrade to Symfony 5

PHPBB3-16649

phpBB/phpbb/console/command/cache/purge.php

@@ -12,6 +12,7 @@
 */
 namespace phpbb\console\command\cache;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
@@ -72,7 +73,7 @@ class purge extends \phpbb\console\command\command
 	* @param InputInterface  $input  An InputInterface instance
 	* @param OutputInterface $output An OutputInterface instance
 	*
-	* @return void
+	* @return int
 	*/
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
@@ -87,5 +88,7 @@ class purge extends \phpbb\console\command\command
 
 		$io = new SymfonyStyle($input, $output);
 		$io->success($this->user->lang('PURGE_CACHE_SUCCESS'));
+
+		return symfony_command::SUCCESS;
 	}
 }

phpBB/phpbb/console/command/config/delete.php

@@ -12,6 +12,7 @@
 */
 namespace phpbb\console\command\config;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -20,8 +21,8 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 class delete extends command
 {
 	/**
-	* {@inheritdoc}
-	*/
+	 * {@inheritdoc}
+	 */
 	protected function configure()
 	{
 		$this
@@ -36,16 +37,16 @@ class delete extends command
 	}
 
 	/**
-	* Executes the command config:delete.
-	*
-	* Removes a configuration option
-	*
-	* @param InputInterface  $input  An InputInterface instance
-	* @param OutputInterface $output An OutputInterface instance
-	*
-	* @return void
-	* @see \phpbb\config\config::delete()
-	*/
+	 * Executes the command config:delete.
+	 *
+	 * Removes a configuration option
+	 *
+	 * @param InputInterface  $input  An InputInterface instance
+	 * @param OutputInterface $output An OutputInterface instance
+	 *
+	 * @return int
+	 * @see \phpbb\config\config::delete()
+	 */
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
 		$io = new SymfonyStyle($input, $output);
@@ -57,10 +58,13 @@ class delete extends command
 			$this->config->delete($key);
 
 			$io->success($this->user->lang('CLI_CONFIG_DELETE_SUCCESS', $key));
+
+			return symfony_command::SUCCESS;
 		}
 		else
 		{
 			$io->error($this->user->lang('CLI_CONFIG_NOT_EXISTS', $key));
+			return symfony_command::FAILURE;
 		}
 	}
 }

phpBB/phpbb/console/command/config/get.php

@@ -12,6 +12,7 @@
 */
 namespace phpbb\console\command\config;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -50,7 +51,7 @@ class get extends command
 	* @param InputInterface  $input  An InputInterface instance
 	* @param OutputInterface $output An OutputInterface instance
 	*
-	* @return void
+	* @return int
 	* @see \phpbb\config\config::offsetGet()
 	*/
 	protected function execute(InputInterface $input, OutputInterface $output)
@@ -62,14 +63,17 @@ class get extends command
 		if (isset($this->config[$key]) && $input->getOption('no-newline'))
 		{
 			$output->write($this->config[$key]);
+			return symfony_command::SUCCESS;
 		}
 		else if (isset($this->config[$key]))
 		{
 			$output->writeln($this->config[$key]);
+			return symfony_command::SUCCESS;
 		}
 		else
 		{
 			$io->error($this->user->lang('CLI_CONFIG_NOT_EXISTS', $key));
+			return symfony_command::FAILURE;
 		}
 	}
 }

phpBB/phpbb/console/command/config/increment.php

@@ -12,6 +12,7 @@
 */
 namespace phpbb\console\command\config;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -55,7 +56,7 @@ class increment extends command
 	* @param InputInterface  $input  An InputInterface instance
 	* @param OutputInterface $output An OutputInterface instance
 	*
-	* @return void
+	* @return int
 	* @see \phpbb\config\config::increment()
 	*/
 	protected function execute(InputInterface $input, OutputInterface $output)
@@ -69,5 +70,7 @@ class increment extends command
 		$this->config->increment($key, $increment, $use_cache);
 
 		$io->success($this->user->lang('CLI_CONFIG_INCREMENT_SUCCESS', $key));
+
+		return symfony_command::SUCCESS;
 	}
 }

phpBB/phpbb/console/command/config/set.php

@@ -12,6 +12,7 @@
 */
 namespace phpbb\console\command\config;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -55,7 +56,7 @@ class set extends command
 	* @param InputInterface  $input  An InputInterface instance
 	* @param OutputInterface $output An OutputInterface instance
 	*
-	* @return void
+	* @return int
 	* @see \phpbb\config\config::set()
 	*/
 	protected function execute(InputInterface $input, OutputInterface $output)
@@ -69,5 +70,7 @@ class set extends command
 		$this->config->set($key, $value, $use_cache);
 
 		$io->success($this->user->lang('CLI_CONFIG_SET_SUCCESS', $key));
+
+		return symfony_command::SUCCESS;
 	}
 }

phpBB/phpbb/console/command/config/set_atomic.php

@@ -12,6 +12,7 @@
 */
 namespace phpbb\console\command\config;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -76,12 +77,12 @@ class set_atomic extends command
 		if ($this->config->set_atomic($key, $old_value, $new_value, $use_cache))
 		{
 			$io->success($this->user->lang('CLI_CONFIG_SET_SUCCESS', $key));
-			return 0;
+			return symfony_command::SUCCESS;
 		}
 		else
 		{
 			$io->error($this->user->lang('CLI_CONFIG_SET_FAILURE', $key));
-			return 1;
+			return symfony_command::FAILURE;
 		}
 	}
 }

phpBB/phpbb/console/command/cron/cron_list.php

@@ -12,6 +12,7 @@
 */
 namespace phpbb\console\command\cron;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
@@ -52,7 +53,7 @@ class cron_list extends \phpbb\console\command\command
 	* @param InputInterface  $input  An InputInterface instance
 	* @param OutputInterface $output An OutputInterface instance
 	*
-	* @return void
+	* @return int
 	*/
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
@@ -63,7 +64,7 @@ class cron_list extends \phpbb\console\command\command
 		if (empty($tasks))
 		{
 			$io->error($this->user->lang('CRON_NO_TASKS'));
-			return;
+			return symfony_command::FAILURE;
 		}
 
 		$ready_tasks = $not_ready_tasks = array();
@@ -90,5 +91,7 @@ class cron_list extends \phpbb\console\command\command
 			$io->title($this->user->lang('TASKS_NOT_READY'));
 			$io->listing($not_ready_tasks);
 		}
+
+		return symfony_command::SUCCESS;
 	}
 }

phpBB/phpbb/console/command/db/list_command.php

@@ -12,6 +12,7 @@
 */
 namespace phpbb\console\command\db;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -19,6 +20,9 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 
 class list_command extends \phpbb\console\command\db\migration_command
 {
+	/**
+	 * {@inheritdoc}
+	 */
 	protected function configure()
 	{
 		$this
@@ -33,6 +37,16 @@ class list_command extends \phpbb\console\command\db\migration_command
 		;
 	}
 
+	/**
+	 * Executes the command db:list.
+	 *
+	 * Lists all installed and available migrations
+	 *
+	 * @param InputInterface  $input  An InputInterface instance
+	 * @param OutputInterface $output An OutputInterface instance
+	 *
+	 * @return int
+	 */
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
 		$io = new SymfonyStyle($input, $output);
@@ -71,11 +85,13 @@ class list_command extends \phpbb\console\command\db\migration_command
 		if (!empty($available))
 		{
 			$io->listing($available);
+			return symfony_command::SUCCESS;
 		}
 		else
 		{
 			$io->text($this->user->lang('CLI_MIGRATIONS_EMPTY'));
 			$io->newLine();
+			return symfony_command::FAILURE;
 		}
 	}
 }

phpBB/phpbb/console/command/db/migrate.php

@@ -12,6 +12,7 @@
 */
 namespace phpbb\console\command\db;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use phpbb\db\output_handler\log_wrapper_migrator_output_handler;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -41,6 +42,9 @@ class migrate extends \phpbb\console\command\db\migration_command
 		$this->language->add_lang(array('common', 'install', 'migrator'));
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	protected function configure()
 	{
 		$this
@@ -49,6 +53,16 @@ class migrate extends \phpbb\console\command\db\migration_command
 		;
 	}
 
+	/**
+	 * Executes the command db:migrate.
+	 *
+	 * Updates the database by applying migrations
+	 *
+	 * @param InputInterface  $input  An InputInterface instance
+	 * @param OutputInterface $output An OutputInterface instance
+	 *
+	 * @return int
+	 */
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
 		$io = new SymfonyStyle($input, $output);
@@ -71,7 +85,7 @@ class migrate extends \phpbb\console\command\db\migration_command
 			{
 				$io->error($e->getLocalisedMessage($this->user));
 				$this->finalise_update();
-				return 1;
+				return symfony_command::FAILURE;
 			}
 		}
 
@@ -82,5 +96,6 @@ class migrate extends \phpbb\console\command\db\migration_command
 
 		$this->finalise_update();
 		$io->success($this->language->lang('INLINE_UPDATE_SUCCESSFUL'));
+		return symfony_command::SUCCESS;
 	}
 }

phpBB/phpbb/console/command/db/revert.php

@@ -12,6 +12,7 @@
 */
 namespace phpbb\console\command\db;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use phpbb\db\output_handler\log_wrapper_migrator_output_handler;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -20,6 +21,9 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 
 class revert extends \phpbb\console\command\db\migrate
 {
+	/**
+	 * {@inheritdoc}
+	 */
 	protected function configure()
 	{
 		$this
@@ -33,6 +37,16 @@ class revert extends \phpbb\console\command\db\migrate
 		;
 	}
 
+	/**
+	 * Executes the command db:revert.
+	 *
+	 * Reverts a migration
+	 *
+	 * @param InputInterface  $input  An InputInterface instance
+	 * @param OutputInterface $output An OutputInterface instance
+	 *
+	 * @return int
+	 */
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
 		$io = new SymfonyStyle($input, $output);
@@ -46,12 +60,12 @@ class revert extends \phpbb\console\command\db\migrate
 		if (!in_array($name, $this->load_migrations()))
 		{
 			$io->error($this->language->lang('MIGRATION_NOT_VALID', $name));
-			return 1;
+			return symfony_command::FAILURE;
 		}
 		else if ($this->migrator->migration_state($name) === false)
 		{
 			$io->error($this->language->lang('MIGRATION_NOT_INSTALLED', $name));
-			return 1;
+			return symfony_command::FAILURE;
 		}
 
 		try
@@ -65,10 +79,11 @@ class revert extends \phpbb\console\command\db\migrate
 		{
 			$io->error($e->getLocalisedMessage($this->user));
 			$this->finalise_update();
-			return 1;
+			return symfony_command::FAILURE;
 		}
 
 		$this->finalise_update();
 		$io->success($this->language->lang('INLINE_UPDATE_SUCCESSFUL'));
+		return symfony_command::SUCCESS;
 	}
 }

phpBB/phpbb/console/command/dev/migration_tips.php

@@ -12,6 +12,7 @@
 */
 namespace phpbb\console\command\dev;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -26,6 +27,9 @@ class migration_tips extends \phpbb\console\command\command
 		parent::__construct($user);
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	protected function configure()
 	{
 		$this
@@ -34,6 +38,16 @@ class migration_tips extends \phpbb\console\command\command
 		;
 	}
 
+	/**
+	 * Executes the command dev:migration-tips.
+	 *
+	 * Finds migrations that are not depended upon
+	 *
+	 * @param InputInterface  $input  An InputInterface instance
+	 * @param OutputInterface $output An OutputInterface instance
+	 *
+	 * @return int
+	 */
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
 		$migrations = $this->extension_manager->get_finder()
@@ -60,5 +74,7 @@ class migration_tips extends \phpbb\console\command\command
 			$output->writeln("\t\t\t'{$migration}',");
 		}
 		$output->writeln("\t\t];");
+
+		return symfony_command::SUCCESS;
 	}
 }

phpBB/phpbb/console/command/extension/disable.php

@@ -12,6 +12,7 @@
 */
 namespace phpbb\console\command\extension;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -19,6 +20,9 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 
 class disable extends command
 {
+	/**
+	 * {@inheritdoc}
+	 */
 	protected function configure()
 	{
 		$this
@@ -32,6 +36,16 @@ class disable extends command
 		;
 	}
 
+	/**
+	 * Executes the command extension:disable.
+	 *
+	 * Disables the specified extension
+	 *
+	 * @param InputInterface  $input  An InputInterface instance
+	 * @param OutputInterface $output An OutputInterface instance
+	 *
+	 * @return int
+	 */
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
 		$io = new SymfonyStyle($input, $output);
@@ -50,14 +64,14 @@ class disable extends command
 		if ($this->manager->is_enabled($name))
 		{
 			$io->error($this->user->lang('CLI_EXTENSION_DISABLE_FAILURE', $name));
-			return 1;
+			return symfony_command::FAILURE;
 		}
 		else
 		{
 			$this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_DISABLE', time(), array($name));
 			$this->check_apcu_cache($io);
 			$io->success($this->user->lang('CLI_EXTENSION_DISABLE_SUCCESS', $name));
-			return 0;
+			return symfony_command::SUCCESS;
 		}
 	}
 }

phpBB/phpbb/console/command/extension/enable.php

@@ -12,6 +12,7 @@
 */
 namespace phpbb\console\command\extension;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -19,6 +20,9 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 
 class enable extends command
 {
+	/**
+	 * {@inheritdoc}
+	 */
 	protected function configure()
 	{
 		$this
@@ -32,6 +36,16 @@ class enable extends command
 		;
 	}
 
+	/**
+	 * Executes the command extension:enable.
+	 *
+	 * Enables the specified extension
+	 *
+	 * @param InputInterface  $input  An InputInterface instance
+	 * @param OutputInterface $output An OutputInterface instance
+	 *
+	 * @return int
+	 */
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
 		$io = new SymfonyStyle($input, $output);
@@ -41,7 +55,7 @@ class enable extends command
 		if (!$this->manager->is_available($name))
 		{
 			$io->error($this->user->lang('CLI_EXTENSION_NOT_EXIST', $name));
-			return 1;
+			return symfony_command::FAILURE;
 		}
 
 		$extension = $this->manager->get_extension($name);
@@ -51,13 +65,13 @@ class enable extends command
 			$message = !empty($enableable) ? $enableable : $this->user->lang('CLI_EXTENSION_NOT_ENABLEABLE', $name);
 			$message = is_array($message) ? implode(PHP_EOL, $message) : $message;
 			$io->error($message);
-			return 1;
+			return symfony_command::FAILURE;
 		}
 
 		if ($this->manager->is_enabled($name))
 		{
 			$io->error($this->user->lang('CLI_EXTENSION_ENABLED', $name));
-			return 1;
+			return symfony_command::FAILURE;
 		}
 
 		$this->manager->enable($name);
@@ -68,12 +82,12 @@ class enable extends command
 			$this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_ENABLE', time(), array($name));
 			$this->check_apcu_cache($io);
 			$io->success($this->user->lang('CLI_EXTENSION_ENABLE_SUCCESS', $name));
-			return 0;
+			return symfony_command::SUCCESS;
 		}
 		else
 		{
 			$io->error($this->user->lang('CLI_EXTENSION_ENABLE_FAILURE', $name));
-			return 1;
+			return symfony_command::FAILURE;
 		}
 	}
 }

phpBB/phpbb/console/command/extension/install.php

@@ -16,6 +16,7 @@ namespace phpbb\console\command\extension;
 use phpbb\composer\extension_manager;
 use phpbb\composer\io\console_io;
 use phpbb\language\language;
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -83,7 +84,7 @@ class install extends \phpbb\console\command\command
 		if (!$this->manager->check_requirements())
 		{
 			$io->error($this->language->lang('EXTENSIONS_COMPOSER_NOT_WRITABLE'));
-			return 1;
+			return symfony_command::FAILURE;
 		}
 
 		$composer_io = new console_io($input, $output, $this->getHelperSet(), $this->language);
@@ -98,6 +99,6 @@ class install extends \phpbb\console\command\command
 
 		$io->success($this->language->lang('EXTENSIONS_INSTALLED'));
 
-		return 0;
+		return symfony_command::SUCCESS;
 	}
 }

phpBB/phpbb/console/command/extension/list_available.php

@@ -14,6 +14,7 @@
 namespace phpbb\console\command\extension;
 
 use phpbb\composer\manager_interface;
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
@@ -68,6 +69,6 @@ class list_available extends \phpbb\console\command\command
 
 		$io->listing($extensions);
 
-		return 0;
+		return symfony_command::SUCCESS;
 	}
 }

phpBB/phpbb/console/command/extension/manage.php

@@ -17,6 +17,7 @@ use phpbb\composer\exception\managed_with_error_exception;
 use phpbb\composer\io\console_io;
 use phpbb\composer\manager_interface;
 use phpbb\language\language;
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -75,7 +76,7 @@ class manage extends \phpbb\console\command\command
 		if (!$this->manager->check_requirements())
 		{
 			$io->error($this->language->lang('EXTENSIONS_COMPOSER_NOT_WRITABLE'));
-			return 1;
+			return symfony_command::FAILURE;
 		}
 
 		$composer_io = new console_io($input, $output, $this->getHelperSet(), $this->language);
@@ -89,11 +90,11 @@ class manage extends \phpbb\console\command\command
 		catch (managed_with_error_exception $e)
 		{
 			$io->warning($this->language->lang_array($e->getMessage(), $e->get_parameters()));
-			return 1;
+			return symfony_command::FAILURE;
 		}
 
 		$io->success($this->language->lang('EXTENSION_MANAGED_SUCCESS', $extension));
 
-		return 0;
+		return symfony_command::SUCCESS;
 	}
 }

phpBB/phpbb/console/command/extension/purge.php

@@ -12,6 +12,7 @@
 */
 namespace phpbb\console\command\extension;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -19,6 +20,9 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 
 class purge extends command
 {
+	/**
+	 * {@inheritdoc}
+	 */
 	protected function configure()
 	{
 		$this
@@ -32,6 +36,16 @@ class purge extends command
 		;
 	}
 
+	/**
+	 * Executes the command extension:purge.
+	 *
+	 * Purges the specified extension
+	 *
+	 * @param InputInterface  $input  An InputInterface instance
+	 * @param OutputInterface $output An OutputInterface instance
+	 *
+	 * @return int
+	 */
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
 		$io = new SymfonyStyle($input, $output);
@@ -43,14 +57,14 @@ class purge extends command
 		if ($this->manager->is_enabled($name))
 		{
 			$io->error($this->user->lang('CLI_EXTENSION_PURGE_FAILURE', $name));
-			return 1;
+			return symfony_command::FAILURE;
 		}
 		else
 		{
 			$this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_PURGE', time(), array($name));
 			$this->check_apcu_cache($io);
 			$io->success($this->user->lang('CLI_EXTENSION_PURGE_SUCCESS', $name));
-			return 0;
+			return symfony_command::SUCCESS;
 		}
 	}
 }

phpBB/phpbb/console/command/extension/remove.php

@@ -16,6 +16,7 @@ namespace phpbb\console\command\extension;
 use phpbb\composer\extension_manager;
 use phpbb\composer\io\console_io;
 use phpbb\language\language;
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -83,7 +84,7 @@ class remove extends \phpbb\console\command\command
 		if (!$this->manager->check_requirements())
 		{
 			$io->error($this->language->lang('EXTENSIONS_COMPOSER_NOT_WRITABLE'));
-			return 1;
+			return symfony_command::FAILURE;
 		}
 
 		$composer_io = new console_io($input, $output, $this->getHelperSet(), $this->language);
@@ -98,6 +99,6 @@ class remove extends \phpbb\console\command\command
 
 		$io->success($this->language->lang('EXTENSIONS_REMOVED'));
 
-		return 0;
+		return symfony_command::SUCCESS;
 	}
 }

phpBB/phpbb/console/command/extension/show.php

@@ -12,12 +12,16 @@
 */
 namespace phpbb\console\command\extension;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 class show extends command
 {
+	/**
+	 * {@inheritdoc}
+	 */
 	protected function configure()
 	{
 		$this
@@ -26,6 +30,16 @@ class show extends command
 		;
 	}
 
+	/**
+	 * Executes the command extension:show.
+	 *
+	 * Lists all extensions in the database and on the filesystem
+	 *
+	 * @param InputInterface  $input  An InputInterface instance
+	 * @param OutputInterface $output An OutputInterface instance
+	 *
+	 * @return int
+	 */
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
 		$io = new SymfonyStyle($input, $output);
@@ -50,5 +64,7 @@ class show extends command
 		$purged = array_diff($all, $enabled, $disabled);
 		$io->section($this->user->lang('CLI_EXTENSIONS_AVAILABLE'));
 		$io->listing($purged);
+
+		return symfony_command::SUCCESS;
 	}
 }

phpBB/phpbb/console/command/extension/update.php

@@ -16,6 +16,7 @@ namespace phpbb\console\command\extension;
 use phpbb\composer\io\console_io;
 use phpbb\composer\manager_interface;
 use phpbb\language\language;
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -75,7 +76,7 @@ class update extends \phpbb\console\command\command
 		if (!$this->manager->check_requirements())
 		{
 			$io->error($this->language->lang('EXTENSIONS_COMPOSER_NOT_WRITABLE'));
-			return 1;
+			return symfony_command::FAILURE;
 		}
 
 		$composer_io = new console_io($input, $output, $this->getHelperSet(), $this->language);
@@ -85,6 +86,6 @@ class update extends \phpbb\console\command\command
 
 		$io->success($this->language->lang('EXTENSIONS_UPDATED'));
 
-		return 0;
+		return symfony_command::SUCCESS;
 	}
 }

phpBB/phpbb/console/command/fixup/fix_left_right_ids.php

@@ -13,6 +13,7 @@
 
 namespace phpbb\console\command\fixup;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
@@ -64,7 +65,7 @@ class fix_left_right_ids extends \phpbb\console\command\command
 	* @param InputInterface  $input  An InputInterface instance
 	* @param OutputInterface $output An OutputInterface instance
 	*
-	* @return void
+	* @return int
 	*/
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
@@ -87,6 +88,7 @@ class fix_left_right_ids extends \phpbb\console\command\command
 		$this->cache->purge();
 
 		$io->success($this->user->lang('CLI_FIXUP_FIX_LEFT_RIGHT_IDS_SUCCESS'));
+		return symfony_command::SUCCESS;
 	}
 
 	/**

phpBB/phpbb/console/command/fixup/update_hashes.php

@@ -12,6 +12,7 @@
 */
 namespace phpbb\console\command\fixup;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Helper\ProgressBar;
@@ -114,5 +115,6 @@ class update_hashes extends \phpbb\console\command\command
 		$progress_bar->finish();
 
 		$output->writeln('<info>' . $this->user->lang('CLI_FIXUP_UPDATE_HASH_BCRYPT_SUCCESS') . '</info>');
+		return symfony_command::SUCCESS;
 	}
 }

phpBB/phpbb/console/command/reparser/list_all.php

@@ -13,6 +13,7 @@
 
 namespace phpbb\console\command\reparser;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
@@ -67,6 +68,6 @@ class list_all extends \phpbb\console\command\command
 		$io->section($this->user->lang('CLI_DESCRIPTION_REPARSER_AVAILABLE'));
 		$io->listing($this->reparser_names);
 
-		return 0;
+		return symfony_command::SUCCESS;
 	}
 }

phpBB/phpbb/console/command/reparser/reparse.php

@@ -14,6 +14,7 @@
 namespace phpbb\console\command\reparser;
 
 use phpbb\exception\runtime_exception;
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
@@ -157,7 +158,7 @@ class reparse extends \phpbb\console\command\command
 
 		$this->reparse_lock->release();
 
-		return 0;
+		return symfony_command::SUCCESS;
 	}
 
 	/**

phpBB/phpbb/console/command/thumbnail/delete.php

@@ -12,6 +12,7 @@
 */
 namespace phpbb\console\command\thumbnail;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
@@ -90,7 +91,7 @@ class delete extends \phpbb\console\command\command
 		if ($nb_missing_thumbnails === 0)
 		{
 			$io->warning($this->user->lang('CLI_THUMBNAIL_NOTHING_TO_DELETE'));
-			return 0;
+			return symfony_command::SUCCESS;
 		}
 
 		$sql = 'SELECT attach_id, physical_filename, extension, real_filename, mimetype
@@ -105,7 +106,7 @@ class delete extends \phpbb\console\command\command
 		$progress->start();
 
 		$thumbnail_deleted = array();
-		$return = 0;
+		$return = symfony_command::SUCCESS;
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$thumbnail_path = $this->phpbb_root_path . $this->config['upload_path'] . '/thumb_' . $row['physical_filename'];
@@ -124,7 +125,7 @@ class delete extends \phpbb\console\command\command
 			}
 			else
 			{
-				$return = 1;
+				$return = symfony_command::FAILURE;
 				$progress->setMessage('<error>' . $this->user->lang('CLI_THUMBNAIL_SKIPPED', $row['real_filename'], $row['physical_filename']) . '</error>');
 			}
 

phpBB/phpbb/console/command/thumbnail/generate.php

@@ -13,6 +13,7 @@
 
 namespace phpbb\console\command\thumbnail;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
@@ -107,7 +108,7 @@ class generate extends \phpbb\console\command\command
 		if ($nb_missing_thumbnails === 0)
 		{
 			$io->warning($this->user->lang('CLI_THUMBNAIL_NOTHING_TO_GENERATE'));
-			return 0;
+			return symfony_command::SUCCESS;
 		}
 
 		$extensions = $this->cache->obtain_attach_extensions(true);
@@ -168,7 +169,7 @@ class generate extends \phpbb\console\command\command
 		$io->newLine(2);
 		$io->success($this->user->lang('CLI_THUMBNAIL_GENERATING_DONE'));
 
-		return 0;
+		return symfony_command::SUCCESS;
 	}
 
 	/**

phpBB/phpbb/console/command/thumbnail/recreate.php

@@ -12,6 +12,7 @@
 */
 namespace phpbb\console\command\thumbnail;
 
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -57,7 +58,7 @@ class recreate extends \phpbb\console\command\command
 		$input_delete = new ArrayInput($parameters);
 		$return = $this->getApplication()->run($input_delete, $output);
 
-		if ($return === 0)
+		if ($return === symfony_command::SUCCESS)
 		{
 			$parameters['command'] = 'thumbnail:generate';
 

phpBB/phpbb/console/command/update/check.php

@@ -17,6 +17,7 @@ use phpbb\config\config;
 use phpbb\exception\exception_interface;
 use phpbb\language\language;
 use phpbb\user;
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
@@ -155,7 +156,7 @@ class check extends \phpbb\console\command\command
 					$this->display_versions($io, $updates_available);
 				}
 
-				return 1;
+				return symfony_command::FAILURE;
 			}
 			else
 			{
@@ -164,14 +165,14 @@ class check extends \phpbb\console\command\command
 					$io->success($this->language->lang('UPDATE_NOT_NEEDED'));
 				}
 
-				return 0;
+				return symfony_command::SUCCESS;
 			}
 		}
 		catch (\RuntimeException $e)
 		{
 			$io->error($this->language->lang('EXTENSION_NOT_INSTALLED', $ext_name));
 
-			return 1;
+			return symfony_command::FAILURE;
 		}
 	}
 
@@ -207,7 +208,7 @@ class check extends \phpbb\console\command\command
 				$this->display_versions($io, $updates_available);
 			}
 
-			return 1;
+			return symfony_command::FAILURE;
 		}
 		else
 		{
@@ -216,7 +217,7 @@ class check extends \phpbb\console\command\command
 				$io->success($this->language->lang('UPDATE_NOT_NEEDED'));
 			}
 
-			return 0;
+			return symfony_command::SUCCESS;
 		}
 	}
 
@@ -292,7 +293,7 @@ class check extends \phpbb\console\command\command
 			$this->language->lang('LATEST_VERSION'),
 		], $rows);
 
-		return 0;
+		return symfony_command::SUCCESS;
 	}
 
 	/**

phpBB/phpbb/console/command/user/activate.php

@@ -20,6 +20,7 @@ use phpbb\log\log_interface;
 use phpbb\notification\manager;
 use phpbb\user;
 use phpbb\user_loader;
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -137,19 +138,19 @@ class activate extends command
 		if ($user_row['user_id'] == ANONYMOUS)
 		{
 			$io->error($this->language->lang('NO_USER'));
-			return 1;
+			return symfony_command::FAILURE;
 		}
 
 		// Check if the user is already active (or inactive)
 		if ($mode == 'activate' && $user_row['user_type'] != USER_INACTIVE)
 		{
 			$io->error($this->language->lang('CLI_DESCRIPTION_USER_ACTIVATE_ACTIVE'));
-			return 1;
+			return symfony_command::FAILURE;
 		}
 		else if ($mode == 'deactivate' && $user_row['user_type'] == USER_INACTIVE)
 		{
 			$io->error($this->language->lang('CLI_DESCRIPTION_USER_ACTIVATE_INACTIVE'));
-			return 1;
+			return symfony_command::FAILURE;
 		}
 
 		// Activate the user account
@@ -177,7 +178,7 @@ class activate extends command
 
 		$io->success($this->language->lang($msg));
 
-		return 0;
+		return symfony_command::SUCCESS;
 	}
 
 	/**

phpBB/phpbb/console/command/user/add.php

@@ -20,6 +20,7 @@ use phpbb\exception\runtime_exception;
 use phpbb\language\language;
 use phpbb\passwords\manager;
 use phpbb\user;
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -142,7 +143,7 @@ class add extends command
 		catch (runtime_exception $e)
 		{
 			$io->error($e->getMessage());
-			return 1;
+			return symfony_command::FAILURE;
 		}
 
 		$user_row = array(
@@ -161,7 +162,7 @@ class add extends command
 		if (!$user_id)
 		{
 			$io->error($this->language->lang('AUTH_NO_PROFILE_CREATED'));
-			return 1;
+			return symfony_command::FAILURE;
 		}
 
 		if ($input->getOption('send-email') && $this->config['email_enable'])
@@ -171,7 +172,7 @@ class add extends command
 
 		$io->success($this->language->lang('CLI_USER_ADD_SUCCESS', $this->data['username']));
 
-		return 0;
+		return symfony_command::SUCCESS;
 	}
 
 	/**

phpBB/phpbb/console/command/user/delete.php

@@ -18,6 +18,7 @@ use phpbb\language\language;
 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\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -122,7 +123,7 @@ class delete extends command
 			if ($user_row['user_id'] == ANONYMOUS)
 			{
 				$io->error($this->language->lang('NO_USER'));
-				return 1;
+				return symfony_command::FAILURE;
 			}
 
 			if (!function_exists('user_delete'))
@@ -137,7 +138,7 @@ class delete extends command
 			$io->success($this->language->lang('USER_DELETED'));
 		}
 
-		return 0;
+		return symfony_command::SUCCESS;
 	}
 
 	/**

phpBB/phpbb/console/command/user/reclean.php

@@ -17,6 +17,7 @@ use phpbb\console\command\command;
 use phpbb\db\driver\driver_interface;
 use phpbb\language\language;
 use phpbb\user;
+use Symfony\Component\Console\Command\Command as symfony_command;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -98,7 +99,7 @@ class reclean extends command
 		$io->newLine(2);
 		$io->success($this->language->lang('CLI_USER_RECLEAN_DONE', $this->processed));
 
-		return 0;
+		return symfony_command::SUCCESS;
 	}
 
 	/**

phpBB/phpbb/cron/event/cron_runner_listener.php

@@ -18,7 +18,7 @@ use phpbb\lock\db;
 use phpbb\request\request_interface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Event\PostResponseEvent;
+use Symfony\Component\HttpKernel\Event\TerminateEvent;
 
 /**
  * Event listener that executes cron tasks, after the response was served
@@ -57,9 +57,9 @@ class cron_runner_listener implements EventSubscriberInterface
 	/**
 	 * Runs the cron job after the response was sent
 	 *
-	 * @param PostResponseEvent	$event	The event
+	 * @param TerminateEvent	$event	The event
 	 */
-	public function on_kernel_terminate(PostResponseEvent $event)
+	public function on_kernel_terminate(TerminateEvent $event)
 	{
 		$request = $event->getRequest();
 		$controller_name = $request->get('_route');

phpBB/phpbb/di/extension/container_configuration.php

@@ -26,8 +26,8 @@ class container_configuration implements ConfigurationInterface
 	 */
 	public function getConfigTreeBuilder()
 	{
-		$treeBuilder = new TreeBuilder();
-		$rootNode = $treeBuilder->root('core');
+		$treeBuilder = new TreeBuilder('core');
+		$rootNode = $treeBuilder->getRootNode();
 		$rootNode
 			->children()
 				->booleanNode('require_dev_dependencies')->defaultValue(false)->end()

phpBB/phpbb/event/data.php

@@ -13,7 +13,7 @@
 
 namespace phpbb\event;
 
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 class data extends Event implements \ArrayAccess
 {

phpBB/phpbb/event/dispatcher.php

@@ -14,7 +14,6 @@
 namespace phpbb\event;
 
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Symfony\Component\EventDispatcher\Event;
 
 /**
 * Extension of the Symfony EventDispatcher
@@ -43,26 +42,24 @@ class dispatcher extends EventDispatcher implements dispatcher_interface
 	public function trigger_event($eventName, $data = [])
 	{
 		$event = new \phpbb\event\data($data);
-		$this->dispatch($eventName, $event);
+		foreach ((array) $eventName as $name)
+		{
+			$this->dispatch($event, $name);
+		}
 		return $event->get_data_filtered(array_keys($data));
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function dispatch($eventName, Event $event = null)
+	public function dispatch(object $event, string $eventName = null) : object
 	{
 		if ($this->disabled)
 		{
 			return $event;
 		}
 
-		foreach ((array) $eventName as $name)
-		{
-			$event = parent::dispatch($name, $event);
-		}
-
-		return $event;
+		return parent::dispatch($event, $eventName);
 	}
 
 	/**

phpBB/phpbb/event/kernel_exception_subscriber.php

@@ -18,7 +18,7 @@ use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpFoundation\Response;
 
 class kernel_exception_subscriber implements EventSubscriberInterface
@@ -65,12 +65,12 @@ class kernel_exception_subscriber implements EventSubscriberInterface
 	/**
 	* This listener is run when the KernelEvents::EXCEPTION event is triggered
 	*
-	* @param GetResponseForExceptionEvent $event
+	* @param ExceptionEvent $event
 	* @return null
 	*/
-	public function on_kernel_exception(GetResponseForExceptionEvent $event)
+	public function on_kernel_exception(ExceptionEvent $event)
 	{
-		$exception = $event->getException();
+		$exception = $event->getThrowable();
 
 		$message = $exception->getMessage();
 		$this->type_caster->set_var($message, $message, 'string', true, false);

phpBB/phpbb/event/kernel_terminate_subscriber.php

@@ -15,7 +15,7 @@ namespace phpbb\event;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Event\PostResponseEvent;
+use Symfony\Component\HttpKernel\Event\TerminateEvent;
 
 class kernel_terminate_subscriber implements EventSubscriberInterface
 {
@@ -24,10 +24,10 @@ class kernel_terminate_subscriber implements EventSubscriberInterface
 	* This comes after a Response has been sent to the server; this is
 	* primarily cleanup stuff.
 	*
-	* @param PostResponseEvent $event
+	* @param TerminateEvent $event
 	* @return void
 	*/
-	public function on_kernel_terminate(PostResponseEvent $event)
+	public function on_kernel_terminate(TerminateEvent $event)
 	{
 		garbage_collection();
 

phpBB/phpbb/event/php_exporter.php

@@ -203,16 +203,20 @@ class php_exporter
 			{
 				$event_line = false;
 				$found_trigger_event = strpos($this->file_lines[$i], 'dispatcher->trigger_event(');
+				$found_use_vars = strpos($this->file_lines[$i], ', compact($vars)');
 				$arguments = array();
 				if ($found_trigger_event !== false)
 				{
 					$event_line = $i;
 					$this->set_current_event($this->get_event_name($event_line, false), $event_line);
 
-					// Find variables of the event
-					$arguments = $this->get_vars_from_array();
-					$doc_vars = $this->get_vars_from_docblock();
-					$this->validate_vars_docblock_array($arguments, $doc_vars);
+					if ($found_use_vars)
+					{
+						// Find variables of the event
+						$arguments = $this->get_vars_from_array();
+						$doc_vars = $this->get_vars_from_docblock();
+						$this->validate_vars_docblock_array($arguments, $doc_vars);
+					}
 				}
 				else
 				{
@@ -346,10 +350,10 @@ class php_exporter
 		}
 		else
 		{
-			$regex = '#extract\(\$[a-z](?:[a-z0-9_]|->)*';
+			$regex = '#(?:extract\()?\$[a-z](?:[a-z0-9_]|->)*';
 			$regex .= '->trigger_event\((\[)?';
 			$regex .= '\'' . $this->preg_match_event_name() . '(?(1)\', \'(?2))+\'';
-			$regex .= '(?(1)\]), compact\(\$vars\)\)\);#';
+			$regex .= '(?(1)\])(?:, compact\(\$vars\)\))?\);#';
 		}
 
 		$match = array();

phpBB/phpbb/filesystem/helper.php

@@ -212,6 +212,18 @@ class helper
 	 */
 	public static function make_path_relative($end_path, $start_path)
 	{
+		// Ensure paths are absolute as passing relative paths to the
+		// Symsony's Filesystem::makePathRelative() method is removed since Symfony 4.0
+		if (!self::is_absolute_path($end_path))
+		{
+			$end_path = self::phpbb_own_realpath($end_path);
+		}
+
+		if (!self::is_absolute_path($start_path))
+		{
+			$start_path = self::phpbb_own_realpath($start_path);
+		}
+
 		return self::get_symfony_filesystem()->makePathRelative($end_path, $start_path);
 	}
 

phpBB/phpbb/install/helper/container_factory.php

@@ -161,7 +161,7 @@ class container_factory
 
 		// Setting request is required for the compatibility globals as those are generated from
 		// this container
-		if (!$this->container->isFrozen())
+		if (!$this->container->isCompiled())
 		{
 			$this->container->register('request')->setSynthetic(true);
 			$this->container->register('language')->setSynthetic(true);

phpBB/phpbb/mimetype/guesser.php

@@ -49,6 +49,7 @@ class guesser
 		{
 			$is_supported = (method_exists($guesser, 'is_supported')) ? 'is_supported' : '';
 			$is_supported = (method_exists($guesser, 'isSupported')) ? 'isSupported' : $is_supported;
+			$is_supported = (method_exists($guesser, 'isGuesserSupported')) ? 'isGuesserSupported' : $is_supported;
 
 			if (empty($is_supported))
 			{
@@ -117,9 +118,13 @@ class guesser
 
 		$mimetype = 'application/octet-stream';
 
+		$args = (array) func_get_args();
 		foreach ($this->guessers as $guesser)
 		{
-			$mimetype_guess = $guesser->guess($file, $file_name);
+			$guess = (method_exists($guesser, 'guess')) ? 'guess' : '';
+			$guess = (method_exists($guesser, 'guessMimeType')) ? 'guessMimeType' : $guess;
+
+			$mimetype_guess = $guesser->$guess(...$args);
 
 			$mimetype = $this->choose_mime_type($mimetype, $mimetype_guess);
 		}

phpBB/phpbb/routing/router.php

@@ -20,9 +20,11 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\Filesystem\Exception\IOException;
-use Symfony\Component\Routing\Generator\Dumper\PhpGeneratorDumper;
+use Symfony\Component\Routing\Generator\Dumper\CompiledUrlGeneratorDumper;
+use Symfony\Component\Routing\Generator\CompiledUrlGenerator;
 use Symfony\Component\Routing\Generator\UrlGenerator;
-use Symfony\Component\Routing\Matcher\Dumper\PhpMatcherDumper;
+use Symfony\Component\Routing\Matcher\Dumper\CompiledUrlMatcherDumper;
+use Symfony\Component\Routing\Matcher\CompiledUrlMatcher;
 use Symfony\Component\Routing\Matcher\UrlMatcher;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RouteCollection;
@@ -217,19 +219,12 @@ class router implements RouterInterface
 			$cache = new ConfigCache("{$this->cache_dir}url_matcher.{$this->php_ext}", $this->debug_url_matcher);
 			if (!$cache->isFresh())
 			{
-				$dumper = new PhpMatcherDumper($this->get_routes());
-
-				$options = array(
-					'class'      => 'phpbb_url_matcher',
-					'base_class' => 'Symfony\\Component\\Routing\\Matcher\\UrlMatcher',
-				);
-
-				$cache->write($dumper->dump($options), $this->get_routes()->getResources());
+				$dumper = new CompiledUrlMatcherDumper($this->get_routes());
+				$cache->write($dumper->dump(), $this->get_routes()->getResources());
 			}
 
-			require_once($cache->getPath());
-
-			$this->matcher = new \phpbb_url_matcher($this->context);
+			$compiled_routes = require_once($cache->getPath());
+			$this->matcher = new CompiledUrlMatcher($compiled_routes, $this->context);
 		}
 		catch (IOException $e)
 		{
@@ -272,19 +267,12 @@ class router implements RouterInterface
 			$cache = new ConfigCache("{$this->cache_dir}url_generator.{$this->php_ext}", $this->debug_url_generator);
 			if (!$cache->isFresh())
 			{
-				$dumper = new PhpGeneratorDumper($this->get_routes());
-
-				$options = array(
-					'class'      => 'phpbb_url_generator',
-					'base_class' => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
-				);
-
-				$cache->write($dumper->dump($options), $this->get_routes()->getResources());
+				$dumper = new CompiledUrlGeneratorDumper($this->get_routes());
+				$cache->write($dumper->dump(), $this->get_routes()->getResources());
 			}
 
-			require_once($cache->getPath());
-
-			$this->generator = new \phpbb_url_generator($this->context);
+			$compiled_routes = require_once($cache->getPath());
+			$this->generator = new CompiledUrlGenerator($compiled_routes, $this->context);
 		}
 		catch (IOException $e)
 		{

phpBB/phpbb/session.php

@@ -1054,7 +1054,7 @@ class session
 		* @event core.session_gc_after
 		* @since 3.1.6-RC1
 		*/
-		$phpbb_dispatcher->dispatch('core.session_gc_after');
+		$phpbb_dispatcher->trigger_event('core.session_gc_after');
 
 		return;
 	}

phpBB/phpbb/template/twig/extension/avatar.php

@@ -13,7 +13,9 @@
 
 namespace phpbb\template\twig\extension;
 
-class avatar extends \Twig_Extension
+use Twig\Extension\AbstractExtension;
+
+class avatar extends AbstractExtension
 {
 	/**
 	 * Get the name of this extension

phpBB/phpbb/template/twig/extension/config.php

@@ -13,7 +13,9 @@
 
 namespace phpbb\template\twig\extension;
 
-class config extends \Twig_Extension
+use Twig\Extension\AbstractExtension;
+
+class config extends AbstractExtension
 {
 	/** @var \phpbb\config\config */
 	protected $config;

phpBB/phpbb/template/twig/extension/icon.php

@@ -14,8 +14,9 @@
 namespace phpbb\template\twig\extension;
 
 use phpbb\template\twig\environment;
+use Twig\Extension\AbstractExtension;
 
-class icon extends \Twig\Extension\AbstractExtension
+class icon extends AbstractExtension
 {
 	/** @var \phpbb\user */
 	protected $user;

phpBB/phpbb/template/twig/extension/routing.php

@@ -13,10 +13,14 @@
 
 namespace phpbb\template\twig\extension;
 
-use Symfony\Bridge\Twig\Extension\RoutingExtension;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Twig\Extension\AbstractExtension;
+use Twig\Node\Expression\ArrayExpression;
+use Twig\Node\Expression\ConstantExpression;
+use Twig\Node\Node;
+use Twig\TwigFunction;
 
-class routing extends RoutingExtension
+class routing extends AbstractExtension
 {
 	/** @var \phpbb\controller\helper */
 	protected $helper;
@@ -31,6 +35,17 @@ class routing extends RoutingExtension
 		$this->helper = $helper;
 	}
 
+	/**
+	* {@inheritdoc}
+	*/
+	public function getFunctions(): array
+	{
+		return [
+			new TwigFunction('url', [$this, 'getUrl'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']]),
+			new TwigFunction('path', [$this, 'getPath'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']]),
+		];
+	}
+
 	public function getPath($name, $parameters = array(), $relative = false)
 	{
 		return $this->helper->route($name, $parameters, true, false, $relative ? UrlGeneratorInterface::RELATIVE_PATH : UrlGeneratorInterface::ABSOLUTE_PATH);
@@ -40,4 +55,47 @@ class routing extends RoutingExtension
 	{
 		return $this->helper->route($name, $parameters, true, false, $schemeRelative ? UrlGeneratorInterface::NETWORK_PATH : UrlGeneratorInterface::ABSOLUTE_URL);
 	}
+
+	/**
+	 * Borrowed from the Symfony Twig bridge routing extension
+	 *
+	 * @author Fabien Potencier <fabien@symfony.com>
+	 *
+	 * Determines at compile time whether the generated URL will be safe and thus
+	 * saving the unneeded automatic escaping for performance reasons.
+	 *
+	 * The URL generation process percent encodes non-alphanumeric characters. So there is no risk
+	 * that malicious/invalid characters are part of the URL. The only character within an URL that
+	 * must be escaped in html is the ampersand ("&") which separates query params. So we cannot mark
+	 * the URL generation as always safe, but only when we are sure there won't be multiple query
+	 * params. This is the case when there are none or only one constant parameter given.
+	 * E.g. we know beforehand this will be safe:
+	 * - path('route')
+	 * - path('route', {'param': 'value'})
+	 * But the following may not:
+	 * - path('route', var)
+	 * - path('route', {'param': ['val1', 'val2'] }) // a sub-array
+	 * - path('route', {'param1': 'value1', 'param2': 'value2'})
+	 * If param1 and param2 reference placeholder in the route, it would still be safe. But we don't know.
+	 *
+	 * @param Node $argsNode The arguments of the path/url function
+	 *
+	 * @return array An array with the contexts the URL is safe
+	 */
+	public function isUrlGenerationSafe(Node $argsNode): array
+	{
+		// support named arguments
+		$paramsNode = $argsNode->hasNode('parameters') ? $argsNode->getNode('parameters') : (
+			$argsNode->hasNode(1) ? $argsNode->getNode(1) : null
+		);
+
+		if (null === $paramsNode || $paramsNode instanceof ArrayExpression && \count($paramsNode) <= 2 &&
+			(!$paramsNode->hasNode(1) || $paramsNode->getNode(1) instanceof ConstantExpression)
+		)
+		{
+			return ['html'];
+		}
+
+		return [];
+	}
 }

phpBB/phpbb/template/twig/extension/username.php

@@ -13,7 +13,9 @@
 
 namespace phpbb\template\twig\extension;
 
-class username extends \Twig_Extension
+use Twig\Extension\AbstractExtension;
+
+class username extends AbstractExtension
 {
 	/**
 	 * Get the name of this extension

phpBB/phpbb/user.php

@@ -342,7 +342,7 @@ class user extends \phpbb\session
 		* @event core.user_setup_after
 		* @since 3.1.6-RC1
 		*/
-		$phpbb_dispatcher->dispatch('core.user_setup_after');
+		$phpbb_dispatcher->trigger_event('core.user_setup_after');
 
 		// If this function got called from the error handler we are finished here.
 		if (defined('IN_ERROR_HANDLER'))