mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-11 03:04:09 +02:00
Merge branch '3.3.x'
This commit is contained in:
@@ -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;
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user