Merge pull request #60 from pavelzotikov/fix-cyclinc-handling-and-res…

…olve-bug-63206

Fix cyclic handling and resolve bug #63206 in error and exception han…

composer.json

@@ -3,7 +3,7 @@
     "description": "PHP errors Catcher module for Hawk.so",
     "keywords": ["hawk", "php", "error", "catcher"],
     "type": "library",
-    "version": "2.2.1",
+    "version": "2.2.2",
     "license": "MIT",
     "require": {
         "ext-curl": "*",

src/Catcher.php

@@ -25,7 +25,7 @@ final class Catcher
     private static $instance;
 
     /**
-     * SDK handler: contains methods that catchs errors and exceptions
+     * SDK handler: contains methods that catch errors and exceptions
      *
      * @var Handler
      */
@@ -70,7 +70,7 @@ public static function get(): Catcher
      */
     public function setUser(array $user): self
     {
-        $this->handler->withUser($user);
+        $this->handler->setUser($user);
 
         return $this;
     }
@@ -82,7 +82,7 @@ public function setUser(array $user): self
      */
     public function setContext(array $context): self
     {
-        $this->handler->withContext($context);
+        $this->handler->setContext($context);
 
         return $this;
     }
@@ -99,7 +99,7 @@ public function setContext(array $context): self
      */
     public function sendMessage(string $message, array $context = []): void
     {
-        $this->handler->catchEvent([
+        $this->handler->sendEvent([
             'title'   => $message,
             'context' => $context
         ]);
@@ -109,6 +109,8 @@ public function sendMessage(string $message, array $context = []): void
      * @param Throwable $throwable
      * @param array     $context
      *
+     * @throws Throwable
+     *
      * @example
      * \Hawk\Catcher::get()
      *  ->sendException($exception, [
@@ -117,7 +119,7 @@ public function sendMessage(string $message, array $context = []): void
      */
     public function sendException(Throwable $throwable, array $context = [])
     {
-        $this->handler->catchException($throwable, $context);
+        $this->handler->handleException($throwable, $context);
     }
 
     /**
@@ -131,7 +133,7 @@ public function sendException(Throwable $throwable, array $context = [])
      */
     public function sendEvent(array $payload): void
     {
-        $this->handler->catchEvent($payload);
+        $this->handler->sendEvent($payload);
     }
 
     /**
@@ -156,6 +158,9 @@ private function __construct(array $options)
         $transport = new CurlTransport($options->getUrl());
 
         $this->handler = new Handler($options, $transport, $builder);
-        $this->handler->enableHandlers();
+
+        $this->handler->registerErrorHandler();
+        $this->handler->registerExceptionHandler();
+        $this->handler->registerFatalHandler();
     }
 }

src/Exception/SilencedErrorException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Hawk\Exception;
+
+class SilencedErrorException extends \ErrorException
+{
+}