diff --git a/src/Action/ExceptionHandler.php b/src/Action/ExceptionHandler.php index 50a6257..2419626 100644 --- a/src/Action/ExceptionHandler.php +++ b/src/Action/ExceptionHandler.php @@ -15,12 +15,12 @@ class ExceptionHandler * Return the ActionForward instance (if any) returned by * the called ExceptionHandler. * - * @param ex \Exception The exception to handle - * @param ae \Phruts\Config\ExceptionConfig The ExceptionConfig corresponding to the exception - * @param mapping \Phruts\Action\ActionMapping The ActionMapping we are processing - * @param formInstance The \Phruts\Action\AbstractActionForm we are processing - * @param request The actionKernel request we are processing - * @param response The actionKernel response we are creating + * @param \Exception ex The exception to handle + * @param \Phruts\Config\ExceptionConfig ae The ExceptionConfig corresponding to the exception + * @param \Phruts\Action\ActionMapping mapping The ActionMapping we are processing + * @param \Phruts\Action\AbstractActionForm formInstance The \Phruts\Action\AbstractActionForm we are processing + * @param \Symfony\Component\HttpFoundation\Request request The actionKernel request we are processing + * @param \Symfony\Component\HttpFoundation\Response response The actionKernel response we are creating * @return \Phruts\Config\ForwardConfig * @exception ActionKernelException if a actionKernel exception occurs * @@ -29,7 +29,7 @@ class ExceptionHandler public function execute(\Exception $ex, \Phruts\Config\ExceptionConfig $ae, \Phruts\Action\ActionMapping $mapping, - $formInstance, + \Phruts\Action\AbstractActionForm $formInstance = null, \Symfony\Component\HttpFoundation\Request $request, \Symfony\Component\HttpFoundation\Response $response) { diff --git a/src/Util/ClassLoader.php b/src/Util/ClassLoader.php index 2da630d..5351926 100644 --- a/src/Util/ClassLoader.php +++ b/src/Util/ClassLoader.php @@ -97,12 +97,7 @@ public static function loadClass($name) */ public static function newInstance($name, $parent = null) { - try { - // Load the class and get only the class name - $className = self::loadClass($name); - } catch (\Exception $e) { - throw $e; - } + self::loadClass($name); // Get reflection information of the class $class = new \ReflectionClass($name); diff --git a/src/Util/Properties.php b/src/Util/Properties.php index d460195..872169d 100644 --- a/src/Util/Properties.php +++ b/src/Util/Properties.php @@ -22,7 +22,7 @@ public function setProperty($key, $value) $key = (string) $key; $value = (string) $value; - $properties[$key] = $value; + $this->properties[$key] = $value; } /** diff --git a/src/Util/RequestUtils.php b/src/Util/RequestUtils.php index c9bcfb9..30d1fee 100644 --- a/src/Util/RequestUtils.php +++ b/src/Util/RequestUtils.php @@ -145,6 +145,7 @@ public static function createActionForm(\Symfony\Component\HttpFoundation\Reques $instance->setActionKernel($kernel); } catch (\Exception $e) { $msg = $kernel->getInternal()->getMessage(null, 'formBean', $config->getType()); + throw new \Phruts\Exception($msg); } return $instance;