From 2bf3448d185ac914fecba8129fa43cfb4f2d7b4b Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Sun, 15 Apr 2018 14:51:31 +0200
Subject: [PATCH] Separate app bootstrapping and routes

---
 app.php                     | 47 +++++++++++++++++++++++++++++++++++++
 public/index.php            |  2 +-
 bootstrap.php => routes.php | 44 ----------------------------------
 3 files changed, 48 insertions(+), 45 deletions(-)
 create mode 100644 app.php
 rename bootstrap.php => routes.php (78%)

diff --git a/app.php b/app.php
new file mode 100644
index 00000000..bcfcae3a
--- /dev/null
+++ b/app.php
@@ -0,0 +1,47 @@
+<?php
+
+use \Psr\Http\Message\ServerRequestInterface as Request;
+use \Psr\Http\Message\ResponseInterface as Response;
+
+use \Grocy\Middleware\SessionAuthMiddleware;
+use \Grocy\Middleware\JsonMiddleware;
+use \Grocy\Middleware\CliMiddleware;
+
+use \Grocy\Services\ApplicationService;
+
+require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__ . '/data/config.php';
+require_once __DIR__ . '/extensions.php';
+
+// Setup base application
+if (PHP_SAPI !== 'cli')
+{
+	$appContainer = new \Slim\Container([
+		'settings' => [
+			'displayErrorDetails' => true,
+			'determineRouteBeforeAppMiddleware' => true
+		],
+		'view' => function($container)
+		{
+			return new \Slim\Views\Blade(__DIR__ . '/views', __DIR__ . '/data/viewcache');
+		}
+	]);
+
+	$app = new \Slim\App($appContainer);
+}
+else
+{
+	$app = new \Slim\App();
+	$app->add(\pavlakis\cli\CliRequest::class);
+}
+
+// Add session handling if this is not a demo installation
+$applicationService = new ApplicationService();
+if (!$applicationService->IsDemoInstallation())
+{
+	$app->add(SessionAuthMiddleware::class);
+}
+
+require_once __DIR__ . '/routes.php';
+
+$app->run();
diff --git a/public/index.php b/public/index.php
index bf457d54..64e013e1 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,3 +1,3 @@
 <?php
 
-require_once __DIR__ . '/../bootstrap.php';
+require_once __DIR__ . '/../app.php';
diff --git a/bootstrap.php b/routes.php
similarity index 78%
rename from bootstrap.php
rename to routes.php
index ed78761a..8ba38ec7 100644
--- a/bootstrap.php
+++ b/routes.php
@@ -1,47 +1,5 @@
 <?php
 
-use \Psr\Http\Message\ServerRequestInterface as Request;
-use \Psr\Http\Message\ResponseInterface as Response;
-
-use \Grocy\Middleware\SessionAuthMiddleware;
-use \Grocy\Middleware\JsonMiddleware;
-use \Grocy\Middleware\CliMiddleware;
-
-use \Grocy\Services\ApplicationService;
-
-require_once __DIR__ . '/vendor/autoload.php';
-require_once __DIR__ . '/data/config.php';
-require_once __DIR__ . '/extensions.php';
-
-// Setup base application
-if (PHP_SAPI !== 'cli')
-{
-	$appContainer = new \Slim\Container([
-		'settings' => [
-			'displayErrorDetails' => true,
-			'determineRouteBeforeAppMiddleware' => true
-		],
-		'view' => function($container)
-		{
-			return new \Slim\Views\Blade(__DIR__ . '/views', __DIR__ . '/data/viewcache');
-		}
-	]);
-
-	$app = new \Slim\App($appContainer);
-}
-else
-{
-	$app = new \Slim\App();
-	$app->add(\pavlakis\cli\CliRequest::class);
-}
-
-// Add session handling if this is not a demo installation
-$applicationService = new ApplicationService();
-if (!$applicationService->IsDemoInstallation())
-{
-	$app->add(SessionAuthMiddleware::class);
-}
-
 // Base route
 $app->get('/', 'Grocy\Controllers\LoginController:Root')->setName('root');
 
@@ -110,5 +68,3 @@ $app->group('/cli', function()
 {
 	$this->get('/recreatedemo', 'Grocy\Controllers\CliController:RecreateDemo');
 })->add(CliMiddleware::class);
-
-$app->run();