From b521947ea5601a54c2043b4886e3e8ab7e454c55 Mon Sep 17 00:00:00 2001
From: Thibaud Fabre <thibaud@aztech.io>
Date: Fri, 22 Jan 2016 17:29:45 +0100
Subject: [PATCH] Fix API plugin route initialization and remove odd syntax

---
 lib/Alchemy/Phrasea/Application.php                           | 4 +++-
 .../Phrasea/Core/Middleware/SetupMiddlewareProvider.php       | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php
index a28f8b0ac1..fb8e8b96e4 100644
--- a/lib/Alchemy/Phrasea/Application.php
+++ b/lib/Alchemy/Phrasea/Application.php
@@ -664,7 +664,7 @@ class Application extends SilexApplication
         $loader->registerProviders(RouteLoader::$defaultProviders);
 
         $loader->bindRoutes($this);
-        $loader->bindPluginRoutes($this, 'plugin.controller_providers.root');
+        $this->bindPluginRoutes('plugin.controller_providers.root');
     }
 
     /**
@@ -1141,6 +1141,8 @@ class Application extends SilexApplication
      */
     public function bindPluginRoutes($routeParameter)
     {
+        $loader = new RouteLoader();
 
+        $loader->bindPluginRoutes($this, $routeParameter);
     }
 }
diff --git a/lib/Alchemy/Phrasea/Core/Middleware/SetupMiddlewareProvider.php b/lib/Alchemy/Phrasea/Core/Middleware/SetupMiddlewareProvider.php
index 44c7e4c547..fb4151bc42 100644
--- a/lib/Alchemy/Phrasea/Core/Middleware/SetupMiddlewareProvider.php
+++ b/lib/Alchemy/Phrasea/Core/Middleware/SetupMiddlewareProvider.php
@@ -20,7 +20,7 @@ class SetupMiddlewareProvider implements ServiceProviderInterface
     {
         Assertion::isInstanceOf($app, \Alchemy\Phrasea\Application::class);
 
-        $app['setup.validate-config'] = $app->share($app->protect(function (Request $request) use ($app) {
+        $app['setup.validate-config'] = $app->protect(function (Request $request) use ($app) {
             if (0 === strpos($request->getPathInfo(), '/setup')) {
                 if (!$app['phraseanet.configuration-tester']->isInstalled()) {
                     if (!$app['phraseanet.configuration-tester']->isBlank()) {
@@ -36,7 +36,7 @@ class SetupMiddlewareProvider implements ServiceProviderInterface
                     $app['firewall']->requireSetup();
                 }
             }
-        }));
+        });
     }
 
     /**