Fix build order of layers

src/Elements/ErrorHandlingLayer.php

@@ -2,17 +2,25 @@
 
 namespace Aztech\Layers\Elements;
 
+use Aztech\Layers\Layer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\HttpException;
-use Aztech\Layers\Layer;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerAwareTrait;
+use Psr\Log\NullLogger;
+use Symfony\Component\HttpFoundation\Response;
 
-class ErrorHandlingLayer implements Layer
+class ErrorHandlingLayer implements Layer, LoggerAwareInterface
 {
+
+    use LoggerAwareTrait;
+
     private $controller;
 
     public function __construct(Layer $controller)
     {
         $this->controller = $controller;
+        $this->logger = new NullLogger();
     }
 
     public function __invoke(Request $request)
@@ -22,9 +30,9 @@ public function __invoke(Request $request)
 
             return $controller($request);
         } catch (\Exception $ex) {
-            error_log($ex);
+            $this->logger->error($ex);
 
-            throw new HttpException(500, $ex->getMessage());
+            return new Response($ex->getMessage(), 500);
         }
     }
 }

src/LayeredControllerFactory.php

@@ -24,13 +24,15 @@ public function build($nextLayer, array $keys)
             throw new \InvalidArgumentException('Controller must be a callable.');
         }
 
-        $nextLayer = $this->wrapLayerIfNecessary($nextLayer);
+        $controller = $this->wrapLayerIfNecessary($nextLayer);
+
+        $keys = array_reverse($keys);
 
         foreach ($keys as $keyValue) {
             $key = is_array($keyValue) ? reset($keyValue) : $keyValue;
             $arguments = is_array($keyValue) ? array_slice($keyValue, 1, count($keyValue) - 1, true) : [];
 
-            $controller = $this->builders[$key]->buildLayer($nextLayer, $arguments);
+            $controller = $this->builders[$key]->buildLayer($controller, $arguments);
         }
 
         return $controller;