Add console events and fix typo

Author: Marco Bunge

src/Application.php

@@ -14,6 +14,7 @@
 use Hawkbit\Application\Init\InitHaltHookTrait;
 use Hawkbit\Application\AbstractApplication;
 use Hawkbit\Application\Init\InitConfigurationTrait;
+use Hawkbit\Application\MiddlewareAwareInterface;
 use Hawkbit\Application\Providers\MonologServiceProvider;
 use Hawkbit\Application\Providers\WhoopsServiceProvider;
 use Hawkbit\Application\TerminableInterface;
@@ -33,7 +34,8 @@
 /**
  * Hawkbit Application Class.
  */
-final class Application extends AbstractApplication implements RouteCollectionInterface, TerminableInterface
+final class Application extends AbstractApplication
+    implements RouteCollectionInterface, TerminableInterface, MiddlewareAwareInterface
 {
 
     use RouteCollectionMapTrait;
@@ -116,7 +118,7 @@ public function init($configuration = [])
     /**
      * Add a middleware
      *
-     * @param $middleware
+     * @param callable $middleware
      */
     public function addMiddleware(callable $middleware)
     {

src/Application/MiddlewareAwareInterface.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: marco.bunge
+ * Date: 05.02.2017
+ * Time: 12:19
+ */
+
+namespace Hawkbit\Application;
+
+
+interface MiddlewareAwareInterface
+{
+
+    /**
+     * Add a middleware
+     *
+     * @param callable $middleware
+     */
+    public function addMiddleware(callable $middleware);
+
+    /**
+     * @return callable[]
+     */
+    public function getMiddlewares();
+}

src/Console.php

@@ -9,6 +9,8 @@
 namespace Hawkbit;
 
 use Hawkbit\Application\Init\InitHaltHookTrait;
+use Hawkbit\Application\MiddlewareAwareInterface;
+use Hawkbit\Application\MiddlewareRunner;
 use Hawkbit\Console\ConsoleEvent;
 use Hawkbit\Application\AbstractApplication;
 use Hawkbit\Application\Init\InitConfigurationTrait;
@@ -24,7 +26,7 @@
  *
  * @todo add event handling equals to application
  */
-final class Console extends AbstractApplication
+final class Console extends AbstractApplication implements MiddlewareAwareInterface
 {
 
     use InitConfigurationTrait;
@@ -44,6 +46,11 @@ final class Console extends AbstractApplication
      */
     protected $applicationEventClass = ConsoleEvent::class;
 
+    /**
+     * @var callable[]
+     */
+    protected $middlewares = [];
+
     /**
      * New Application.
      *
@@ -116,7 +123,6 @@ public function map($name, $callback, array $arguments = [])
      */
     public function handle(array $args = [])
     {
-
         // remove source file name from argv
         $source = array_shift($args);
 
@@ -130,8 +136,12 @@ public function handle(array $args = [])
         // init dispatcher
         $dispatcher = new Dispatcher($this->commands, $this->container);
 
-        // dispatch command with args from cli
-        $dispatcher->dispatch($applicationEvent->getArguments());
+        $middlewareRunner = new MiddlewareRunner($this->getMiddlewares());
+
+        $middlewareRunner->run([$applicationEvent->getArguments()], function ($args) use ($applicationEvent, $dispatcher) {
+            // dispatch command with args from cli
+            $dispatcher->dispatch($args);
+        });
     }
 
     /**
@@ -161,4 +171,22 @@ public function hasCommand($command)
     {
         return isset($this->commands[$command]);
     }
+
+    /**
+     * Add a middleware
+     *
+     * @param callable $middleware
+     */
+    public function addMiddleware(callable $middleware)
+    {
+        $this->middlewares[] = $this->bindClosureToInstance($middleware, $this);
+    }
+
+    /**
+     * @return callable[]
+     */
+    public function getMiddlewares()
+    {
+        return $this->middlewares;
+    }
 }