makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 13:58:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/controller] phpbb_controller_exception instead of RuntimeException

Browse source 
PHPBB3-10864
This commit is contained in:
David King 2012-11-15 16:14:11 -05:00
parent d0269629dc
commit 14f44c17ad
2 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
phpBB/includes/controller/exception.php Normal file
View file

@ -0,0 +1,24 @@
<?php
/**
*
* @package controller
* @copyright (c) 2012 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
/**
* Controller exception class
* @package phpBB3
*/
class phpbb_controller_provider extends RuntimeException
{
}

11
phpBB/includes/controller/resolver.php
View file

@ -54,7 +54,7 @@ class phpbb_controller_resolver implements ControllerResolverInterface
* *
* @param Symfony\Component\HttpFoundation\Request $request Symfony Request object * @param Symfony\Component\HttpFoundation\Request $request Symfony Request object
* @return bool|Callable Callable or false * @return bool|Callable Callable or false
* @throws RuntimeException * @throws phpbb_controller_exception
*/ */
public function getController(Request $request) public function getController(Request $request)
{ {
@ -62,20 +62,20 @@ class phpbb_controller_resolver implements ControllerResolverInterface
if (!$controller) if (!$controller)
{ {
throw new RuntimeException($this->user->lang['CONTROLLER_NOT_SPECIFIED']); throw new phpbb_controller_exception($this->user->lang['CONTROLLER_NOT_SPECIFIED']);
} }
// Require a method name along with the service name // Require a method name along with the service name
if (stripos($controller, ':') === false) if (stripos($controller, ':') === false)
{ {
throw new RuntimeException($this->user->lang['CONTROLLER_METHOD_NOT_SPECIFIED']); throw new phpbb_controller_exception($this->user->lang['CONTROLLER_METHOD_NOT_SPECIFIED']);
} }
list($service, $method) = explode(':', $controller); list($service, $method) = explode(':', $controller);
if (!$this->container->has($service)) if (!$this->container->has($service))
{ {
throw new RuntimeException($this->user->lang('CONTROLLER_SERVICE_UNDEFINED', $service)); throw new phpbb_controller_exception($this->user->lang('CONTROLLER_SERVICE_UNDEFINED', $service));
} }
$controller_object = $this->container->get($service); $controller_object = $this->container->get($service);
@ -92,6 +92,7 @@ class phpbb_controller_resolver implements ControllerResolverInterface
* @param Symfony\Component\HttpFoundation\Request $request Symfony Request object * @param Symfony\Component\HttpFoundation\Request $request Symfony Request object
* @param string $controller Controller class name * @param string $controller Controller class name
* @return bool False * @return bool False
* @throws phpbb_controller_exception
*/ */
public function getArguments(Request $request, $controller) public function getArguments(Request $request, $controller)
{ {
@ -114,7 +115,7 @@ class phpbb_controller_resolver implements ControllerResolverInterface
} }
else else
{ {
throw new RuntimeException($user->lang('CONTROLLER_ARGUMENT_VALUE_MISSING', $param->getPosition() + 1, get_class($object) . ':' . $method, $param->name)); throw new phpbb_controller_exception($user->lang('CONTROLLER_ARGUMENT_VALUE_MISSING', $param->getPosition() + 1, get_class($object) . ':' . $method, $param->name));
} }
} }