From 9caf5f01af6ea3941cfa70d200249efd89bf38b2 Mon Sep 17 00:00:00 2001
From: Laravel Shift <shift@laravelshift.com>
Date: Sun, 14 Feb 2021 04:23:11 +0000
Subject: [PATCH] Shift config files

---
 config/cache.php                    | 11 +++++------
 config/hashing.php                  |  2 +-
 config/logging.php                  | 17 +++++++++++++++--
 config/queue.php                    |  2 +-
 config/session.php                  |  8 +++++---
 config/view.php                     |  5 ++++-
 phpunit.xml                         |  2 +-
 resources/environments/.env.example |  2 +-
 resources/environments/.env.local   |  2 +-
 9 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/config/cache.php b/config/cache.php
index fa12e5e4..4f0b3c45 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Str;
+
 return [
 
     /*
@@ -57,7 +59,7 @@ return [
                 env('MEMCACHED_PASSWORD'),
             ],
             'options' => [
-                // Memcached::OPT_CONNECT_TIMEOUT  => 2000,
+                // Memcached::OPT_CONNECT_TIMEOUT => 2000,
             ],
             'servers' => [
                 [
@@ -70,7 +72,7 @@ return [
 
         'redis' => [
             'driver' => 'redis',
-            'connection' => 'default',
+            'connection' => 'cache',
         ],
 
     ],
@@ -86,9 +88,6 @@ return [
     |
     */
 
-    'prefix' => env(
-        'CACHE_PREFIX',
-        str_slug(env('APP_NAME', 'laravel'), '_').'_cache'
-    ),
+    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
 
 ];
diff --git a/config/hashing.php b/config/hashing.php
index d3c8e2fb..84257708 100644
--- a/config/hashing.php
+++ b/config/hashing.php
@@ -11,7 +11,7 @@ return [
     | passwords for your application. By default, the bcrypt algorithm is
     | used; however, you remain free to modify this option if you wish.
     |
-    | Supported: "bcrypt", "argon"
+    | Supported: "bcrypt", "argon", "argon2id"
     |
     */
 
diff --git a/config/logging.php b/config/logging.php
index 400bc7f4..d09cd7d2 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -1,6 +1,7 @@
 <?php
 
 use Monolog\Handler\StreamHandler;
+use Monolog\Handler\SyslogUdpHandler;
 
 return [
 
@@ -35,7 +36,8 @@ return [
     'channels' => [
         'stack' => [
             'driver' => 'stack',
-            'channels' => ['single'],
+            'channels' => ['daily'],
+            'ignore_exceptions' => false,
         ],
 
         'single' => [
@@ -48,7 +50,7 @@ return [
             'driver' => 'daily',
             'path' => storage_path('logs/laravel.log'),
             'level' => 'debug',
-            'days' => 7,
+            'days' => 14,
         ],
 
         'slack' => [
@@ -59,9 +61,20 @@ return [
             'level' => 'critical',
         ],
 
+        'papertrail' => [
+            'driver' => 'monolog',
+            'level' => 'debug',
+            'handler' => SyslogUdpHandler::class,
+            'handler_with' => [
+                'host' => env('PAPERTRAIL_URL'),
+                'port' => env('PAPERTRAIL_PORT'),
+            ],
+        ],
+
         'stderr' => [
             'driver' => 'monolog',
             'handler' => StreamHandler::class,
+            'formatter' => env('LOG_STDERR_FORMATTER'),
             'with' => [
                 'stream' => 'php://stderr',
             ],
diff --git a/config/queue.php b/config/queue.php
index 76f21c19..6b117873 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -13,7 +13,7 @@ return [
     |
     */
 
-    'default' => env('QUEUE_DRIVER', 'sync'),
+    'default' => env('QUEUE_CONNECTION', 'sync'),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/config/session.php b/config/session.php
index 736fb3c7..fae302ae 100644
--- a/config/session.php
+++ b/config/session.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Str;
+
 return [
 
     /*
@@ -70,7 +72,7 @@ return [
     |
     */
 
-    'connection' => null,
+    'connection' => env('SESSION_CONNECTION', null),
 
     /*
     |--------------------------------------------------------------------------
@@ -96,7 +98,7 @@ return [
     |
     */
 
-    'store' => null,
+    'store' => env('SESSION_STORE', null),
 
     /*
     |--------------------------------------------------------------------------
@@ -124,7 +126,7 @@ return [
 
     'cookie' => env(
         'SESSION_COOKIE',
-        str_slug(env('APP_NAME', 'laravel'), '_').'_session'
+        Str::slug(env('APP_NAME', 'laravel'), '_').'_session'
     ),
 
     /*
diff --git a/config/view.php b/config/view.php
index 2acfd9cc..22b8a18d 100644
--- a/config/view.php
+++ b/config/view.php
@@ -28,6 +28,9 @@ return [
     |
     */
 
-    'compiled' => realpath(storage_path('framework/views')),
+    'compiled' => env(
+        'VIEW_COMPILED_PATH',
+        realpath(storage_path('framework/views'))
+    ),
 
 ];
diff --git a/phpunit.xml b/phpunit.xml
index f43ffd32..04b140f3 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -25,7 +25,7 @@
         <env name="BCRYPT_ROUNDS" value="4"/>
         <env name="CACHE_DRIVER" value="array"/>
         <env name="SESSION_DRIVER" value="array"/>
-        <env name="QUEUE_DRIVER" value="sync"/>
+        <env name="QUEUE_CONNECTION" value="sync"/>
         <env name="APP_URL" value="http://ponyfm-dev.poni"/>
         <env name="DB_CONNECTION" value="memory"/>
         <env name="PONYFM_DATASTORE" value="/vagrant/storage/app/testing-datastore"/>
diff --git a/resources/environments/.env.example b/resources/environments/.env.example
index d75caf18..71e0b20a 100644
--- a/resources/environments/.env.example
+++ b/resources/environments/.env.example
@@ -11,7 +11,7 @@ DB_PASSWORD=secret
 ELASTICSEARCH_HOSTS=localhost
 
 SESSION_HTTPS_ONLY=false
-QUEUE_DRIVER=beanstalkd
+QUEUE_CONNECTION=beanstalkd
 
 MAIL_DRIVER=smtp
 MAIL_HOST=mailtrap.io
diff --git a/resources/environments/.env.local b/resources/environments/.env.local
index 7de2961c..9056c494 100644
--- a/resources/environments/.env.local
+++ b/resources/environments/.env.local
@@ -11,7 +11,7 @@ DB_PASSWORD=secret
 ELASTICSEARCH_HOSTS=localhost
 
 SESSION_HTTPS_ONLY=false
-QUEUE_DRIVER=beanstalkd
+QUEUE_CONNECTION=beanstalkd
 
 MAIL_DRIVER=smtp
 MAIL_HOST=mailtrap.io