Defines template message for several exceptions

source/CallableException.php

@@ -2,27 +2,23 @@
 namespace Exceptions;
 
 /**
- * Rais if the expression is not callable.
+ * Raise if the expression is not callable.
  * (Usually when using function is_callable)
  */
 class CallableException extends LoggableException
 {
+    protected $template     = 'Expression {expression} is not callable';
+
     /**
      * Expression is not callable!
      *
      * @param       mixed        $expression     Expression
      */
     public function __construct($expression)
     {
-        if(is_object($expression) || is_resource($expression))
-        {
-            $expression = self::to_string($expression);
-        }
-
         parent::__construct
         ([
-            'message'       => 'Expression is not callable',
-            'expression'    => $expression
+            'expression'    => $this->to_string($expression)
         ]);
     }
 }

source/InterfaceNotImplemented.php

@@ -16,11 +16,6 @@ class InterfaceNotImplemented   extends LoggableException
      */
     public function __construct($class, $interface)
     {
-        if(is_object($class))
-        {
-            $class = get_class($class);
-        }
-
         if(is_array($class))
         {
             parent::__construct($class);
@@ -29,7 +24,7 @@ public function __construct($class, $interface)
         {
             parent::__construct
             ([
-                'class'     => $class,
+                'class'     => $this->type_info($class),
                 'interface' => $interface
             ]);
         }

source/MethodNotCallable.php

@@ -22,7 +22,7 @@ public function __construct($method, $message = '')
         }
         else
         {
-            parent::__construct(['method'  => $method, 'message' => $message]);
+            parent::__construct(['method'  => $this->to_string($method), 'message' => $message]);
         }
     }
 }

source/UnSerializeException.php

@@ -6,7 +6,7 @@
  */
 class UnSerializeException  extends LoggableException
 {
-    protected $template = 'Unserialize process was failed (type: {type}, node: {node}). {reason}';
+    protected $template = 'Unserialize process was failed (type: {type}, node: {node})';
 
     /**
      * Object can't be serialized!
@@ -25,7 +25,7 @@ public function __construct($reason, $type = 'phpserialize', $node = null)
 
         parent::__construct
         ([
-            'reason'        => $reason,
+            'message'       => $reason,
             'type'          => $type,
             'node'          => $this->type_info($node)
         ]);

source/UnhandledException.php

@@ -7,7 +7,7 @@
  */
 class UnhandledException extends LoggableException
 {
-    protected $template = 'Unhandled Exception {type} occurred';
+    protected $template = 'Unhandled Exception {type} occurred in the {source}';
 
     /**
      * @param \Exception|BaseExceptionI $exception
@@ -16,8 +16,7 @@ public function __construct(\Exception $exception)
     {
         parent::__construct
         ([
-            'message'   => 'Unhandled Exception',
-            'type'      => get_class($exception),
+            'type'      => $this->type_info($exception),
             'source'    => $this->get_source_for($exception),
             'previous'  => $exception
         ]);