Separate error and shutdown handling into a single trait for reusability

Author: Marco Bunge

CHANGELOG.md

@@ -44,12 +44,14 @@
 ### Altered
 
  - Whoops handlers has been refactored to `\Hawkbit\Application\Services\Whoops\HandlerService`
-
+ - Error und shutdown handling has been refactored to `Hawkbit\Application\Init\InitHaltHooksTrait`
+ 
 ### Added
 
  - Add exception stack `Hawkbit\Application\Application\AbtractApplication::getExceptionStack` of all occured exceptions
  - Provide backwards / onwards compatibility for PHP 7 `\Throwables`
 
+
 ### Altered
 
  - Update [League Router](https://github.com/thephpleague/route/tree/507606b53d3935e7830aa7c48c43337bc2b1b2ba) and use router middleware implementation instead of application middleware. 

src/Application.php

@@ -11,6 +11,7 @@
 
 namespace Hawkbit;
 
+use Application\Init\InitHaltHookTrait;
 use Hawkbit\Application\AbstractApplication;
 use Hawkbit\Application\Init\InitConfigurationTrait;
 use Hawkbit\Application\Providers\MonologServiceProvider;
@@ -37,6 +38,7 @@ final class Application extends AbstractApplication implements RouteCollectionIn
 
     use RouteCollectionMapTrait;
     use InitConfigurationTrait;
+    use InitHaltHookTrait;
 
     /**
      * @var \League\Route\RouteCollection
@@ -102,7 +104,7 @@ public function init($configuration = [])
     {
         $this->initConfiguration($configuration);
         $this->initContentType();
-        $this->initSystem();
+        $this->initHaltHooks();
     }
 
     /*******************************************
@@ -783,37 +785,4 @@ protected function initContentType()
         $this->setContentType(ServerRequestFactory::getHeader('content-type', ServerRequestFactory::fromGlobals()->getHeaders(), $this->getContentType()));
     }
 
-    /**
-     *
-     */
-    protected function initSystem(){
-        // error handler
-        set_error_handler(function($level, $message, $file = null, $line = null){
-            $event = $this->getApplicationEvent();
-            $this->emit($event->setName(self::EVENT_HANDLE_ERROR), $level, $message, $file, $line);
-        });
-
-        // exception handler
-        set_exception_handler(function($exception){
-            /** @var \Exception|\Throwable $exception */
-            // Convert throwable to exception fpr backwards compatibility
-            if(!($exception instanceof \Exception)){
-                $throwable = $exception;
-                $exception = new \ErrorException(
-                    $throwable->getMessage(),
-                    $throwable->getCode(),
-                    E_ERROR,
-                    $throwable->getFile(),
-                    $throwable->getLine()
-                );
-            }
-
-            $event = $this->getApplicationEvent();
-            $this->emit($event->setName(self::EVENT_SYSTEM_EXCEPTION), $exception);
-        });
-
-        // shutdown function
-        register_shutdown_function([$this, 'shutdown']);
-    }
-
 }

src/Application/Init/InitHaltHookTrait.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: marco.bunge
+ * Date: 05.02.2017
+ * Time: 11:43
+ */
+
+namespace Application\Init;
+
+
+use Hawkbit\Application;
+use Hawkbit\Console;
+
+trait InitHaltHookTrait
+{
+
+    /**
+     * Init all hooks which will be execute on system shutdown or error
+     */
+    protected function initHaltHooks()
+    {
+
+        // error handler
+        set_error_handler(function ($level, $message, $file = null, $line = null) {
+            /** @var $this Application|Console */
+            $event = $this->getApplicationEvent();
+            $this->emit($event->setName($this::EVENT_HANDLE_ERROR), $level, $message, $file, $line);
+        });
+
+        // exception handler
+        set_exception_handler(function ($exception) {
+            /** @var $this Application|Console */
+            /** @var \Exception|\Throwable $exception */
+            // Convert throwable to exception for backwards compatibility
+            if (!($exception instanceof \Exception)) {
+                $throwable = $exception;
+                $exception = new \ErrorException(
+                    $throwable->getMessage(),
+                    $throwable->getCode(),
+                    E_ERROR,
+                    $throwable->getFile(),
+                    $throwable->getLine()
+                );
+            }
+
+            $event = $this->getApplicationEvent();
+            $this->emit($event->setName($this::EVENT_SYSTEM_EXCEPTION), $exception);
+        });
+
+        if (method_exists($this, 'shutdown')) {
+            // shutdown function
+            register_shutdown_function([$this, 'shutdown']);
+        }
+    }
+}

src/Console/ConsoleEvent.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: marco.bunge
+ * Date: 05.02.2017
+ * Time: 11:47
+ */
+
+namespace Console;
+
+
+class ConsoleEvent
+{
+
+}