From 12f5b7dbd3976a51352ba95e32f7c8cd77dae16d Mon Sep 17 00:00:00 2001 From: Dmitriy Simushev Date: Wed, 15 Jan 2014 09:45:34 +0000 Subject: [PATCH] Fix name of the \Mibew\RequestProcessor\ProcessorException class --- .../Exception/InviteProcessorException.php | 2 +- .../RequestProcessor/Exception/ProcessorException.php | 4 ++-- .../Exception/ThreadProcessorException.php | 2 +- .../Exception/UsersProcessorException.php | 2 +- .../libs/classes/Mibew/RequestProcessor/Processor.php | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/mibew/libs/classes/Mibew/RequestProcessor/Exception/InviteProcessorException.php b/src/mibew/libs/classes/Mibew/RequestProcessor/Exception/InviteProcessorException.php index 92d8466c..2b89a873 100644 --- a/src/mibew/libs/classes/Mibew/RequestProcessor/Exception/InviteProcessorException.php +++ b/src/mibew/libs/classes/Mibew/RequestProcessor/Exception/InviteProcessorException.php @@ -20,7 +20,7 @@ namespace Mibew\RequestProcessor\Exception; /** * Class for {@link \Mibew\RequestProcessor\InviteRequestProcessor} exceptions */ -class InviteProcessorException extends RequestProcessorException { +class InviteProcessorException extends ProcessorException { /** * Operator is not logged in */ diff --git a/src/mibew/libs/classes/Mibew/RequestProcessor/Exception/ProcessorException.php b/src/mibew/libs/classes/Mibew/RequestProcessor/Exception/ProcessorException.php index 0b858ffd..d1404190 100644 --- a/src/mibew/libs/classes/Mibew/RequestProcessor/Exception/ProcessorException.php +++ b/src/mibew/libs/classes/Mibew/RequestProcessor/Exception/ProcessorException.php @@ -18,9 +18,9 @@ namespace Mibew\RequestProcessor\Exception; /** - * Class for {@link \Mibew\RequestProcessor\RequestProcessor} exceptions. + * Class for {@link \Mibew\RequestProcessor\Processor} exceptions. */ -class RequestProcessorException extends \Exception { +class ProcessorException extends \Exception { /** * Wrong function arguments */ diff --git a/src/mibew/libs/classes/Mibew/RequestProcessor/Exception/ThreadProcessorException.php b/src/mibew/libs/classes/Mibew/RequestProcessor/Exception/ThreadProcessorException.php index 09eac893..c1d5bdf7 100644 --- a/src/mibew/libs/classes/Mibew/RequestProcessor/Exception/ThreadProcessorException.php +++ b/src/mibew/libs/classes/Mibew/RequestProcessor/Exception/ThreadProcessorException.php @@ -20,7 +20,7 @@ namespace Mibew\RequestProcessor\Exception; /** * Class for {@link \Mibew\RequestProcessor\ThreadProcessor} exceptions. */ -class ThreadProcessorException extends RequestProcessorException { +class ThreadProcessorException extends ProcessorException { /** * 'recipient' argument is not set */ diff --git a/src/mibew/libs/classes/Mibew/RequestProcessor/Exception/UsersProcessorException.php b/src/mibew/libs/classes/Mibew/RequestProcessor/Exception/UsersProcessorException.php index 1b53e7b2..a76a2357 100644 --- a/src/mibew/libs/classes/Mibew/RequestProcessor/Exception/UsersProcessorException.php +++ b/src/mibew/libs/classes/Mibew/RequestProcessor/Exception/UsersProcessorException.php @@ -20,7 +20,7 @@ namespace Mibew\RequestProcessor\Exception; /** * Class for {@link \Mibew\RequestProcessor\UsersProcessor} exceptions */ -class UsersProcessorException extends RequestProcessorException { +class UsersProcessorException extends ProcessorException { /** * Operator is not logged in */ diff --git a/src/mibew/libs/classes/Mibew/RequestProcessor/Processor.php b/src/mibew/libs/classes/Mibew/RequestProcessor/Processor.php index 00c66a40..41a704f8 100644 --- a/src/mibew/libs/classes/Mibew/RequestProcessor/Processor.php +++ b/src/mibew/libs/classes/Mibew/RequestProcessor/Processor.php @@ -20,7 +20,7 @@ namespace Mibew\RequestProcessor; // Import namespaces and classes of the core use Mibew\Database; use Mibew\EventDispatcher; -use Mibew\RequestProcessor\Exception\RequestProcessorException; +use Mibew\RequestProcessor\Exception\ProcessorException; /** * Implements abstract class for request processing @@ -268,9 +268,9 @@ abstract class Processor { try { // Check functions to call if (! is_array($functions)) { - throw new RequestProcessorException( + throw new ProcessorException( '#1 argument must be an array!', - RequestProcessorException::WRONG_ARGUMENTS + ProcessorException::WRONG_ARGUMENTS ); } foreach ($functions as $function) { @@ -465,7 +465,7 @@ abstract class Processor { if (is_callable(array($this, $method_name))) { try { $func['results'] = $this->$method_name($func['arguments']); - } catch(RequestProcessorException $e) { + } catch(ProcessorException $e) { $func['results'] = array( 'errorCode' => $e->getCode(), 'errorMessage' => $e->getMessage()