aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/controller
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2012-11-15 16:14:11 -0500
committerDavid King <imkingdavid@gmail.com>2012-11-16 17:05:49 -0500
commit14f44c17ad76878ed540cd5dd56a3a62b30dbd15 (patch)
tree936f3d86d7008aab742969a1057e97678e138d40 /phpBB/includes/controller
parentd0269629dcee2dda176807bdd944415d1713db7b (diff)
downloadforums-14f44c17ad76878ed540cd5dd56a3a62b30dbd15.tar
forums-14f44c17ad76878ed540cd5dd56a3a62b30dbd15.tar.gz
forums-14f44c17ad76878ed540cd5dd56a3a62b30dbd15.tar.bz2
forums-14f44c17ad76878ed540cd5dd56a3a62b30dbd15.tar.xz
forums-14f44c17ad76878ed540cd5dd56a3a62b30dbd15.zip
[feature/controller] phpbb_controller_exception instead of RuntimeException
PHPBB3-10864
Diffstat (limited to 'phpBB/includes/controller')
-rw-r--r--phpBB/includes/controller/exception.php24
-rw-r--r--phpBB/includes/controller/resolver.php11
2 files changed, 30 insertions, 5 deletions
diff --git a/phpBB/includes/controller/exception.php b/phpBB/includes/controller/exception.php
new file mode 100644
index 0000000000..da2fefc600
--- /dev/null
+++ b/phpBB/includes/controller/exception.php
@@ -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
+{
+}
diff --git a/phpBB/includes/controller/resolver.php b/phpBB/includes/controller/resolver.php
index bf9ce3330d..0e724ec608 100644
--- a/phpBB/includes/controller/resolver.php
+++ b/phpBB/includes/controller/resolver.php
@@ -54,7 +54,7 @@ class phpbb_controller_resolver implements ControllerResolverInterface
*
* @param Symfony\Component\HttpFoundation\Request $request Symfony Request object
* @return bool|Callable Callable or false
- * @throws RuntimeException
+ * @throws phpbb_controller_exception
*/
public function getController(Request $request)
{
@@ -62,20 +62,20 @@ class phpbb_controller_resolver implements ControllerResolverInterface
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
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);
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);
@@ -92,6 +92,7 @@ class phpbb_controller_resolver implements ControllerResolverInterface
* @param Symfony\Component\HttpFoundation\Request $request Symfony Request object
* @param string $controller Controller class name
* @return bool False
+ * @throws phpbb_controller_exception
*/
public function getArguments(Request $request, $controller)
{
@@ -114,7 +115,7 @@ class phpbb_controller_resolver implements ControllerResolverInterface
}
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));
}
}