svc-admin01/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply pint to config directory

Browse Source
This commit is contained in:
snipe
2026-03-13 18:08:12 +00:00
parent f334b8caa3
commit c1a93e3ac8
21 changed files with 420 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/app.php
+158 -91
View File
@@ -1,5 +1,81 @@
<?php
use App\Helpers\Helper;
use App\Helpers\IconHelper;
use App\Helpers\StorageHelper;
use App\Providers\AppServiceProvider;
use App\Providers\BladeServiceProvider;
use App\Providers\BreadcrumbsServiceProvider;
use App\Providers\EventServiceProvider;
use App\Providers\LivewireServiceProvider;
use App\Providers\RouteServiceProvider;
use App\Providers\SamlServiceProvider;
use App\Providers\SettingsServiceProvider;
use App\Providers\SnipeTranslationServiceProvider;
use Elibyy\TCPDF\Facades\TCPDF;
use Illuminate\Auth\AuthServiceProvider;
use Illuminate\Auth\Passwords\PasswordResetServiceProvider;
use Illuminate\Broadcasting\BroadcastServiceProvider;
use Illuminate\Bus\BusServiceProvider;
use Illuminate\Cache\CacheServiceProvider;
use Illuminate\Cookie\CookieServiceProvider;
use Illuminate\Database\DatabaseServiceProvider;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Encryption\EncryptionServiceProvider;
use Illuminate\Filesystem\FilesystemServiceProvider;
use Illuminate\Foundation\Providers\ConsoleSupportServiceProvider;
use Illuminate\Foundation\Providers\FoundationServiceProvider;
use Illuminate\Hashing\HashServiceProvider;
use Illuminate\Mail\MailServiceProvider;
use Illuminate\Notifications\NotificationServiceProvider;
use Illuminate\Pagination\PaginationServiceProvider;
use Illuminate\Pipeline\PipelineServiceProvider;
use Illuminate\Queue\QueueServiceProvider;
use Illuminate\Redis\RedisServiceProvider;
use Illuminate\Session\SessionServiceProvider;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Blade;
use Illuminate\Support\Facades\Bus;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Cookie;
use Illuminate\Support\Facades\Crypt;
use Illuminate\Support\Facades\Date;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Event;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Gate;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Lang;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Notification;
use Illuminate\Support\Facades\Password;
use Illuminate\Support\Facades\Queue;
use Illuminate\Support\Facades\Redirect;
use Illuminate\Support\Facades\Redis;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Response;
use Illuminate\Support\Facades\Route;
use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\URL;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Facades\View;
use Illuminate\Validation\ValidationServiceProvider;
use Illuminate\View\ViewServiceProvider;
use Intervention\Image\ImageServiceProvider;
use Laravel\Passport\PassportServiceProvider;
use Laravel\Socialite\Facades\Socialite;
use Laravel\Socialite\SocialiteServiceProvider;
use Laravel\Tinker\TinkerServiceProvider;
use PragmaRX\Google2FALaravel\Facade;
use PragmaRX\Google2FALaravel\ServiceProvider;
use Spatie\Backup\BackupServiceProvider;
use Unicodeveloper\DumbPassword\DumbPasswordServiceProvider;
/*
|--------------------------------------------------------------------------
| DO NOT EDIT THIS FILE DIRECTLY.
@@ -73,7 +149,7 @@ return [
|
*/
'url' => env('APP_URL', 'http://localhost'),
'url' => env('APP_URL', 'http://localhost'),
/*
|--------------------------------------------------------------------------
@@ -99,7 +175,7 @@ return [
|
*/
'locale' => env('APP_LOCALE', 'en-US'),
'locale' => env('APP_LOCALE', 'en-US'),
/*
|--------------------------------------------------------------------------
@@ -127,7 +203,7 @@ return [
'key' => env('APP_KEY'),
'cipher' => env('APP_CIPHER', 'AES-256-CBC'),
'cipher' => env('APP_CIPHER', 'AES-256-CBC'),
/*
|--------------------------------------------------------------------------
@@ -203,8 +279,6 @@ return [
'additional_csp_urls' => env('ADDITIONAL_CSP_URLS', ''),
/*
|--------------------------------------------------------------------------
| Require SAML Login
@@ -237,7 +311,6 @@ return [
'saml_key_size' => env('SAML_KEY_SIZE', 2048),
/*
|--------------------------------------------------------------------------
| Demo Mode Lockdown
@@ -261,7 +334,6 @@ return [
'min_php' => '8.2.0',
/*
|--------------------------------------------------------------------------
| Autoloaded Service Providers
@@ -278,61 +350,60 @@ return [
/*
* 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,
App\Providers\SnipeTranslationServiceProvider::class, //we REPLACE the default Laravel translator with our own
Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,
AuthServiceProvider::class,
BroadcastServiceProvider::class,
BusServiceProvider::class,
CacheServiceProvider::class,
ConsoleSupportServiceProvider::class,
CookieServiceProvider::class,
DatabaseServiceProvider::class,
EncryptionServiceProvider::class,
FilesystemServiceProvider::class,
FoundationServiceProvider::class,
HashServiceProvider::class,
MailServiceProvider::class,
NotificationServiceProvider::class,
PaginationServiceProvider::class,
PipelineServiceProvider::class,
QueueServiceProvider::class,
RedisServiceProvider::class,
PasswordResetServiceProvider::class,
SessionServiceProvider::class,
SnipeTranslationServiceProvider::class, // we REPLACE the default Laravel translator with our own
ValidationServiceProvider::class,
ViewServiceProvider::class,
/*
* Package Service Providers...
*/
Intervention\Image\ImageServiceProvider::class,
Spatie\Backup\BackupServiceProvider::class,
PragmaRX\Google2FALaravel\ServiceProvider::class,
Laravel\Passport\PassportServiceProvider::class,
Laravel\Tinker\TinkerServiceProvider::class,
Unicodeveloper\DumbPassword\DumbPasswordServiceProvider::class,
ImageServiceProvider::class,
BackupServiceProvider::class,
ServiceProvider::class,
PassportServiceProvider::class,
TinkerServiceProvider::class,
DumbPasswordServiceProvider::class,
Eduardokum\LaravelMailAutoEmbed\ServiceProvider::class,
Laravel\Socialite\SocialiteServiceProvider::class,
SocialiteServiceProvider::class,
Elibyy\TCPDF\ServiceProvider::class,
/*
* Application Service Providers...
*/
App\Providers\AppServiceProvider::class,
AppServiceProvider::class,
App\Providers\AuthServiceProvider::class,
App\Providers\EventServiceProvider::class,
App\Providers\RouteServiceProvider::class,
App\Providers\SettingsServiceProvider::class,
EventServiceProvider::class,
RouteServiceProvider::class,
SettingsServiceProvider::class,
App\Providers\ValidationServiceProvider::class,
/*
* Custom Service Providers...
*/
App\Providers\BladeServiceProvider::class,
App\Providers\LivewireServiceProvider::class,
App\Providers\SamlServiceProvider::class,
App\Providers\BreadcrumbsServiceProvider::class,
BladeServiceProvider::class,
LivewireServiceProvider::class,
SamlServiceProvider::class,
BreadcrumbsServiceProvider::class,
],
@@ -350,47 +421,46 @@ return [
'aliases' => [
'App' => Illuminate\Support\Facades\App::class,
'Artisan' => Illuminate\Support\Facades\Artisan::class,
'Auth' => Illuminate\Support\Facades\Auth::class,
'Blade' => Illuminate\Support\Facades\Blade::class,
'Bus' => Illuminate\Support\Facades\Bus::class,
'Cache' => Illuminate\Support\Facades\Cache::class,
'Config' => Illuminate\Support\Facades\Config::class,
'Cookie' => Illuminate\Support\Facades\Cookie::class,
'Crypt' => Illuminate\Support\Facades\Crypt::class,
'Date' => Illuminate\Support\Facades\Date::class,
'DB' => Illuminate\Support\Facades\DB::class,
'Eloquent' => Illuminate\Database\Eloquent\Model::class,
'Event' => Illuminate\Support\Facades\Event::class,
'File' => Illuminate\Support\Facades\File::class,
'Gate' => Illuminate\Support\Facades\Gate::class,
'Hash' => Illuminate\Support\Facades\Hash::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,
'PDF' => Elibyy\TCPDF\Facades\TCPDF::class,
'Queue' => Illuminate\Support\Facades\Queue::class,
'Redirect' => Illuminate\Support\Facades\Redirect::class,
'Redis' => Illuminate\Support\Facades\Redis::class,
'Request' => Illuminate\Support\Facades\Request::class,
'Response' => Illuminate\Support\Facades\Response::class,
'Route' => Illuminate\Support\Facades\Route::class,
'Schema' => Illuminate\Support\Facades\Schema::class,
'Session' => Illuminate\Support\Facades\Session::class,
'Storage' => Illuminate\Support\Facades\Storage::class,
'URL' => Illuminate\Support\Facades\URL::class,
'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class,
'Google2FA' => PragmaRX\Google2FALaravel\Facade::class,
'Image' => Intervention\Image\ImageServiceProvider::class,
'Artisan' => Artisan::class,
'Auth' => Auth::class,
'Blade' => Blade::class,
'Bus' => Bus::class,
'Cache' => Cache::class,
'Config' => Config::class,
'Cookie' => Cookie::class,
'Crypt' => Crypt::class,
'Date' => Date::class,
'DB' => DB::class,
'Eloquent' => Model::class,
'Event' => Event::class,
'File' => File::class,
'Gate' => Gate::class,
'Hash' => Hash::class,
'Lang' => Lang::class,
'Log' => Log::class,
'Mail' => Mail::class,
'Notification' => Notification::class,
'Password' => Password::class,
'PDF' => TCPDF::class,
'Queue' => Queue::class,
'Redirect' => Redirect::class,
'Redis' => Redis::class,
'Request' => Request::class,
'Response' => Response::class,
'Route' => Route::class,
'Schema' => Schema::class,
'Session' => Session::class,
'Storage' => Storage::class,
'URL' => URL::class,
'Validator' => Validator::class,
'View' => View::class,
'Google2FA' => Facade::class,
'Image' => ImageServiceProvider::class,
'Carbon' => Carbon\Carbon::class,
'Helper' => App\Helpers\Helper::class,
'StorageHelper' => App\Helpers\StorageHelper::class,
'Icon' => App\Helpers\IconHelper::class,
'Socialite' => Laravel\Socialite\Facades\Socialite::class,
'Helper' => Helper::class,
'StorageHelper' => StorageHelper::class,
'Icon' => IconHelper::class,
'Socialite' => Socialite::class,
],
@@ -405,7 +475,6 @@ return [
'api_throttle_per_minute' => env('API_THROTTLE_PER_MINUTE', 120),
/*
|--------------------------------------------------------------------------
| Allow Web-Based Purge
@@ -417,8 +486,7 @@ return [
'allow_purge' => env('ALLOW_DATA_PURGE', false),
/*
/*
|--------------------------------------------------------------------------
| Allow Backup Deletion
|--------------------------------------------------------------------------
@@ -429,8 +497,7 @@ return [
'allow_backup_delete' => env('ALLOW_BACKUP_DELETE', false),
/*
/*
|--------------------------------------------------------------------------
| Escape Excel formulas in CSV exports
|--------------------------------------------------------------------------
@@ -445,7 +512,7 @@ return [
'escape_formulas' => env('CSV_ESCAPE_FORMULAS', true),
/*
/*
|--------------------------------------------------------------------------
| Max Unpaginated Records
|--------------------------------------------------------------------------
config/auth.php
+7 -8
View File
@@ -1,5 +1,7 @@
<?php
use App\Models\User;
return [
/*
@@ -68,7 +70,7 @@ return [
'providers' => [
'users' => [
'driver' => 'eloquent',
'model' => App\Models\User::class,
'model' => User::class,
],
// 'users' => [
@@ -101,7 +103,7 @@ return [
'throttle' => [
'max_attempts' => env('LOGIN_MAX_ATTEMPTS', 5),
'lockout_duration' => env('LOGIN_LOCKOUT_DURATION', 60),
]
],
],
@@ -112,7 +114,7 @@ return [
'throttle' => [
'max_attempts' => env('LOGIN_MAX_ATTEMPTS', 5),
'lockout_duration' => env('LOGIN_LOCKOUT_DURATION', 60),
]
],
],
],
@@ -124,11 +126,9 @@ return [
|
*/
'password_reset' => [
'max_attempts_per_min' => env('PASSWORD_RESET_MAX_ATTEMPTS_PER_MIN', 50),
'max_attempts_per_min' => env('PASSWORD_RESET_MAX_ATTEMPTS_PER_MIN', 50),
],
/*
|--------------------------------------------------------------------------
| Password Confirmation Timeout
@@ -140,8 +140,7 @@ return [
|
*/
'password_timeout' => env('PASSWORD_CONFIRM_TIMEOUT', 10800),
'password_timeout' => env('PASSWORD_CONFIRM_TIMEOUT', 10800),
/*
|--------------------------------------------------------------------------
config/backup.php
+22 -11
View File
@@ -1,5 +1,16 @@
<?php
use Spatie\Backup\Notifications\Notifiable;
use Spatie\Backup\Notifications\Notifications\BackupHasFailedNotification;
use Spatie\Backup\Notifications\Notifications\BackupWasSuccessfulNotification;
use Spatie\Backup\Notifications\Notifications\CleanupHasFailedNotification;
use Spatie\Backup\Notifications\Notifications\CleanupWasSuccessfulNotification;
use Spatie\Backup\Notifications\Notifications\HealthyBackupWasFoundNotification;
use Spatie\Backup\Notifications\Notifications\UnhealthyBackupWasFoundNotification;
use Spatie\Backup\Tasks\Cleanup\Strategies\DefaultStrategy;
use Spatie\Backup\Tasks\Monitor\HealthChecks\MaximumAgeInDays;
use Spatie\Backup\Tasks\Monitor\HealthChecks\MaximumStorageInMegabytes;
/*
|--------------------------------------------------------------------------
| DO NOT EDIT THIS FILE DIRECTLY.
@@ -107,7 +118,7 @@ return [
*/
'temporary_directory' => storage_path('app/backup-temp'),
//'encryption' => \ZipArchive::EM_AES_256,
// 'encryption' => \ZipArchive::EM_AES_256,
'encryption' => null,
],
@@ -121,19 +132,19 @@ return [
'notifications' => [
'notifications' => [
\Spatie\Backup\Notifications\Notifications\BackupHasFailedNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
\Spatie\Backup\Notifications\Notifications\UnhealthyBackupWasFoundNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
\Spatie\Backup\Notifications\Notifications\CleanupHasFailedNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
\Spatie\Backup\Notifications\Notifications\BackupWasSuccessfulNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
\Spatie\Backup\Notifications\Notifications\HealthyBackupWasFoundNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
\Spatie\Backup\Notifications\Notifications\CleanupWasSuccessfulNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
BackupHasFailedNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
UnhealthyBackupWasFoundNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
CleanupHasFailedNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
BackupWasSuccessfulNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
HealthyBackupWasFoundNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
CleanupWasSuccessfulNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
],
/*
* Here you can specify the notifiable to which the notifications should be sent. The default
* notifiable will use the variables specified in this config file.
*/
'notifiable' => \Spatie\Backup\Notifications\Notifiable::class,
'notifiable' => Notifiable::class,
'mail' => [
'to' => env('MAIL_BACKUP_NOTIFICATION_ADDRESS', null),
@@ -183,8 +194,8 @@ return [
'name' => config('app.name'),
'disks' => [env('PRIVATE_FILESYSTEM_DISK', 'local')],
'health_checks' => [
\Spatie\Backup\Tasks\Monitor\HealthChecks\MaximumAgeInDays::class => 1,
\Spatie\Backup\Tasks\Monitor\HealthChecks\MaximumStorageInMegabytes::class => 5000,
MaximumAgeInDays::class => 1,
MaximumStorageInMegabytes::class => 5000,
],
],
@@ -200,7 +211,7 @@ return [
* No matter how you configure it the default strategy will never
* delete the newest backup.
*/
'strategy' => \Spatie\Backup\Tasks\Cleanup\Strategies\DefaultStrategy::class,
'strategy' => DefaultStrategy::class,
'default_strategy' => [
config/cache.php
+1 -1
View File
@@ -51,7 +51,7 @@ return [
'file' => [
'driver' => 'file',
'path' => storage_path('framework/cache'),
'path' => storage_path('framework/cache'),
],
'memcached' => [
config/cors.php
+1 -4
View File
@@ -15,16 +15,13 @@
* set it to * to allow all. If there is a value, either a single url or a comma-delimited
* list of urls, explode that out into an array to whitelist just those urls.
*/
$allowed_origins = env('CORS_ALLOWED_ORIGINS') !== null ?
explode(',', env('CORS_ALLOWED_ORIGINS')) : [];
/**
* Original Laravel CORS package config file modifications end here
*
*/
return [
/*
@@ -36,7 +33,7 @@ return [
| to accept any value.
|
*/
'supports_credentials' => false,
'allowed_origins' => $allowed_origins,
'allowed_origins_patterns' => [],
config/database.php
+35 -37
View File
@@ -8,14 +8,13 @@
| be modified directly.
*/
// This is used by the mysql dump options in spatie backup
$dump_options = [
'dump_binary_path' => env('DB_DUMP_PATH', '/usr/local/bin'), // only the path, so without 'mysqldump'
'use_single_transaction' => false,
'timeout' => 60 * 5, // 5 minute timeout
//'exclude_tables' => ['table1', 'table2'],
//'add_extra_option' => '--optionname=optionvalue',
// 'exclude_tables' => ['table1', 'table2'],
// 'add_extra_option' => '--optionname=optionvalue',
];
// For modern versions of mysqldump, use --ssl-mode=DISABLED
@@ -24,7 +23,6 @@ if (env('DB_DUMP_SKIP_SSL') == 'true') {
$dump_options['add_extra_option'] = '--ssl-mode=DISABLED';
}
return [
/*
@@ -72,65 +70,65 @@ return [
'connections' => [
'sqlite' => [
'driver' => 'sqlite',
'driver' => 'sqlite',
'database' => database_path('database.sqlite'),
'prefix' => '',
'prefix' => '',
],
'sqlite_testing' => [
'driver' => 'sqlite',
'driver' => 'sqlite',
'database' => ':memory:',
'prefix' => '',
'prefix' => '',
],
'mysql' => [
'driver' => 'mysql',
'host' => env('DB_HOST', 'localhost'),
'port' => (int) env('DB_PORT', 3306),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'charset' => env('DB_CHARSET', 'utf8mb4'),
'driver' => 'mysql',
'host' => env('DB_HOST', 'localhost'),
'port' => (int) env('DB_PORT', 3306),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'charset' => env('DB_CHARSET', 'utf8mb4'),
'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'),
'prefix' => env('DB_PREFIX', null),
'strict' => false,
'engine' => 'InnoDB',
'prefix' => env('DB_PREFIX', null),
'strict' => false,
'engine' => 'InnoDB',
'unix_socket' => env('DB_SOCKET', ''),
'dump' => $dump_options,
'dump_command_timeout' => 60 * 5, // 5 minute timeout
'dump_using_single_transaction' => true, // perform dump using a single transaction
'options' => (env('DB_SSL')) ? ((env('DB_SSL_IS_PAAS')) ? [
PDO::MYSQL_ATTR_SSL_CA => env('DB_SSL_CA_PATH'), // /path/to/ca.pem
PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => env('DB_SSL_VERIFY_SERVER', false), //true/false
PDO::MYSQL_ATTR_SSL_CA => env('DB_SSL_CA_PATH'), // /path/to/ca.pem
PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => env('DB_SSL_VERIFY_SERVER', false), // true/false
] : [
PDO::MYSQL_ATTR_SSL_KEY => env('DB_SSL_KEY_PATH'), // /path/to/key.pem
PDO::MYSQL_ATTR_SSL_CERT => env('DB_SSL_CERT_PATH'), // /path/to/cert.pem
PDO::MYSQL_ATTR_SSL_CA => env('DB_SSL_CA_PATH'), // /path/to/ca.pem
PDO::MYSQL_ATTR_SSL_CIPHER => env('DB_SSL_CIPHER'),
PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => env('DB_SSL_VERIFY_SERVER', false), //true/false
PDO::MYSQL_ATTR_SSL_KEY => env('DB_SSL_KEY_PATH'), // /path/to/key.pem
PDO::MYSQL_ATTR_SSL_CERT => env('DB_SSL_CERT_PATH'), // /path/to/cert.pem
PDO::MYSQL_ATTR_SSL_CA => env('DB_SSL_CA_PATH'), // /path/to/ca.pem
PDO::MYSQL_ATTR_SSL_CIPHER => env('DB_SSL_CIPHER'),
PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => env('DB_SSL_VERIFY_SERVER', false), // true/false
]) : [],
],
'pgsql' => [
'driver' => 'pgsql',
'host' => env('DB_HOST', 'localhost'),
'port' => env('DB_PORT', '5432'),
'driver' => 'pgsql',
'host' => env('DB_HOST', 'localhost'),
'port' => env('DB_PORT', '5432'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'charset' => 'utf8',
'prefix' => '',
'schema' => 'public',
'charset' => 'utf8',
'prefix' => '',
'schema' => 'public',
],
'sqlsrv' => [
'driver' => 'sqlsrv',
'host' => env('DB_HOST', 'localhost'),
'driver' => 'sqlsrv',
'host' => env('DB_HOST', 'localhost'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'charset' => 'utf8',
'prefix' => '',
'charset' => 'utf8',
'prefix' => '',
],
],
@@ -164,9 +162,9 @@ return [
'cluster' => false,
'default' => [
'host' => env('REDIS_HOST', 'localhost'),
'host' => env('REDIS_HOST', 'localhost'),
'password' => env('REDIS_PASSWORD', null),
'port' => env('REDIS_PORT', 6379),
'port' => env('REDIS_PORT', 6379),
'database' => env('REDIS_DATABASE', 0),
],
config/debugbar.php
+1 -1
View File
@@ -96,7 +96,7 @@ return [
'db' => [
'with_params' => env('DEBUGBAR_OPTIONS_WITH_PARAMS', true), // Render SQL with the parameters substituted
'exclude_paths' => [ // Paths to exclude entirely from the collector
//'vendor/laravel/framework/src/Illuminate/Session', // Exclude sessions queries
// 'vendor/laravel/framework/src/Illuminate/Session', // Exclude sessions queries
],
'backtrace' => env('DEBUGBAR_OPTIONS_DB_BACKTRACE', true), // Use a backtrace to find the origin of the query in your files.
'backtrace_exclude_paths' => [], // Paths to exclude from backtrace. (in addition to defaults)
config/dompdf.php
+24 -25
View File
@@ -1,6 +1,6 @@
<?php
return array(
return [
/*
|--------------------------------------------------------------------------
@@ -17,7 +17,7 @@ return array(
* Dejavu Sans font is missing glyphs for converted entities, turn it off if you need to show € and £.
*/
'convert_entities' => false,
'defines' => array(
'defines' => [
/**
* The location of the DOMPDF font directory
*
@@ -42,7 +42,7 @@ return array(
* Times-Roman, Times-Bold, Times-BoldItalic, Times-Italic,
* Symbol, ZapfDingbats.
*/
"font_dir" => storage_path('fonts'), // advised by dompdf (https://github.com/dompdf/dompdf/pull/782)
'font_dir' => storage_path('fonts'), // advised by dompdf (https://github.com/dompdf/dompdf/pull/782)
/**
* The location of the DOMPDF font cache directory
@@ -52,7 +52,7 @@ return array(
*
* Note: This directory must exist and be writable by the webserver process.
*/
"font_cache" => storage_path('fonts'),
'font_cache' => storage_path('fonts'),
/**
* The location of a temporary directory.
@@ -61,7 +61,7 @@ return array(
* The temporary directory is required to download remote images and when
* using the PFDLib back end.
*/
"temp_dir" => sys_get_temp_dir(),
'temp_dir' => sys_get_temp_dir(),
/**
* ==== IMPORTANT ====
@@ -74,24 +74,23 @@ return array(
* This is only checked on command line call by dompdf.php, but not by
* direct class use like:
* $dompdf = new DOMPDF(); $dompdf->load_html($htmldata); $dompdf->render(); $pdfdata = $dompdf->output();
*
*
*
*
* Hardcoding 2 Paths needed for Docker Containers
*/
"chroot" => realpath(base_path()) . ",/var/lib/snipeit/data/uploads,/var/lib/snipeit/data/private_uploads",
'chroot' => realpath(base_path()).',/var/lib/snipeit/data/uploads,/var/lib/snipeit/data/private_uploads',
/**
* Whether to enable font subsetting or not.
*/
"enable_font_subsetting" => true,
'enable_font_subsetting' => true,
/**
* The PDF rendering backend to use
*
* Valid settings are 'PDFLib', 'CPDF' (the bundled R&OS PDF class), 'GD' and
* 'auto'. 'auto' will look for PDFLib and use it if found, or if not it will
* fall back on CPDF. 'GD' renders PDFs to graphic files. {@link
* Canvas_Factory} ultimately determines which rendering class to instantiate
* fall back on CPDF. 'GD' renders PDFs to graphic files. {@link * Canvas_Factory} ultimately determines which rendering class to instantiate
* based on this setting.
*
* Both PDFLib & CPDF rendering backends provide sufficient rendering
@@ -113,7 +112,7 @@ return array(
* @link http://www.ros.co.nz/pdf
* @link http://www.php.net/image
*/
"pdf_backend" => "CPDF",
'pdf_backend' => 'CPDF',
/**
* PDFlib license key
@@ -127,7 +126,7 @@ return array(
* If pdflib present in web server and auto or selected explicitely above,
* a real license code must exist!
*/
//"DOMPDF_PDFLIB_LICENSE" => "your license key here",
// "DOMPDF_PDFLIB_LICENSE" => "your license key here",
/**
* html target media view which should be rendered into pdf.
@@ -139,7 +138,7 @@ return array(
* the desired content might be different (e.g. screen or projection view of html file).
* Therefore allow specification of content here.
*/
"default_media_type" => "screen",
'default_media_type' => 'screen',
/**
* The default paper size.
@@ -148,15 +147,16 @@ return array(
*
* @see CPDF_Adapter::PAPER_SIZES for valid sizes ('letter', 'legal', 'A4', etc.)
*/
"default_paper_size" => "a4",
'default_paper_size' => 'a4',
/**
* The default font family
*
* Used if no suitable fonts can be found. This must exist in the font folder.
*
* @var string
*/
"default_font" => "serif",
'default_font' => 'serif',
/**
* Image DPI setting
@@ -191,7 +191,7 @@ return array(
*
* @var int
*/
"dpi" => 96,
'dpi' => 96,
/**
* Enable inline PHP
@@ -205,7 +205,7 @@ return array(
*
* @var bool
*/
"enable_php" => false,
'enable_php' => false,
/**
* Enable inline Javascript
@@ -215,7 +215,7 @@ return array(
*
* @var bool
*/
"enable_javascript" => true,
'enable_javascript' => true,
/**
* Enable remote file access
@@ -234,18 +234,17 @@ return array(
*
* @var bool
*/
"enable_remote" => true,
'enable_remote' => true,
/**
* A ratio applied to the fonts height to be more like browsers' line height
*/
"font_height_ratio" => 1.1,
'font_height_ratio' => 1.1,
/**
* Use the more-than-experimental HTML5 Lib parser
*/
"enable_html5_parser" => false,
),
'enable_html5_parser' => false,
],
);
];
config/filesystems.php
+12 -14
View File
@@ -65,8 +65,8 @@ $config = [
'url' => env('PUBLIC_AWS_URL'),
'endpoint' => env('PUBLIC_AWS_ENDPOINT'),
'use_path_style_endpoint' => env('PUBLIC_AWS_PATH_STYLE'),
'root' => env('PUBLIC_AWS_BUCKET_ROOT'),
'visibility' => 'public'
'root' => env('PUBLIC_AWS_BUCKET_ROOT'),
'visibility' => 'public',
],
's3_private' => [
@@ -82,18 +82,18 @@ $config = [
'url' => env('PRIVATE_AWS_URL'),
'endpoint' => env('PRIVATE_AWS_ENDPOINT'),
'use_path_style_endpoint' => env('PRIVATE_AWS_PATH_STYLE'),
'root' => env('PRIVATE_AWS_BUCKET_ROOT'),
'visibility' => 'private'
'root' => env('PRIVATE_AWS_BUCKET_ROOT'),
'visibility' => 'private',
],
'rackspace' => [
'driver' => 'rackspace',
'username' => env('RACKSPACE_USERNAME'),
'key' => env('RACKSPACE_KEY'),
'driver' => 'rackspace',
'username' => env('RACKSPACE_USERNAME'),
'key' => env('RACKSPACE_KEY'),
'container' => env('RACKSPACE_CONTAINER'),
'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/',
'region' => env('RACKSPACE_REGION'),
'url_type' => env('RACKSPACE_URL_TYPE'),
'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/',
'region' => env('RACKSPACE_REGION'),
'url_type' => env('RACKSPACE_URL_TYPE'),
],
'backup' => [
@@ -103,15 +103,14 @@ $config = [
],
];
// copy the selected PUBLIC_FILESYSTEM_DISK's configuration to the 'public' key for easy use
// (by default, the PUBLIC_FILESYSTEM DISK is 'local_public', in the public/uploads directory)
$config['disks']['public'] = $config['disks'][env('PUBLIC_FILESYSTEM_DISK','local_public')];
$config['disks']['public'] = $config['disks'][env('PUBLIC_FILESYSTEM_DISK', 'local_public')];
// This is used to determine which files to accept, and also to populate the language strings for the upload-file blade
$config['allowed_upload_extensions_array'] = [
$config['allowed_upload_extensions_array'] = [
'avif',
'doc',
'doc',
@@ -146,7 +145,6 @@ $config['allowed_upload_extensions_array'] = [
'zip',
];
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/MIME_types/Common_types
$config['allowed_upload_mimetypes_array'] = [
'application/json',
config/google2fa.php
+7 -5
View File
@@ -1,5 +1,7 @@
<?php
use PragmaRX\Google2FALaravel\Support\Constants;
return [
/*
@@ -38,7 +40,7 @@ return [
/*
* One Time Password request input name.
*/
'otp_input' => 'one_time_password', //should this be 'two_factor_secret'?
'otp_input' => 'one_time_password', // should this be 'two_factor_secret'?
/*
* One Time Password Window.
@@ -58,15 +60,15 @@ return [
/*
* One Time Password View.
*/
'view' => 'google2fa.index', //should this be 'auth.two_factor_enroll'?
'view' => 'google2fa.index', // should this be 'auth.two_factor_enroll'?
/*
* One Time Password error message.
*/
'error_messages' => [
'wrong_otp' => "The 'One Time Password' typed was wrong.",
'wrong_otp' => "The 'One Time Password' typed was wrong.",
'cannot_be_empty' => 'One Time Password cannot be empty.',
'unknown' => 'An unknown error has occurred. Please try again.',
'unknown' => 'An unknown error has occurred. Please try again.',
],
/*
@@ -79,6 +81,6 @@ return [
*
* Supports imagemagick, svg and eps
*/
'qrcode_image_backend' => \PragmaRX\Google2FALaravel\Support\Constants::QRCODE_IMAGE_BACKEND_SVG,
'qrcode_image_backend' => Constants::QRCODE_IMAGE_BACKEND_SVG,
];
config/image.php
+1 -1
View File
@@ -23,6 +23,6 @@ return [
|
*/
'driver' => env('IMAGE_LIB', 'gd'),
'driver' => env('IMAGE_LIB', 'gd'),
];
config/insights.php
+5 -5
View File
@@ -105,11 +105,11 @@ return [
*/
'requirements' => [
// 'min-quality' => 0,
// 'min-complexity' => 0,
// 'min-architecture' => 0,
// 'min-style' => 0,
// 'disable-security-check' => false,
// 'min-quality' => 0,
// 'min-complexity' => 0,
// 'min-architecture' => 0,
// 'min-style' => 0,
// 'disable-security-check' => false,
],
/*
config/logging.php
+18 -13
View File
@@ -1,8 +1,11 @@
<?php
use Illuminate\Support\Facades\Log;
use Monolog\Handler\NullHandler;
use Monolog\Handler\StreamHandler;
use Monolog\Handler\SyslogUdpHandler;
use Illuminate\Support\Facades\Log;
use Rollbar\ErrorWrapper;
use Rollbar\Laravel\MonologHandler;
$config = [
@@ -105,12 +108,12 @@ $config = [
'scimtrace' => [
'driver' => 'single',
'path' => storage_path('logs/scim.log')
'path' => storage_path('logs/scim.log'),
],
'rollbar' => [
'driver' => 'monolog',
'handler' => \Rollbar\Laravel\MonologHandler::class,
'handler' => MonologHandler::class,
'access_token' => env('ROLLBAR_TOKEN'),
'level' => env('ROLLBAR_LEVEL', 'error'),
],
@@ -118,33 +121,35 @@ $config = [
];
if ((env('APP_ENV')=='production') && (env('ROLLBAR_TOKEN'))) {
if ((env('APP_ENV') == 'production') && (env('ROLLBAR_TOKEN'))) {
// Only add rollbar if the .env has a rollbar token
$config['channels']['stack']['channels'] = ['single', 'rollbar'];
// and only add the rollbar filter under the same conditions
// Note: it will *not* be cacheable
$config['channels']['rollbar']['check_ignore'] = function ($isUncaught, $args, $payload) {
if (App::environment('production') && is_object($args) && get_class($args) == Rollbar\ErrorWrapper::class && $args->errorLevel == E_WARNING ) {
Log::info("IGNORING E_WARNING in production mode: ".$args->getMessage());
if (App::environment('production') && is_object($args) && get_class($args) == ErrorWrapper::class && $args->errorLevel == E_WARNING) {
Log::info('IGNORING E_WARNING in production mode: '.$args->getMessage());
return true; // "TRUE - you should ignore it!"
}
$needle = "ArieTimmerman\\Laravel\\SCIMServer\\Exceptions\\SCIMException";
if (App::environment('production') && is_string($args) && strncmp($args, $needle, strlen($needle) ) === 0 ) {
$needle = 'ArieTimmerman\\Laravel\\SCIMServer\\Exceptions\\SCIMException';
if (App::environment('production') && is_string($args) && strncmp($args, $needle, strlen($needle)) === 0) {
Log::info("String: '$args' looks like a SCIM Exception; ignoring error");
return true; //yes, *do* ignore it
return true; // yes, *do* ignore it
}
return false;
};
}
if (env('LOG_DEPRECATIONS')=='true') {
if (env('LOG_DEPRECATIONS') == 'true') {
$config['channels']['deprecations'] = [
'driver' => 'single',
'path' => storage_path('logs/deprecations.log')
'path' => storage_path('logs/deprecations.log'),
];
}
return $config;
return $config;
config/mail.php
+1 -3
View File
@@ -10,7 +10,6 @@
return [
/*
| ***************************************************************************
| DO NOT MAKE CHANGES DIRECTLY TO THIS FILE.
@@ -46,7 +45,7 @@ return [
|
*/
'default' => env('MAIL_DRIVER') != null ? env('MAIL_DRIVER') : env('MAIL_MAILER', 'smtp'),
'default' => env('MAIL_DRIVER') != null ? env('MAIL_DRIVER') : env('MAIL_MAILER', 'smtp'),
/*
|--------------------------------------------------------------------------
@@ -83,7 +82,6 @@ return [
*/
'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
/*
|--------------------------------------------------------------------------
| SMTP Host Port
config/pdf.php
+14 -14
View File
@@ -1,17 +1,17 @@
<?php
return [
'mode' => 'utf-8',
'format' => 'A4',
'author' => '',
'subject' => '',
'keywords' => '',
'creator' => 'Snipe-IT',
'display_mode' => 'fullpage',
'tempDir' => base_path('../temp/'),
'pdf_a' => false,
'pdf_a_auto' => false,
'icc_profile_path' => '',
'defaultCssFile' => false,
'pdfWrapper' => 'misterspelik\LaravelPdf\Wrapper\PdfWrapper',
];
'mode' => 'utf-8',
'format' => 'A4',
'author' => '',
'subject' => '',
'keywords' => '',
'creator' => 'Snipe-IT',
'display_mode' => 'fullpage',
'tempDir' => base_path('../temp/'),
'pdf_a' => false,
'pdf_a_auto' => false,
'icc_profile_path' => '',
'defaultCssFile' => false,
'pdfWrapper' => 'misterspelik\LaravelPdf\Wrapper\PdfWrapper',
];
config/permissions.php
+95 -101
View File
@@ -6,83 +6,81 @@
|--------------------------------------------------------------------------
*/
return [
'Superuser' => [
[
'permission' => 'superuser',
'display' => true,
'display' => true,
],
],
'Admin' => [
[
'permission' => 'admin',
'display' => true,
'display' => true,
],
],
'Import' => [
[
'permission' => 'import',
'display' => true,
'display' => true,
],
],
'Reports' => [
[
'permission' => 'reports.view',
'display' => true,
'display' => true,
],
],
'Assets' => [
[
'permission' => 'assets.view',
'display' => true,
'display' => true,
],
[
'permission' => 'assets.create',
'display' => true,
'display' => true,
],
[
'permission' => 'assets.edit',
'display' => true,
'display' => true,
],
[
'permission' => 'assets.delete',
'display' => true,
'display' => true,
],
[
'permission' => 'assets.checkout',
'display' => false,
'display' => false,
],
[
'permission' => 'assets.checkin',
'display' => true,
'display' => true,
],
[
'permission' => 'assets.checkout',
'display' => true,
'display' => true,
],
[
'permission' => 'assets.audit',
'display' => true,
'display' => true,
],
[
'permission' => 'assets.view.requestable',
'display' => true,
'display' => true,
],
[
'permission' => 'assets.view.encrypted_custom_fields',
'display' => true,
'display' => true,
],
],
@@ -90,31 +88,31 @@ return [
'Accessories' => [
[
'permission' => 'accessories.view',
'display' => true,
'display' => true,
],
[
'permission' => 'accessories.create',
'display' => true,
'display' => true,
],
[
'permission' => 'accessories.edit',
'display' => true,
'display' => true,
],
[
'permission' => 'accessories.delete',
'display' => true,
'display' => true,
],
[
'permission' => 'accessories.checkout',
'display' => true,
'display' => true,
],
[
'permission' => 'accessories.checkin',
'display' => true,
'display' => true,
],
[
'permission' => 'accessories.files',
'display' => true,
'display' => true,
],
],
@@ -122,95 +120,93 @@ return [
'Consumables' => [
[
'permission' => 'consumables.view',
'display' => true,
'display' => true,
],
[
'permission' => 'consumables.create',
'display' => true,
'display' => true,
],
[
'permission' => 'consumables.edit',
'display' => true,
'display' => true,
],
[
'permission' => 'consumables.delete',
'display' => true,
'display' => true,
],
[
'permission' => 'consumables.checkout',
'display' => true,
'display' => true,
],
[
'permission' => 'consumables.files',
'display' => true,
'display' => true,
],
],
'Licenses' => [
[
'permission' => 'licenses.view',
'display' => true,
'display' => true,
],
[
'permission' => 'licenses.create',
'display' => true,
'display' => true,
],
[
'permission' => 'licenses.edit',
'display' => true,
'display' => true,
],
[
'permission' => 'licenses.delete',
'display' => true,
'display' => true,
],
[
'permission' => 'licenses.checkout',
'display' => true,
'display' => true,
],
[
'permission' => 'licenses.checkin',
'display' => true,
'display' => true,
],
[
'permission' => 'licenses.keys',
'display' => true,
'display' => true,
],
[
'permission' => 'licenses.files',
'display' => true,
'display' => true,
],
],
'Components' => [
[
'permission' => 'components.view',
'display' => true,
'display' => true,
],
[
'permission' => 'components.create',
'display' => true,
'display' => true,
],
[
'permission' => 'components.edit',
'display' => true,
'display' => true,
],
[
'permission' => 'components.delete',
'display' => true,
'display' => true,
],
[
'permission' => 'components.checkout',
'display' => true,
'display' => true,
],
[
'permission' => 'components.checkin',
'display' => true,
'display' => true,
],
[
'permission' => 'components.files',
'display' => true,
'display' => true,
],
],
@@ -218,38 +214,38 @@ return [
'Kits' => [
[
'permission' => 'kits.view',
'display' => true,
'display' => true,
],
[
'permission' => 'kits.create',
'display' => true,
'display' => true,
],
[
'permission' => 'kits.edit',
'display' => true,
'display' => true,
],
[
'permission' => 'kits.delete',
'display' => true,
'display' => true,
],
],
'Users' => [
[
'permission' => 'users.view',
'display' => true,
'display' => true,
],
[
'permission' => 'users.create',
'display' => true,
'display' => true,
],
[
'permission' => 'users.edit',
'display' => true,
'display' => true,
],
[
'permission' => 'users.delete',
'display' => true,
'display' => true,
],
],
@@ -257,19 +253,19 @@ return [
'Models' => [
[
'permission' => 'models.view',
'display' => true,
'display' => true,
],
[
'permission' => 'models.create',
'display' => true,
'display' => true,
],
[
'permission' => 'models.edit',
'display' => true,
'display' => true,
],
[
'permission' => 'models.delete',
'display' => true,
'display' => true,
],
],
@@ -277,200 +273,198 @@ return [
'Categories' => [
[
'permission' => 'categories.view',
'display' => true,
'display' => true,
],
[
'permission' => 'categories.create',
'display' => true,
'display' => true,
],
[
'permission' => 'categories.edit',
'display' => true,
'display' => true,
],
[
'permission' => 'categories.delete',
'display' => true,
'display' => true,
],
],
'Departments' => [
[
'permission' => 'departments.view',
'display' => true,
'display' => true,
],
[
'permission' => 'departments.create',
'display' => true,
'display' => true,
],
[
'permission' => 'departments.edit',
'display' => true,
'display' => true,
],
[
'permission' => 'departments.delete',
'display' => true,
'display' => true,
],
],
'Status Labels' => [
[
'permission' => 'statuslabels.view',
'display' => true,
'display' => true,
],
[
'permission' => 'statuslabels.create',
'display' => true,
'display' => true,
],
[
'permission' => 'statuslabels.edit',
'display' => true,
'display' => true,
],
[
'permission' => 'statuslabels.delete',
'display' => true,
'display' => true,
],
],
'Custom Fields' => [
[
'permission' => 'customfields.view',
'display' => true,
'display' => true,
],
[
'permission' => 'customfields.create',
'display' => true,
'display' => true,
],
[
'permission' => 'customfields.edit',
'display' => true,
'display' => true,
],
[
'permission' => 'customfields.delete',
'display' => true,
'display' => true,
],
],
'Suppliers' => [
[
'permission' => 'suppliers.view',
'display' => true,
'display' => true,
],
[
'permission' => 'suppliers.create',
'display' => true,
'display' => true,
],
[
'permission' => 'suppliers.edit',
'display' => true,
'display' => true,
],
[
'permission' => 'suppliers.delete',
'display' => true,
'display' => true,
],
],
'Manufacturers' => [
[
'permission' => 'manufacturers.view',
'display' => true,
'display' => true,
],
[
'permission' => 'manufacturers.create',
'display' => true,
'display' => true,
],
[
'permission' => 'manufacturers.edit',
'display' => true,
'display' => true,
],
[
'permission' => 'manufacturers.delete',
'display' => true,
'display' => true,
],
],
'Depreciations' => [
[
'permission' => 'depreciations.view',
'display' => true,
'display' => true,
],
[
'permission' => 'depreciations.create',
'display' => true,
'display' => true,
],
[
'permission' => 'depreciations.edit',
'display' => true,
'display' => true,
],
[
'permission' => 'depreciations.delete',
'display' => true,
'display' => true,
],
],
'Locations' => [
[
'permission' => 'locations.view',
'display' => true,
'display' => true,
],
[
'permission' => 'locations.create',
'display' => true,
'display' => true,
],
[
'permission' => 'locations.edit',
'display' => true,
'display' => true,
],
[
'permission' => 'locations.delete',
'display' => true,
'display' => true,
],
],
'Companies' => [
[
'permission' => 'companies.view',
'display' => true,
'display' => true,
],
[
'permission' => 'companies.create',
'display' => true,
'display' => true,
],
[
'permission' => 'companies.edit',
'display' => true,
'display' => true,
],
[
'permission' => 'companies.delete',
'display' => true,
'display' => true,
],
],
'User (Self) Accounts' => [
[
'permission' => 'self.two_factor',
'display' => true,
'display' => true,
],
[
'permission' => 'self.api',
'display' => true,
'display' => true,
],
[
'permission' => 'self.edit_location',
'display' => true,
'display' => true,
],
[
'permission' => 'self.checkout_assets',
'display' => true,
'display' => true,
],
[
'permission' => 'self.view_purchase_cost',
'display' => true,
'display' => true,
],
],
config/scim.php
+3 -3
View File
@@ -1,8 +1,8 @@
<?php
return [
"trace" => env("SCIM_TRACE",false),
'trace' => env('SCIM_TRACE', false),
// below, if we ever get 'sure' that we can change this default to 'true' we should
"omit_main_schema_in_return" => env('SCIM_STANDARDS_COMPLIANCE', true),
"publish_routes" => false,
'omit_main_schema_in_return' => env('SCIM_STANDARDS_COMPLIANCE', true),
'publish_routes' => false,
];
config/services.php
+4 -2
View File
@@ -1,5 +1,7 @@
<?php
use App\User;
/*
|--------------------------------------------------------------------------
| DO NOT EDIT THIS FILE DIRECTLY.
@@ -39,8 +41,8 @@ return [
],
'stripe' => [
'model' => App\User::class,
'key' => env('STRIPE_KEY'),
'model' => User::class,
'key' => env('STRIPE_KEY'),
'secret' => env('STRIPE_SECRET'),
],
config/session.php
-1
View File
@@ -174,7 +174,6 @@ return [
'bs_table_storage' => env('BS_TABLE_STORAGE', 'localStorage'),
/*
|--------------------------------------------------------------------------
| Bootstrap Table Enable Deeplinking
config/trustedproxy.php
+1 -1
View File
@@ -57,6 +57,6 @@ return [
*
* @link https://symfony.com/doc/current/deployment/proxies.html
*/
// 'headers' => Illuminate\Http\Request::HEADER_X_FORWARDED_ALL, //this is mostly handled already
// 'headers' => Illuminate\Http\Request::HEADER_X_FORWARDED_ALL, //this is mostly handled already
];
config/version.php
+10 -9
View File
@@ -1,10 +1,11 @@
<?php
return array (
'app_version' => 'v8.4.0',
'full_app_version' => 'v8.4.0 - build 21280-g91a95dbc6',
'build_version' => '21280',
'prerelease_version' => '',
'hash_version' => 'g91a95dbc6',
'full_hash' => 'v8.4.0-475-g91a95dbc6',
'branch' => 'develop',
);
return [
'app_version' => 'v8.4.0',
'full_app_version' => 'v8.4.0 - build 21280-g91a95dbc6',
'build_version' => '21280',
'prerelease_version' => '',
'hash_version' => 'g91a95dbc6',
'full_hash' => 'v8.4.0-475-g91a95dbc6',
'branch' => 'develop',
];