mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Run all config files through ArrayFile parser

Browse Source 
This will minimize changes when ConfigWriter is used to set config values through PHP.
This commit is contained in:
Luke Towers 2022-03-16 10:55:07 -06:00
parent cd9f9097e8
commit c137760498
17 changed files with 165 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/app.php
View File

@ -231,7 +231,6 @@ return [
*/
'key' => env('APP_KEY'),
'cipher' => 'AES-256-CBC',
/*
@ -284,9 +283,6 @@ return [
*/
'aliases' => array_merge(include(base_path('modules/system/aliases.php')), [
// 'Str' => 'Illuminate\Support\Str', // Example
]),
];

3
config/auth.php
View File

@ -1,8 +1,8 @@
<?php
return [
'throttle' => [
/*
|--------------------------------------------------------------------------
| Enable throttling of Backend authentication attempts
@ -38,5 +38,4 @@ return [
'suspensionTime' => 15,
],
];

23
config/broadcasting.php
View File

@ -29,39 +29,32 @@ return [
*/
'connections' => [
'pusher' => [
'app_id' => env('PUSHER_APP_ID'),
'app_id' => env('PUSHER_APP_ID'),
'client_options' => [
// Guzzle client options: https://docs.guzzlephp.org/en/stable/request-options.html
],
'driver' => 'pusher',
'key' => env('PUSHER_APP_KEY'),
'options' => [
'driver' => 'pusher',
'key' => env('PUSHER_APP_KEY'),
'options' => [
'cluster' => env('PUSHER_APP_CLUSTER'),
'useTLS' => true,
'useTLS' => true,
],
'secret' => env('PUSHER_APP_SECRET'),
'secret' => env('PUSHER_APP_SECRET'),
],
'ably' => [
'driver' => 'ably',
'key' => env('ABLY_KEY'),
'key' => env('ABLY_KEY'),
],
'redis' => [
'connection' => 'default',
'driver' => 'redis',
'driver' => 'redis',
],
'log' => [
'driver' => 'log',
],
'null' => [
'driver' => 'null',
],
],
];

42
config/cache.php
View File

@ -35,31 +35,26 @@ return [
*/
'stores' => [
'apc' => [
'driver' => 'apc',
],
'array' => [
'driver' => 'array',
'driver' => 'array',
'serialize' => false,
],
'database' => [
'connection' => null,
'driver' => 'database',
'connection' => null,
'driver' => 'database',
'lock_connection' => null,
'table' => 'cache',
'table' => 'cache',
],
'file' => [
'driver' => 'file',
'path' => storage_path('framework/cache'),
'path' => storage_path('framework/cache'),
],
'memcached' => [
'driver' => 'memcached',
'options' => [
'driver' => 'memcached',
'options' => [
// Memcached::OPT_CONNECT_TIMEOUT => 2000,
],
'persistent_id' => env('MEMCACHED_PERSISTENT_ID'),
@ -67,7 +62,7 @@ return [
env('MEMCACHED_USERNAME'),
env('MEMCACHED_PASSWORD'),
],
'servers' => [
'servers' => [
[
'host' => env('MEMCACHED_HOST', '127.0.0.1'),
'port' => env('MEMCACHED_PORT', 11211),
@ -75,26 +70,22 @@ return [
],
],
],
'redis' => [
'connection' => 'cache',
'driver' => 'redis',
'connection' => 'cache',
'driver' => 'redis',
'lock_connection' => 'default',
],
'dynamodb' => [
'driver' => 'dynamodb',
'driver' => 'dynamodb',
'endpoint' => env('DYNAMODB_ENDPOINT'),
'key' => env('AWS_ACCESS_KEY_ID'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'table' => env('DYNAMODB_CACHE_TABLE', 'cache'),
'key' => env('AWS_ACCESS_KEY_ID'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'table' => env('DYNAMODB_CACHE_TABLE', 'cache'),
],
'octane' => [
'driver' => 'octane',
],
],
/*
@ -108,7 +99,7 @@ return [
|
*/
'prefix' => env('CACHE_PREFIX', str_slug(env('APP_NAME', 'winter'), '_').'_cache'),
'prefix' => env('CACHE_PREFIX', str_slug(env('APP_NAME', 'winter'), '_') . '_cache'),
/*
|--------------------------------------------------------------------------
@ -145,5 +136,4 @@ return [
*/
'disableRequestCache' => null,
];

30
config/cms.php
View File

@ -117,7 +117,11 @@ return [
|
*/
'loadModules' => ['System', 'Backend', 'Cms'],
'loadModules' => [
'System',
'Backend',
'Cms',
],
/*
|--------------------------------------------------------------------------
@ -312,26 +316,22 @@ return [
*/
'storage' => [
'uploads' => [
'disk' => 'local',
'folder' => 'uploads',
'path' => '/storage/app/uploads',
'disk' => 'local',
'folder' => 'uploads',
'path' => '/storage/app/uploads',
'temporaryUrlTTL' => 3600,
],
'media' => [
'disk' => 'local',
'disk' => 'local',
'folder' => 'media',
'path' => '/storage/app/media',
'path' => '/storage/app/media',
],
'resized' => [
'disk' => 'local',
'disk' => 'local',
'folder' => 'resized',
'path' => '/storage/app/resized',
'path' => '/storage/app/resized',
],
],
/*
@ -371,7 +371,10 @@ return [
|
*/
'defaultMask' => ['file' => null, 'folder' => null],
'defaultMask' => [
'file' => null,
'folder' => null,
],
/*
|--------------------------------------------------------------------------
@ -466,5 +469,4 @@ return [
*/
'enableBackendServiceWorkers' => false,
];

1
config/cookie.php
View File

@ -17,5 +17,4 @@ return [
'unencryptedCookies' => [
// 'my_cookie',
],
];

101
config/database.php
View File

@ -31,63 +31,58 @@ return [
*/
'connections' => [
'sqlite' => [
'database' => env('DB_DATABASE', storage_path('database.sqlite')),
'driver' => 'sqlite',
'database' => env('DB_DATABASE', storage_path('database.sqlite')),
'driver' => 'sqlite',
'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
'prefix' => '',
'url' => env('DATABASE_URL'),
'prefix' => '',
'url' => env('DATABASE_URL'),
],
'mysql' => [
'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci',
'database' => env('DB_DATABASE', 'winter'),
'driver' => 'mysql',
'engine' => 'InnoDB',
'host' => env('DB_HOST', '127.0.0.1'),
'options' => extension_loaded('pdo_mysql') ? array_filter([
'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci',
'database' => env('DB_DATABASE', 'winter'),
'driver' => 'mysql',
'engine' => 'InnoDB',
'host' => env('DB_HOST', '127.0.0.1'),
'options' => extension_loaded('pdo_mysql') ? array_filter([
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
]) : [],
'password' => env('DB_PASSWORD', ''),
'port' => env('DB_PORT', '3306'),
'prefix' => '',
'password' => env('DB_PASSWORD', ''),
'port' => env('DB_PORT', '3306'),
'prefix' => '',
'prefix_indexes' => true,
'strict' => true,
'unix_socket' => env('DB_SOCKET', ''),
'url' => env('DATABASE_URL'),
'username' => env('DB_USERNAME', 'winter'),
'strict' => true,
'unix_socket' => env('DB_SOCKET', ''),
'url' => env('DATABASE_URL'),
'username' => env('DB_USERNAME', 'winter'),
],
'pgsql' => [
'charset' => 'utf8',
'database' => env('DB_DATABASE', 'winter'),
'driver' => 'pgsql',
'host' => env('DB_HOST', '127.0.0.1'),
'password' => env('DB_PASSWORD', ''),
'port' => env('DB_PORT', '5432'),
'prefix' => '',
'charset' => 'utf8',
'database' => env('DB_DATABASE', 'winter'),
'driver' => 'pgsql',
'host' => env('DB_HOST', '127.0.0.1'),
'password' => env('DB_PASSWORD', ''),
'port' => env('DB_PORT', '5432'),
'prefix' => '',
'prefix_indexes' => true,
'search_path' => 'public',
'sslmode' => 'prefer',
'url' => env('DATABASE_URL'),
'username' => env('DB_USERNAME', 'winter'),
'search_path' => 'public',
'sslmode' => 'prefer',
'url' => env('DATABASE_URL'),
'username' => env('DB_USERNAME', 'winter'),
],
'sqlsrv' => [
'charset' => 'utf8',
'database' => env('DB_DATABASE', 'winter'),
'driver' => 'sqlsrv',
'host' => env('DB_HOST', '127.0.0.1'),
'password' => env('DB_PASSWORD', ''),
'port' => env('DB_PORT', '1433'),
'prefix' => '',
'charset' => 'utf8',
'database' => env('DB_DATABASE', 'winter'),
'driver' => 'sqlsrv',
'host' => env('DB_HOST', '127.0.0.1'),
'password' => env('DB_PASSWORD', ''),
'port' => env('DB_PORT', '1433'),
'prefix' => '',
'prefix_indexes' => true,
'url' => env('DATABASE_URL'),
'username' => env('DB_USERNAME', 'winter'),
'url' => env('DATABASE_URL'),
'username' => env('DB_USERNAME', 'winter'),
],
],
/*
@ -115,30 +110,24 @@ return [
*/
'redis' => [
'client' => env('REDIS_CLIENT', 'phpredis'),
'options' => [
'cluster' => env('REDIS_CLUSTER', 'redis'),
'prefix' => env('REDIS_PREFIX', str_slug(env('APP_NAME', 'winter'), '_').'_database_'),
'prefix' => env('REDIS_PREFIX', str_slug(env('APP_NAME', 'winter'), '_') . '_database_'),
],
'default' => [
'database' => env('REDIS_DB', '0'),
'host' => env('REDIS_HOST', '127.0.0.1'),
'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => env('REDIS_PASSWORD'),
'port' => env('REDIS_PORT', '6379'),
'url' => env('REDIS_URL'),
'port' => env('REDIS_PORT', '6379'),
'url' => env('REDIS_URL'),
],
'cache' => [
'database' => env('REDIS_CACHE_DB', '1'),
'host' => env('REDIS_HOST', '127.0.0.1'),
'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => env('REDIS_PASSWORD'),
'port' => env('REDIS_PORT', '6379'),
'url' => env('REDIS_URL'),
'port' => env('REDIS_PORT', '6379'),
'url' => env('REDIS_URL'),
],
],
];

1
config/develop.php
View File

@ -42,5 +42,4 @@ return [
*/
'allowDeepSymlinks' => false,
];

3
config/environment.php
View File

@ -27,9 +27,6 @@ return [
*/
'hosts' => [
'localhost' => 'dev',
],
];

22
config/filesystems.php
View File

@ -29,24 +29,20 @@ return [
*/
'disks' => [
'local' => [
'driver' => 'local',
'root' => storage_path('app'),
'url' => '/storage/app',
'root' => storage_path('app'),
'url' => '/storage/app',
],
's3' => [
'bucket' => env('AWS_BUCKET'),
'driver' => 's3',
'endpoint' => env('AWS_ENDPOINT'),
'key' => env('AWS_ACCESS_KEY_ID'),
'region' => env('AWS_DEFAULT_REGION'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'url' => env('AWS_URL'),
'bucket' => env('AWS_BUCKET'),
'driver' => 's3',
'endpoint' => env('AWS_ENDPOINT'),
'key' => env('AWS_ACCESS_KEY_ID'),
'region' => env('AWS_DEFAULT_REGION'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'url' => env('AWS_URL'),
'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
],
],
];

5
config/hashing.php
View File

@ -44,9 +44,8 @@ return [
*/
'argon' => [
'memory' => 65536,
'memory' => 65536,
'threads' => 1,
'time' => 4,
'time' => 4,
],
];

60
config/logging.php
View File

@ -45,71 +45,63 @@ return [
'channels' => [
'stack' => [
'channels' => ['single'],
'driver' => 'stack',
'channels' => [
'single',
],
'driver' => 'stack',
'ignore_exceptions' => false,
],
'single' => [
'driver' => 'single',
'level' => env('LOG_LEVEL', 'debug'),
'path' => storage_path('logs/system.log'),
'level' => env('LOG_LEVEL', 'debug'),
'path' => storage_path('logs/system.log'),
],
'daily' => [
'days' => 14,
'days' => 14,
'driver' => 'daily',
'level' => env('LOG_LEVEL', 'debug'),
'path' => storage_path('logs/system.log'),
'level' => env('LOG_LEVEL', 'debug'),
'path' => storage_path('logs/system.log'),
],
'slack' => [
'driver' => 'slack',
'emoji' => ':boom:',
'level' => env('LOG_LEVEL', 'critical'),
'url' => env('LOG_SLACK_WEBHOOK_URL'),
'driver' => 'slack',
'emoji' => ':boom:',
'level' => env('LOG_LEVEL', 'critical'),
'url' => env('LOG_SLACK_WEBHOOK_URL'),
'username' => 'Winter Log',
],
'papertrail' => [
'driver' => 'monolog',
'handler' => env('LOG_PAPERTRAIL_HANDLER', \Monolog\Handler\SyslogUdpHandler::class),
'driver' => 'monolog',
'handler' => env('LOG_PAPERTRAIL_HANDLER', \Monolog\Handler\SyslogUdpHandler::class),
'handler_with' => [
'connectionString' => 'tls://'.env('PAPERTRAIL_URL').':'.env('PAPERTRAIL_PORT'),
'host' => env('PAPERTRAIL_URL'),
'port' => env('PAPERTRAIL_PORT'),
'connectionString' => 'tls://' . env('PAPERTRAIL_URL') . ':' . env('PAPERTRAIL_PORT'),
'host' => env('PAPERTRAIL_URL'),
'port' => env('PAPERTRAIL_PORT'),
],
'level' => env('LOG_LEVEL', 'debug'),
'level' => env('LOG_LEVEL', 'debug'),
],
'stderr' => [
'driver' => 'monolog',
'driver' => 'monolog',
'formatter' => env('LOG_STDERR_FORMATTER'),
'handler' => \Monolog\Handler\StreamHandler::class,
'level' => env('LOG_LEVEL', 'debug'),
'with' => [
'handler' => \Monolog\Handler\StreamHandler::class,
'level' => env('LOG_LEVEL', 'debug'),
'with' => [
'stream' => 'php://stderr',
],
],
'syslog' => [
'driver' => 'syslog',
'level' => env('LOG_LEVEL', 'debug'),
'level' => env('LOG_LEVEL', 'debug'),
],
'errorlog' => [
'driver' => 'errorlog',
'level' => env('LOG_LEVEL', 'debug'),
'level' => env('LOG_LEVEL', 'debug'),
],
'null' => [
'driver' => 'monolog',
'driver' => 'monolog',
'handler' => \Monolog\Handler\NullHandler::class,
],
'emergency' => [
'path' => storage_path('logs/system.log'),
],
],
];

28
config/mail.php
View File

@ -36,42 +36,35 @@ return [
'mailers' => [
'smtp' => [
'encryption' => env('MAIL_ENCRYPTION', 'tls'),
'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
'password' => env('MAIL_PASSWORD'),
'port' => env('MAIL_PORT', 587),
'timeout' => null,
'transport' => 'smtp',
'username' => env('MAIL_USERNAME'),
'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
'password' => env('MAIL_PASSWORD'),
'port' => env('MAIL_PORT', 587),
'timeout' => null,
'transport' => 'smtp',
'username' => env('MAIL_USERNAME'),
],
'ses' => [
'transport' => 'ses',
],
'mailgun' => [
'transport' => 'mailgun',
],
'postmark' => [
'transport' => 'postmark',
],
'sendmail' => [
'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -t -i'),
'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -t -i'),
'transport' => 'sendmail',
],
'log' => [
'channel' => env('MAIL_LOG_CHANNEL'),
'channel' => env('MAIL_LOG_CHANNEL'),
'transport' => 'log',
],
'array' => [
'transport' => 'array',
],
'failover' => [
'mailers' => [
'mailers' => [
'smtp',
'log',
],
@ -92,7 +85,6 @@ return [
'from' => [
'address' => env('MAIL_FROM_ADDRESS', 'noreply@example.com'),
'name' => env('MAIL_FROM_NAME', env('APP_NAME', 'Winter CMS')),
'name' => env('MAIL_FROM_NAME', env('APP_NAME', 'Winter CMS')),
],
];

53
config/queue.php
View File

@ -29,48 +29,42 @@ return [
*/
'connections' => [
'sync' => [
'driver' => 'sync',
],
'database' => [
'after_commit' => false,
'driver' => 'database',
'queue' => 'default',
'retry_after' => 90,
'table' => 'jobs',
'driver' => 'database',
'queue' => 'default',
'retry_after' => 90,
'table' => 'jobs',
],
'beanstalkd' => [
'after_commit' => false,
'block_for' => 0,
'driver' => 'beanstalkd',
'host' => 'localhost',
'queue' => 'default',
'retry_after' => 90,
'block_for' => 0,
'driver' => 'beanstalkd',
'host' => 'localhost',
'queue' => 'default',
'retry_after' => 90,
],
'sqs' => [
'after_commit' => false,
'driver' => 'sqs',
'key' => env('AWS_ACCESS_KEY_ID'),
'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
'queue' => env('SQS_QUEUE', 'default'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'suffix' => env('SQS_SUFFIX'),
'driver' => 'sqs',
'key' => env('AWS_ACCESS_KEY_ID'),
'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
'queue' => env('SQS_QUEUE', 'default'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'suffix' => env('SQS_SUFFIX'),
],
'redis' => [
'after_commit' => false,
'block_for' => null,
'connection' => 'default',
'driver' => 'redis',
'queue' => env('REDIS_QUEUE', 'default'),
'retry_after' => 90,
'block_for' => null,
'connection' => 'default',
'driver' => 'redis',
'queue' => env('REDIS_QUEUE', 'default'),
'retry_after' => 90,
],
],
/*
@ -86,8 +80,7 @@ return [
'failed' => [
'database' => env('DB_CONNECTION', 'mysql'),
'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'),
'table' => 'failed_jobs',
'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'),
'table' => 'failed_jobs',
],
];

9
config/services.php
View File

@ -15,19 +15,16 @@ return [
*/
'mailgun' => [
'domain' => env('MAILGUN_DOMAIN'),
'domain' => env('MAILGUN_DOMAIN'),
'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
'secret' => env('MAILGUN_SECRET'),
'secret' => env('MAILGUN_SECRET'),
],
'postmark' => [
'token' => env('POSTMARK_TOKEN'),
],
'ses' => [
'key' => env('AWS_ACCESS_KEY_ID'),
'key' => env('AWS_ACCESS_KEY_ID'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
],
];

12
config/session.php
View File

@ -30,7 +30,6 @@ return [
*/
'lifetime' => env('SESSION_LIFETIME', 120),
'expire_on_close' => false,
/*
@ -111,7 +110,10 @@ return [
|
*/
'lottery' => [2, 100],
'lottery' => [
2,
100,
],
/*
|--------------------------------------------------------------------------
@ -124,10 +126,7 @@ return [
|
*/
'cookie' => env(
'SESSION_COOKIE',
str_slug(env('APP_NAME', 'winter'), '_').'_session'
),
'cookie' => env('SESSION_COOKIE', str_slug(env('APP_NAME', 'winter'), '_') . '_session'),
/*
|--------------------------------------------------------------------------
@ -214,5 +213,4 @@ return [
*/
'same_site' => 'lax',
];

6
config/view.php
View File

@ -30,9 +30,5 @@ return [
|
*/
'compiled' => env(
'VIEW_COMPILED_PATH',
realpath(storage_path('framework/views'))
),
'compiled' => env('VIEW_COMPILED_PATH', realpath(storage_path('framework/views'))),
];