From b1c6de0bc4a9e906ff4de82b0640b0e8a8b3bebd Mon Sep 17 00:00:00 2001
From: "Buster \"Silver Eagle\" Neece" <buster@busterneece.com>
Date: Tue, 6 Jul 2021 06:36:52 -0500
Subject: [PATCH] Remove DI compilation until upstream PHP-DI issues are
 resolved.

---
 src/AppFactory.php | 38 ++++++--------------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/src/AppFactory.php b/src/AppFactory.php
index 8b2ea317f..e701bbf81 100644
--- a/src/AppFactory.php
+++ b/src/AppFactory.php
@@ -14,14 +14,9 @@ use Invoker\ParameterResolver\Container\TypeHintContainerResolver;
 use Invoker\ParameterResolver\DefaultValueResolver;
 use Invoker\ParameterResolver\ResolverChain;
 use Monolog\Registry;
-use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Log\LoggerInterface;
 use Slim\App;
 use Slim\Factory\ServerRequestCreatorFactory;
-use Slim\Interfaces\CallableResolverInterface;
-use Slim\Interfaces\MiddlewareDispatcherInterface;
-use Slim\Interfaces\RouteCollectorInterface;
-use Slim\Interfaces\RouteResolverInterface;
 
 use const E_COMPILE_ERROR;
 use const E_CORE_ERROR;
@@ -53,33 +48,9 @@ class AppFactory
         ServerRequestCreatorFactory::setSlimHttpDecoratorsAutomaticDetection(false);
         ServerRequestCreatorFactory::setServerRequestCreator(new ServerRequestFactory());
 
-        $responseFactory = $container->has(ResponseFactoryInterface::class)
-            ? $container->get(ResponseFactoryInterface::class)
-            : new ResponseFactory();
-
-        $callableResolver = $container->has(CallableResolverInterface::class)
-            ? $container->get(CallableResolverInterface::class)
-            : null;
-
-        $routeCollector = $container->has(RouteCollectorInterface::class)
-            ? $container->get(RouteCollectorInterface::class)
-            : null;
-
-        $routeResolver = $container->has(RouteResolverInterface::class)
-            ? $container->get(RouteResolverInterface::class)
-            : null;
-
-        $middlewareDispatcher = $container->has(MiddlewareDispatcherInterface::class)
-            ? $container->get(MiddlewareDispatcherInterface::class)
-            : null;
-
         $app = new App(
-            $responseFactory,
-            $container,
-            $callableResolver,
-            $routeCollector,
-            $routeResolver,
-            $middlewareDispatcher
+            responseFactory: new ResponseFactory(),
+            container: $container,
         );
         $container->set(App::class, $app);
 
@@ -141,11 +112,14 @@ class AppFactory
         }
 
         $containerBuilder = new DI\ContainerBuilder();
-        $containerBuilder->useAnnotations(true);
         $containerBuilder->useAutowiring(true);
+
+        /*
+        $containerBuilder->enableDefinitionCache();
         if ($environment->isProduction()) {
             $containerBuilder->enableCompilation($environment->getTempDirectory());
         }
+        */
 
         $containerBuilder->addDefinitions($diDefinitions);