diff --git a/Changelog b/Changelog index 3bb645ad3..b17a1968b 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-02-26 DariusIII + * Chg: Update config files for laravel 5.8 changes * Chg: Fix return declarations in multiple controllers * Chg: Update used libraries to their latest versions * Chg: Update isPcGame function categorization regex diff --git a/config/app.php b/config/app.php index b24aa039f..84a4e4732 100644 --- a/config/app.php +++ b/config/app.php @@ -186,6 +186,7 @@ return [ 'aliases' => [ 'App' => Illuminate\Support\Facades\App::class, + 'Arr' => Illuminate\Support\Arr::class, 'Artisan' => Illuminate\Support\Facades\Artisan::class, 'Auth' => Illuminate\Support\Facades\Auth::class, 'Blade' => Illuminate\Support\Facades\Blade::class, @@ -215,6 +216,7 @@ return [ 'Schema' => Illuminate\Support\Facades\Schema::class, 'Session' => Illuminate\Support\Facades\Session::class, 'Storage' => Illuminate\Support\Facades\Storage::class, + 'Str' => Illuminate\Support\Str::class, 'URL' => Illuminate\Support\Facades\URL::class, 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, diff --git a/config/auth.php b/config/auth.php index 4c65d116a..706ea97c8 100644 --- a/config/auth.php +++ b/config/auth.php @@ -44,6 +44,7 @@ return [ 'api' => [ 'driver' => 'token', 'provider' => 'users', + 'hash' => false, ], 'rss' => [ 'driver' => 'token', diff --git a/config/cache.php b/config/cache.php index 8020f24e8..2439366ac 100644 --- a/config/cache.php +++ b/config/cache.php @@ -1,7 +1,7 @@ env('CACHE_DRIVER', 'file'), - /* |-------------------------------------------------------------------------- | Cache Stores @@ -27,28 +26,22 @@ return [ | same cache driver to group types of items stored in your caches. | */ - 'stores' => [ - 'apc' => [ 'driver' => 'apc', ], - 'array' => [ 'driver' => 'array', ], - 'database' => [ 'driver' => 'database', 'table' => 'cache', 'connection' => null, ], - 'file' => [ 'driver' => 'file', 'path' => storage_path('framework/cache/data'), ], - 'memcached' => [ 'driver' => 'memcached', 'persistent_id' => env('MEMCACHED_PERSISTENT_ID'), @@ -57,7 +50,7 @@ return [ env('MEMCACHED_PASSWORD'), ], 'options' => [ - // Memcached::OPT_CONNECT_TIMEOUT => 2000, + // Memcached::OPT_CONNECT_TIMEOUT => 2000, ], 'servers' => [ [ @@ -67,18 +60,18 @@ return [ ], ], ], - 'redis' => [ 'driver' => 'redis', - 'connection' => 'default', + 'connection' => 'cache', ], - - 'request' => [ - 'driver' => 'array', + 'dynamodb' => [ + 'driver' => 'dynamodb', + 'key' => env('AWS_ACCESS_KEY_ID'), + 'secret' => env('AWS_SECRET_ACCESS_KEY'), + 'region' => env('AWS_REGION', 'us-east-1'), + 'table' => env('DYNAMODB_CACHE_TABLE', 'cache'), ], - ], - /* |-------------------------------------------------------------------------- | Cache Key Prefix @@ -89,7 +82,5 @@ return [ | value to get prefixed to all our keys so we can avoid collisions. | */ - - 'prefix' => 'laravel', - + 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'), ]; diff --git a/config/logging.php b/config/logging.php index 1fabd4cc9..79278ee2e 100644 --- a/config/logging.php +++ b/config/logging.php @@ -15,6 +15,7 @@ return [ | */ 'default' => env('LOG_CHANNEL', 'stack'), + /* |-------------------------------------------------------------------------- | Log Channels @@ -25,14 +26,17 @@ return [ | you a variety of powerful log handlers / formatters to utilize. | | Available Drivers: "single", "daily", "slack", "syslog", - | "errorlog", "custom", "stack" + | "errorlog", "monolog", + | "custom", "stack" | */ + 'channels' => [ 'stack' => [ 'driver' => 'stack', 'name' => 'NNTmux', 'channels' => ['daily'], + 'ignore_exceptions' => false, ], 'single' => [ 'driver' => 'single', diff --git a/config/mail.php b/config/mail.php index bb92224c5..608b00ac5 100644 --- a/config/mail.php +++ b/config/mail.php @@ -12,7 +12,7 @@ return [ | your application here. By default, Laravel is setup for SMTP mail. | | Supported: "smtp", "sendmail", "mailgun", "mandrill", "ses", - | "sparkpost", "log", "array" + | "sparkpost", "postmark", "log", "array" | */ diff --git a/config/queue.php b/config/queue.php index cfc88c803..ff9b45bfa 100644 --- a/config/queue.php +++ b/config/queue.php @@ -29,43 +29,38 @@ return [ */ 'connections' => [ - 'sync' => [ 'driver' => 'sync', ], - 'database' => [ 'driver' => 'database', 'table' => 'jobs', 'queue' => 'default', 'retry_after' => 90, ], - 'beanstalkd' => [ 'driver' => 'beanstalkd', 'host' => 'localhost', 'queue' => 'default', 'retry_after' => 90, + 'block_for' => 0, ], - 'sqs' => [ 'driver' => 'sqs', - 'key' => 'your-public-key', - 'secret' => 'your-secret-key', - 'prefix' => 'https://sqs.us-east-1.amazonaws.com/your-account-id', - 'queue' => 'your-queue-name', - 'region' => 'us-east-1', + 'key' => env('AWS_ACCESS_KEY_ID'), + 'secret' => env('AWS_SECRET_ACCESS_KEY'), + 'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'), + 'queue' => env('SQS_QUEUE', 'your-queue-name'), + 'region' => env('AWS_REGION', 'us-east-1'), ], - 'redis' => [ 'driver' => 'redis', 'connection' => 'default', - 'queue' => 'default', + 'queue' => env('REDIS_QUEUE', 'default'), 'retry_after' => 90, + 'block_for' => null, ], - ], - /* |-------------------------------------------------------------------------- | Failed Queue Jobs @@ -76,7 +71,6 @@ return [ | have failed. You may change them to any database / table you wish. | */ - 'failed' => [ 'database' => env('DB_CONNECTION', 'mysql'), 'table' => 'failed_jobs', diff --git a/config/services.php b/config/services.php index e712b22a1..adcf04122 100644 --- a/config/services.php +++ b/config/services.php @@ -19,14 +19,21 @@ return [ 'secret' => env('MAILGUN_SECRET'), 'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'), ], + + 'postmark' => [ + 'token' => env('POSTMARK_TOKEN'), + ], + 'ses' => [ 'key' => env('SES_KEY'), 'secret' => env('SES_SECRET'), 'region' => env('SES_REGION', 'us-east-1'), ], + 'sparkpost' => [ 'secret' => env('SPARKPOST_SECRET'), ], + 'stripe' => [ 'model' => App\User::class, 'key' => env('STRIPE_KEY'), diff --git a/config/session.php b/config/session.php index 63aff1578..dcc32a28b 100644 --- a/config/session.php +++ b/config/session.php @@ -14,7 +14,7 @@ return [ | you may specify any of the other wonderful drivers provided here. | | Supported: "file", "cookie", "database", "apc", - | "memcached", "redis", "array" + | "memcached", "redis", "dynamodb", "array" | */