Доработки

Author: ProklUng

lib/ErrorHandler.php

@@ -63,18 +63,7 @@ public function initialize(array $options)
         $this->initTypes($options);
 
         $this->options = $options;
-
-        $this->initTypes($options);
-
-        $this->options = $options;
-        $this->options['env'] = $this->options['env'] ?? 'prod';
-
-        $this->options['allowed_env'] = $this->options['allowed_env'] ?? ['prod'];
-        if (count($this->options['allowed_env']) === 0) {
-            $this->options['allowed_env'] = ['prod'];
-        }
-
-        $this->options['importancy'] = $this->options['importancy'] ?? Notification::IMPORTANCE_URGENT;
+        $this->initOptions();
     }
 
     /**
@@ -109,16 +98,34 @@ public function write($exception, $logType)
     }
 
     /**
+     * Экземпляр notifier.
+     *
+     * @return NotifierInterface
+     */
+    private function getNotifier() : NotifierInterface
+    {
+        if (!class_exists(\Proklung\Notifier\DI\Services::class)
+            ||
+            !\Proklung\Notifier\DI\Services::has('notifier')
+        ) {
+            throw new RuntimeException('Не установлен родительский модуль.');
+        }
+
+        return \Proklung\Notifier\DI\Services::get('notifier');
+    }
+
+    /**
+     * Отправка уведомлений.
+     *
      * @param Exception $exception
      *
      * @return void
      * @throws Exception
      */
     private function send(Exception $exception) : void
     {
-        /** @var NotifierInterface $notifier */
-        $notifier = \Proklung\Notifier\DI\Services::get('notifier');
-        $importancy = $this->options['importancy'] ?? Notification::IMPORTANCE_URGENT;
+        $notifier = $this->getNotifier();
+        $importancy = $this->options['importancy'];
 
         $envelope = \Proklung\Notifier\DI\Services::getParameter('envelope');
         $emails = $envelope['recipients'] ?? [];
@@ -176,6 +183,8 @@ private function has(Exception $e) : bool
     }
 
     /**
+     * Инициализация типов обрабатываемых ошибок.
+     *
      * @param array $options Опции.
      *
      * @return void
@@ -193,4 +202,21 @@ private function initTypes(array $options) : void
             }
         }
     }
-}
+
+    /**
+     * Обработка параметров.
+     *
+     * @return void
+     */
+    private function initOptions(): void
+    {
+        $this->options['env'] = $this->options['env'] ?? 'prod';
+
+        $this->options['allowed_env'] = $this->options['allowed_env'] ?? ['prod'];
+        if (count($this->options['allowed_env']) === 0) {
+            $this->options['allowed_env'] = ['prod'];
+        }
+
+        $this->options['importancy'] = $this->options['importancy'] ?? Notification::IMPORTANCE_URGENT;
+    }
+}