mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Máté Bartus
2021-01-03 00:11:11 +01:00
parent dc5a4c4752 6e56b79e8a
commit 864321ecf6
46 changed files with 206 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/controller/helper.php
View File

@@ -14,7 +14,7 @@
namespace phpbb\controller;
use phpbb\auth\auth;
use \phpbb\cache\driver\driver_interface as cache_interface;
use phpbb\cache\driver\driver_interface as cache_interface;
use phpbb\config\config;
use phpbb\cron\manager;
use phpbb\db\driver\driver_interface;

4
phpBB/phpbb/controller/resolver.php
View File

@@ -64,7 +64,7 @@ class resolver implements ControllerResolverInterface
/**
* Load a controller callable
*
* @param \Symfony\Component\HttpFoundation\Request $request Symfony Request object
* @param Request $request Symfony Request object
* @return bool|Callable Callable or false
* @throws \phpbb\controller\exception
*/
@@ -119,7 +119,7 @@ class resolver implements ControllerResolverInterface
* and should match the parameters of the method you are using as your
* controller.
*
* @param \Symfony\Component\HttpFoundation\Request $request Symfony Request object
* @param Request $request Symfony Request object
* @param mixed $controller A callable (controller class, method)
* @return array An array of arguments to pass to the controller
* @throws \phpbb\controller\exception