Fixed model extending mis-use

[bookstack] / config / app.php

diff --git a/config/app.php b/config/app.php
index b9c20763205b2007e9860e6c7ed966eaa366cbb0..bf4f84fc78c362651f32842945948d62db201e3b 100644 (file)
--- a/config/app.php
+++ b/config/app.php
@@ -2,6 +2,11 @@
 
 return [
 
 
 return [
 

+
+    'env' => env('APP_ENV', 'production'),
+
+    'editor' => env('APP_EDITOR', 'html'),
+

     /*
     |--------------------------------------------------------------------------
     | Application Debug Mode
     /*
     |--------------------------------------------------------------------------
     | Application Debug Mode


@@ -26,7 +31,7 @@ return [
     |
     */
 
     |
     */
 

-    'url' => env('APP_URL', 'http://localhost'),
+    'url' => env('APP_URL', '') === 'http://bookstack.dev' ? '' : env('APP_URL', ''),

 
     /*
     |--------------------------------------------------------------------------
 
     /*
     |--------------------------------------------------------------------------


@@ -52,7 +57,7 @@ return [
     |
     */
 
     |
     */
 

-    'locale' => 'en',
+    'locale' => env('APP_LANG', 'en'),

 
     /*
     |--------------------------------------------------------------------------
 
     /*
     |--------------------------------------------------------------------------


@@ -113,13 +118,11 @@ return [
         /*
          * Laravel Framework Service Providers...
          */
         /*
          * Laravel Framework Service Providers...
          */

-        Illuminate\Foundation\Providers\ArtisanServiceProvider::class,

         Illuminate\Auth\AuthServiceProvider::class,
         Illuminate\Broadcasting\BroadcastServiceProvider::class,
         Illuminate\Bus\BusServiceProvider::class,
         Illuminate\Cache\CacheServiceProvider::class,
         Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
         Illuminate\Auth\AuthServiceProvider::class,
         Illuminate\Broadcasting\BroadcastServiceProvider::class,
         Illuminate\Bus\BusServiceProvider::class,
         Illuminate\Cache\CacheServiceProvider::class,
         Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,

-        Illuminate\Routing\ControllerServiceProvider::class,

         Illuminate\Cookie\CookieServiceProvider::class,
         Illuminate\Database\DatabaseServiceProvider::class,
         Illuminate\Encryption\EncryptionServiceProvider::class,
         Illuminate\Cookie\CookieServiceProvider::class,
         Illuminate\Database\DatabaseServiceProvider::class,
         Illuminate\Encryption\EncryptionServiceProvider::class,


@@ -127,7 +130,6 @@ return [
         Illuminate\Foundation\Providers\FoundationServiceProvider::class,
         Illuminate\Hashing\HashServiceProvider::class,
         Illuminate\Mail\MailServiceProvider::class,
         Illuminate\Foundation\Providers\FoundationServiceProvider::class,
         Illuminate\Hashing\HashServiceProvider::class,
         Illuminate\Mail\MailServiceProvider::class,

-        Illuminate\Pagination\PaginationServiceProvider::class,

         Illuminate\Pipeline\PipelineServiceProvider::class,
         Illuminate\Queue\QueueServiceProvider::class,
         Illuminate\Redis\RedisServiceProvider::class,
         Illuminate\Pipeline\PipelineServiceProvider::class,
         Illuminate\Queue\QueueServiceProvider::class,
         Illuminate\Redis\RedisServiceProvider::class,


@@ -136,20 +138,27 @@ return [
         Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
         Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,

-        Laravel\Socialite\SocialiteServiceProvider::class,
+        Illuminate\Notifications\NotificationServiceProvider::class,
+        SocialiteProviders\Manager\ServiceProvider::class,

 
         /**
          * Third Party
          */
         Intervention\Image\ImageServiceProvider::class,
 
         /**
          * Third Party
          */
         Intervention\Image\ImageServiceProvider::class,

+        Barryvdh\DomPDF\ServiceProvider::class,

         Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
         Barryvdh\Debugbar\ServiceProvider::class,
         Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
         Barryvdh\Debugbar\ServiceProvider::class,

+        Barryvdh\Snappy\ServiceProvider::class,

 
 
         /*
          * Application Service Providers...
          */
 
 
         /*
          * Application Service Providers...
          */

+        BookStack\Providers\PaginationServiceProvider::class,
+
+        BookStack\Providers\AuthServiceProvider::class,

         BookStack\Providers\AppServiceProvider::class,
         BookStack\Providers\AppServiceProvider::class,

+        BookStack\Providers\BroadcastServiceProvider::class,

         BookStack\Providers\EventServiceProvider::class,
         BookStack\Providers\RouteServiceProvider::class,
         BookStack\Providers\CustomFacadeProvider::class,
         BookStack\Providers\EventServiceProvider::class,
         BookStack\Providers\RouteServiceProvider::class,
         BookStack\Providers\CustomFacadeProvider::class,


@@ -188,6 +197,7 @@ return [
         'Lang'      => Illuminate\Support\Facades\Lang::class,
         'Log'       => Illuminate\Support\Facades\Log::class,
         'Mail'      => Illuminate\Support\Facades\Mail::class,
         'Lang'      => Illuminate\Support\Facades\Lang::class,
         'Log'       => Illuminate\Support\Facades\Log::class,
         'Mail'      => Illuminate\Support\Facades\Mail::class,

+        'Notification' => Illuminate\Support\Facades\Notification::class,

         'Password'  => Illuminate\Support\Facades\Password::class,
         'Queue'     => Illuminate\Support\Facades\Queue::class,
         'Redirect'  => Illuminate\Support\Facades\Redirect::class,
         'Password'  => Illuminate\Support\Facades\Password::class,
         'Queue'     => Illuminate\Support\Facades\Queue::class,
         'Redirect'  => Illuminate\Support\Facades\Redirect::class,


@@ -208,6 +218,8 @@ return [
          */
 
         'ImageTool' => Intervention\Image\Facades\Image::class,
          */
 
         'ImageTool' => Intervention\Image\Facades\Image::class,

+        'PDF' => Barryvdh\DomPDF\Facade::class,
+        'SnappyPDF' => Barryvdh\Snappy\Facades\SnappyPdf::class,

         'Debugbar'  => Barryvdh\Debugbar\Facade::class,
 
         /**
         'Debugbar'  => Barryvdh\Debugbar\Facade::class,
 
         /**