feat: allow register own middleware's services #2559

linkorb · Aug 14, 2019 · cbfc3e2 · cbfc3e2
1 parent b9d1f1a
commit cbfc3e2
Showing 1 changed file with 24 additions and 13 deletions.
diff --git a/src/Runner.php b/src/Runner.php
@@ -3,6 +3,7 @@
 namespace Radvance;
 
 use Nyholm\Psr7\Factory\Psr17Factory;
+use OpenAPIValidation\Schema\Validator;
 use Silex\Application;
 use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
 use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
@@ -14,32 +15,42 @@
 
 class Runner
 {
+    public const MIDDLEWARE_SERVICES_LIST_ID = 'middleware_services';
+
     /**
      * @param HttpKernelInterface|Application $app
      * @param Request|null $request
      */
-    static function run(HttpKernelInterface $app, Request $request = null)
+    static function run(HttpKernelInterface $application, Request $request = null)
     {
-        $flexMiddlewaresYaml = null;
+        $stack = $application->getStack();
+        $app = $stack->resolve($application);
 
-        if ($app instanceof Application) {
-            $flexMiddlewaresYaml = isset($app['flex_middlewares.config']) ?
-                $app['flex_middlewares.config'] :
-                realpath('../') . DIRECTORY_SEPARATOR . 'middlewares.yaml';
-        }
-
-        $stack = $app->getStack();
-        $app = $stack->resolve($app);
-
         $request = $request ?: Request::createFromGlobals();
         $middlewarePipe = new \Zend\Stratigility\MiddlewarePipe();
 
         $psr17Factory = new Psr17Factory();
         $psrHttpFactory = new PsrHttpFactory($psr17Factory, $psr17Factory, $psr17Factory, $psr17Factory);
         $psrRequest = $psrHttpFactory->createRequest($request);
 
-        if (is_file($flexMiddlewaresYaml)) {
-            $middlewarePipe->pipe(FlexMiddlewareFactory::fromConfig($flexMiddlewaresYaml));
+        if ($application instanceof Application) {
+            $flexMiddlewaresYaml = isset($application['flex_middlewares.config']) ?
+                $application['flex_middlewares.config'] :
+                realpath('../') . DIRECTORY_SEPARATOR . 'middlewares.yaml';
+
+            if (is_file($flexMiddlewaresYaml)) {
+                $middlewarePipe->pipe(FlexMiddlewareFactory::fromConfig($flexMiddlewaresYaml));
+            }
+
+            if (isset($application[self::MIDDLEWARE_SERVICES_LIST_ID])) {
+                foreach ($application[self::MIDDLEWARE_SERVICES_LIST_ID] as $middlewareServiceID) {
+                    if (!isset($application[$middlewareServiceID])) {
+                        throw new \InvalidArgumentException("No $middlewareServiceID middleware service");
+                    }
+
+                    $middlewarePipe->pipe($application[$middlewareServiceID]);
+                }
+            }
         }
 
         $middlewarePipe->pipe(new HttpKernelMiddleware($app));