Lexical: Updated tests for node changes

[bookstack] / app / Config / app.php

diff --git a/app/Config/app.php b/app/Config/app.php
index 3a843c512b2f069dc21d881fc4aea6cfa5c1c12c..b96d0bdb7885215ff65ac665b77591f37a23745d 100644 (file)
--- a/app/Config/app.php
+++ b/app/Config/app.php
@@ -9,6 +9,7 @@
  */
 
 use Illuminate\Support\Facades\Facade;
  */
 
 use Illuminate\Support\Facades\Facade;

+use Illuminate\Support\ServiceProvider;

 
 return [
 
 
 return [
 


@@ -83,10 +84,10 @@ return [
     'timezone' => env('APP_TIMEZONE', 'UTC'),
 
     // Default locale to use
     'timezone' => env('APP_TIMEZONE', 'UTC'),
 
     // Default locale to use

+    // A default variant is also stored since Laravel can overwrite
+    // app.locale when dynamically setting the locale in-app.

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

-
-    // Locales available
-    'locales' => ['en', 'ar', 'bg', 'bs', 'ca', 'cs', 'cy', 'da', 'de', 'de_informal', 'el', 'es', 'es_AR', 'et', 'eu', 'fa', 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ka', 'ko', 'lt', 'lv', 'nl', 'nb', 'pt', 'pt_BR', 'sk', 'sl', 'sv', 'pl',  'ro', 'ru', 'tr', 'uk', 'uz', 'vi', 'zh_CN', 'zh_TW'],
+    'default_locale' => env('APP_LANG', 'en'),

 
     //  Application Fallback Locale
     'fallback_locale' => 'en',
 
     //  Application Fallback Locale
     'fallback_locale' => 'en',


@@ -94,9 +95,6 @@ return [
     // Faker Locale
     'faker_locale' => 'en_GB',
 
     // Faker Locale
     'faker_locale' => 'en_GB',
 

-    // Enable right-to-left text control.
-    'rtl' => false,
-

     // Auto-detect the locale for public users
     // For public users their locale can be guessed by headers sent by their
     // browser. This is usually set by users in their browser settings.
     // Auto-detect the locale for public users
     // For public users their locale can be guessed by headers sent by their
     // browser. This is usually set by users in their browser settings.


@@ -116,47 +114,20 @@ return [
     ],
 
     // Application Service Providers
     ],
 
     // Application Service Providers

-    'providers' => [
-
-        // Laravel Framework Service Providers...
-        Illuminate\Auth\AuthServiceProvider::class,
-        Illuminate\Broadcasting\BroadcastServiceProvider::class,
-        Illuminate\Bus\BusServiceProvider::class,
-        Illuminate\Cache\CacheServiceProvider::class,
-        Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
-        Illuminate\Cookie\CookieServiceProvider::class,
-        Illuminate\Database\DatabaseServiceProvider::class,
-        Illuminate\Encryption\EncryptionServiceProvider::class,
-        Illuminate\Filesystem\FilesystemServiceProvider::class,
-        Illuminate\Foundation\Providers\FoundationServiceProvider::class,
-        Illuminate\Hashing\HashServiceProvider::class,
-        Illuminate\Mail\MailServiceProvider::class,
-        Illuminate\Notifications\NotificationServiceProvider::class,
-        Illuminate\Pagination\PaginationServiceProvider::class,
-        Illuminate\Pipeline\PipelineServiceProvider::class,
-        Illuminate\Queue\QueueServiceProvider::class,
-        Illuminate\Redis\RedisServiceProvider::class,
-        Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
-        Illuminate\Session\SessionServiceProvider::class,
-        Illuminate\Validation\ValidationServiceProvider::class,
-        Illuminate\View\ViewServiceProvider::class,
-
+    'providers' => ServiceProvider::defaultProviders()->merge([

         // Third party service providers
         // Third party service providers

-        Barryvdh\DomPDF\ServiceProvider::class,
-        Barryvdh\Snappy\ServiceProvider::class,
-        Intervention\Image\ImageServiceProvider::class,

         SocialiteProviders\Manager\ServiceProvider::class,
 
         // BookStack custom service providers
         SocialiteProviders\Manager\ServiceProvider::class,
 
         // BookStack custom service providers

-        \BookStack\App\Providers\ThemeServiceProvider::class,
-        \BookStack\App\Providers\AppServiceProvider::class,
-        \BookStack\App\Providers\AuthServiceProvider::class,
-        \BookStack\App\Providers\EventServiceProvider::class,
-        \BookStack\App\Providers\RouteServiceProvider::class,
-        \BookStack\App\Providers\TranslationServiceProvider::class,
-        \BookStack\App\Providers\ValidationRuleServiceProvider::class,
-        \BookStack\App\Providers\ViewTweaksServiceProvider::class,
-    ],
+        BookStack\App\Providers\ThemeServiceProvider::class,
+        BookStack\App\Providers\AppServiceProvider::class,
+        BookStack\App\Providers\AuthServiceProvider::class,
+        BookStack\App\Providers\EventServiceProvider::class,
+        BookStack\App\Providers\RouteServiceProvider::class,
+        BookStack\App\Providers\TranslationServiceProvider::class,
+        BookStack\App\Providers\ValidationRuleServiceProvider::class,
+        BookStack\App\Providers\ViewTweaksServiceProvider::class,
+    ])->toArray(),

 
     // Class Aliases
     // This array of class aliases to be registered on application start.
 
     // Class Aliases
     // This array of class aliases to be registered on application start.


@@ -164,9 +135,6 @@ return [
         // Laravel Packages
         'Socialite'    => Laravel\Socialite\Facades\Socialite::class,
 
         // Laravel Packages
         'Socialite'    => Laravel\Socialite\Facades\Socialite::class,
 

-        // Third Party
-        'ImageTool' => Intervention\Image\Facades\Image::class,
-

         // Custom BookStack
         'Activity'    => BookStack\Facades\Activity::class,
         'Theme'       => BookStack\Facades\Theme::class,
         // Custom BookStack
         'Activity'    => BookStack\Facades\Activity::class,
         'Theme'       => BookStack\Facades\Theme::class,