From 97fdfa6ebe3741880b958b963a6e415ee50e5a59 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 6 Jul 2019 13:44:50 +0100
Subject: [PATCH] Moved config dir into app dir

Closes #1506
---
 app/Application.php                         | 19 +++++++++++++++++++
 {config => app/Config}/app.php              |  0
 {config => app/Config}/auth.php             |  0
 {config => app/Config}/broadcasting.php     |  0
 {config => app/Config}/cache.php            |  0
 {config => app/Config}/database.php         |  0
 {config => app/Config}/debugbar.php         |  0
 {config => app/Config}/dompdf.php           |  0
 {config => app/Config}/filesystems.php      |  0
 {config => app/Config}/mail.php             |  0
 {config => app/Config}/queue.php            |  0
 {config => app/Config}/services.php         |  0
 {config => app/Config}/session.php          |  0
 {config => app/Config}/setting-defaults.php |  0
 {config => app/Config}/snappy.php           |  0
 {config => app/Config}/view.php             |  0
 app/Providers/AppServiceProvider.php        |  1 -
 bootstrap/app.php                           |  2 +-
 18 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 app/Application.php
 rename {config => app/Config}/app.php (100%)
 rename {config => app/Config}/auth.php (100%)
 rename {config => app/Config}/broadcasting.php (100%)
 rename {config => app/Config}/cache.php (100%)
 rename {config => app/Config}/database.php (100%)
 rename {config => app/Config}/debugbar.php (100%)
 rename {config => app/Config}/dompdf.php (100%)
 rename {config => app/Config}/filesystems.php (100%)
 rename {config => app/Config}/mail.php (100%)
 rename {config => app/Config}/queue.php (100%)
 rename {config => app/Config}/services.php (100%)
 rename {config => app/Config}/session.php (100%)
 rename {config => app/Config}/setting-defaults.php (100%)
 rename {config => app/Config}/snappy.php (100%)
 rename {config => app/Config}/view.php (100%)

diff --git a/app/Application.php b/app/Application.php
new file mode 100644
index 000000000..8c56e9dac
--- /dev/null
+++ b/app/Application.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace BookStack;
+
+class Application extends \Illuminate\Foundation\Application
+{
+
+    /**
+     * Get the path to the application configuration files.
+     *
+     * @param  string  $path Optionally, a path to append to the config path
+     * @return string
+     */
+    public function configPath($path = '')
+    {
+        return $this->basePath.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'Config'.($path ? DIRECTORY_SEPARATOR.$path : $path);
+    }
+
+}
\ No newline at end of file
diff --git a/config/app.php b/app/Config/app.php
similarity index 100%
rename from config/app.php
rename to app/Config/app.php
diff --git a/config/auth.php b/app/Config/auth.php
similarity index 100%
rename from config/auth.php
rename to app/Config/auth.php
diff --git a/config/broadcasting.php b/app/Config/broadcasting.php
similarity index 100%
rename from config/broadcasting.php
rename to app/Config/broadcasting.php
diff --git a/config/cache.php b/app/Config/cache.php
similarity index 100%
rename from config/cache.php
rename to app/Config/cache.php
diff --git a/config/database.php b/app/Config/database.php
similarity index 100%
rename from config/database.php
rename to app/Config/database.php
diff --git a/config/debugbar.php b/app/Config/debugbar.php
similarity index 100%
rename from config/debugbar.php
rename to app/Config/debugbar.php
diff --git a/config/dompdf.php b/app/Config/dompdf.php
similarity index 100%
rename from config/dompdf.php
rename to app/Config/dompdf.php
diff --git a/config/filesystems.php b/app/Config/filesystems.php
similarity index 100%
rename from config/filesystems.php
rename to app/Config/filesystems.php
diff --git a/config/mail.php b/app/Config/mail.php
similarity index 100%
rename from config/mail.php
rename to app/Config/mail.php
diff --git a/config/queue.php b/app/Config/queue.php
similarity index 100%
rename from config/queue.php
rename to app/Config/queue.php
diff --git a/config/services.php b/app/Config/services.php
similarity index 100%
rename from config/services.php
rename to app/Config/services.php
diff --git a/config/session.php b/app/Config/session.php
similarity index 100%
rename from config/session.php
rename to app/Config/session.php
diff --git a/config/setting-defaults.php b/app/Config/setting-defaults.php
similarity index 100%
rename from config/setting-defaults.php
rename to app/Config/setting-defaults.php
diff --git a/config/snappy.php b/app/Config/snappy.php
similarity index 100%
rename from config/snappy.php
rename to app/Config/snappy.php
diff --git a/config/view.php b/app/Config/view.php
similarity index 100%
rename from config/view.php
rename to app/Config/view.php
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 9b91ba126..fa10d4874 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -9,7 +9,6 @@ use BookStack\Entities\Page;
 use BookStack\Settings\Setting;
 use BookStack\Settings\SettingService;
 use Illuminate\Database\Eloquent\Relations\Relation;
-use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\ServiceProvider;
 use Schema;
diff --git a/bootstrap/app.php b/bootstrap/app.php
index 371f93913..516980cc1 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -11,7 +11,7 @@
 |
 */
 
-$app = new Illuminate\Foundation\Application(
+$app = new \BookStack\Application(
     realpath(__DIR__.'/../')
 );