- Merged with master done

meta/definitions/http.php

@@ -53,5 +53,9 @@ return [
 
     'error.500' => function(ContainerInterface $c, Picea $picea) {
         return $c->get(HttpFactoryInterface::class)::createHtmlResponse($picea->renderHtml("lean/error/500", []), 500);
-    }
+    },
+
+    ThrowableHandlerInterface::class => autowire(ThrowableHandler::class),
+    NotFoundDecoratorInterface::class => autowire(NotFoundDecorator::class),
+    # MethodNotAllowedInterface::class => autowire(MethodNotAllowedDecorator::class),
 ];

src/ApplicationStrategy.php

@@ -37,8 +37,8 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
     public function getMethodNotAllowedDecorator(MethodNotAllowedException $exception): MiddlewareInterface
     {
         return $this->getContainer()->has(MethodNotAllowedInterface::class) ? $this->getContainer()->get(MethodNotAllowedInterface::class) : parent::getMethodNotAllowedDecorator($exception);
-
     }
+/*<<<<<<< HEAD
         /*=======
     public function getMethodNotAllowedDecorator(MethodNotAllowedException $exception): MiddlewareInterface
             public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
@@ -69,4 +69,5 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
     }
 
 >>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)*/
+
 }