From f4fc976e853c28579b6decbea778372224bc9937 Mon Sep 17 00:00:00 2001 From: Shift Date: Wed, 4 Sep 2024 17:46:25 +0000 Subject: [PATCH 1/3] Leverage `HOME` constant --- app/Providers/RouteServiceProvider.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 6c62c118..0a74858a 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -20,6 +20,13 @@ class RouteServiceProvider extends ServiceProvider */ protected $namespace = 'App\Http\Controllers'; + /** + * The path to the "home" route for your application. + * + * @var string + */ + public const HOME = '/home'; + /** * Define your route model bindings, pattern filters, etc. * From 113c70051f755f5b998c56ed4346116a1b3d480e Mon Sep 17 00:00:00 2001 From: Shift Date: Wed, 4 Sep 2024 17:46:37 +0000 Subject: [PATCH 2/3] Shift config files --- config/auth.php | 15 +++++++++++++++ config/broadcasting.php | 2 +- config/database.php | 12 ++++++------ config/filesystems.php | 3 ++- config/logging.php | 12 +++++++++++- config/mail.php | 4 ++-- config/queue.php | 1 + config/services.php | 6 +----- 8 files changed, 39 insertions(+), 16 deletions(-) diff --git a/config/auth.php b/config/auth.php index 78175010..aaf982bc 100644 --- a/config/auth.php +++ b/config/auth.php @@ -44,6 +44,7 @@ 'api' => [ 'driver' => 'token', 'provider' => 'users', + 'hash' => false, ], ], @@ -96,7 +97,21 @@ 'provider' => 'users', 'table' => 'password_resets', 'expire' => 60, + 'throttle' => 60, ], ], + /* + |-------------------------------------------------------------------------- + | Password Confirmation Timeout + |-------------------------------------------------------------------------- + | + | Here you may define the amount of seconds before a password confirmation + | times out and the user is prompted to re-enter their password via the + | confirmation screen. By default, the timeout lasts for three hours. + | + */ + + 'password_timeout' => 10800, + ]; diff --git a/config/broadcasting.php b/config/broadcasting.php index 3ca45eaa..3bba1103 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -37,7 +37,7 @@ 'app_id' => env('PUSHER_APP_ID'), 'options' => [ 'cluster' => env('PUSHER_APP_CLUSTER'), - 'encrypted' => true, + 'useTLS' => true, ], ], diff --git a/config/database.php b/config/database.php index 921769ca..b42d9b30 100644 --- a/config/database.php +++ b/config/database.php @@ -119,10 +119,10 @@ 'redis' => [ - 'client' => env('REDIS_CLIENT', 'predis'), + 'client' => env('REDIS_CLIENT', 'phpredis'), 'options' => [ - 'cluster' => env('REDIS_CLUSTER', 'predis'), + 'cluster' => env('REDIS_CLUSTER', 'redis'), 'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'), ], @@ -130,16 +130,16 @@ 'url' => env('REDIS_URL'), 'host' => env('REDIS_HOST', '127.0.0.1'), 'password' => env('REDIS_PASSWORD', null), - 'port' => env('REDIS_PORT', 6379), - 'database' => env('REDIS_DB', 0), + 'port' => env('REDIS_PORT', '6379'), + 'database' => env('REDIS_DB', '0'), ], 'cache' => [ 'url' => env('REDIS_URL'), 'host' => env('REDIS_HOST', '127.0.0.1'), 'password' => env('REDIS_PASSWORD', null), - 'port' => env('REDIS_PORT', 6379), - 'database' => env('REDIS_CACHE_DB', 1), + 'port' => env('REDIS_PORT', '6379'), + 'database' => env('REDIS_CACHE_DB', '1'), ], ], diff --git a/config/filesystems.php b/config/filesystems.php index 77fa5ded..220c0104 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -37,7 +37,7 @@ | may even configure multiple disks of the same driver. Defaults have | been setup for each driver as an example of the required options. | - | Supported Drivers: "local", "ftp", "sftp", "s3", "rackspace" + | Supported Drivers: "local", "ftp", "sftp", "s3" | */ @@ -62,6 +62,7 @@ 'region' => env('AWS_DEFAULT_REGION'), 'bucket' => env('AWS_BUCKET'), 'url' => env('AWS_URL'), + 'endpoint' => env('AWS_ENDPOINT'), ], ], diff --git a/config/logging.php b/config/logging.php index d09cd7d2..088c204e 100644 --- a/config/logging.php +++ b/config/logging.php @@ -1,5 +1,6 @@ [ 'stack' => [ 'driver' => 'stack', - 'channels' => ['daily'], + 'channels' => ['single'], 'ignore_exceptions' => false, ], @@ -89,6 +90,15 @@ 'driver' => 'errorlog', 'level' => 'debug', ], + + 'null' => [ + 'driver' => 'monolog', + 'handler' => NullHandler::class, + ], + + 'emergency' => [ + 'path' => storage_path('logs/laravel.log'), + ], ], ]; diff --git a/config/mail.php b/config/mail.php index 6f8469f8..3c65eb3f 100644 --- a/config/mail.php +++ b/config/mail.php @@ -11,8 +11,8 @@ | sending of e-mail. You may specify which one you're using throughout | your application here. By default, Laravel is setup for SMTP mail. | - | Supported: "smtp", "sendmail", "mailgun", "mandrill", "ses", - | "sparkpost", "postmark", "log", "array" + | Supported: "smtp", "sendmail", "mailgun", "ses", + | "postmark", "log", "array" | */ diff --git a/config/queue.php b/config/queue.php index 07c7d2a9..3a30d6c6 100644 --- a/config/queue.php +++ b/config/queue.php @@ -80,6 +80,7 @@ */ 'failed' => [ + 'driver' => env('QUEUE_FAILED_DRIVER', 'database'), 'database' => env('DB_CONNECTION', 'mysql'), 'table' => 'failed_jobs', ], diff --git a/config/services.php b/config/services.php index 8ce6cc63..2a1d616c 100644 --- a/config/services.php +++ b/config/services.php @@ -8,7 +8,7 @@ |-------------------------------------------------------------------------- | | This file is for storing the credentials for third party services such - | as Mailgun, SparkPost and others. This file provides a sane default + | as Mailgun, Postmark, AWS and more. This file provides the de facto | location for this type of information, allowing packages to have | a conventional file to locate the various service credentials. | @@ -30,8 +30,4 @@ 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), ], - 'sparkpost' => [ - 'secret' => env('SPARKPOST_SECRET'), - ], - ]; From 7481fdd18233651b70b3495870070d52f75fe26a Mon Sep 17 00:00:00 2001 From: Shift Date: Wed, 4 Sep 2024 17:46:38 +0000 Subject: [PATCH 3/3] Bump Composer dependencies --- composer.json | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index 1129d584..61d8273b 100644 --- a/composer.json +++ b/composer.json @@ -9,38 +9,37 @@ "license": "MIT", "type": "project", "require": { - "php": "^7.1.3", + "php": "^7.2|^8.0", "arcanedev/log-viewer": "~4.0", "arcanedev/no-captcha": "~3.0", "barryvdh/laravel-dompdf": "0.8.0", "barryvdh/laravel-snappy": "0.4.0", "creativeorange/gravatar": "~1.0", - "davejamesmiller/laravel-breadcrumbs": "^3.0", + "davejamesmiller/laravel-breadcrumbs": "^5.3", "doctrine/dbal": "^2.9", "h4cc/wkhtmltoimage-amd64": "0.12.x", "h4cc/wkhtmltoimage-i386": "0.12.x", "h4cc/wkhtmltopdf-amd64": "0.12.x", "h4cc/wkhtmltopdf-i386": "0.12.x", - "hieu-le/active": "~3.0", - "laravel/framework": "5.8.*", - "laravel/socialite": "^3.0", - "laravel/tinker": "~1.0", - "laravelcollective/html": "5.8.*", + "hieu-le/active": "^4.0", + "laravel/framework": "^6.20", + "laravel/socialite": "^4.1", + "laravel/tinker": "^2.5", + "laravelcollective/html": "^6.0", "phpoffice/phpspreadsheet": "^1.6", - "stevebauman/location": "^3.0", - "yajra/laravel-datatables-oracle": "^7.0", - "fideloper/proxy": "^4.0" + "stevebauman/location": "^4.0", + "yajra/laravel-datatables-oracle": "^9.6", + "fideloper/proxy": "^4.4" }, "require-dev": { - "barryvdh/laravel-debugbar": "^2.4", - "fzaninotto/faker": "~1.6", - "laravel/browser-kit-testing": "^2.0", + "barryvdh/laravel-debugbar": "^3.2", + "laravel/browser-kit-testing": "^5.1", "mockery/mockery": "~1.0", - "phpunit/phpunit": "^7.5", + "phpunit/phpunit": "^8.5.8|^9.3.3", "satooshi/php-coveralls": "^1.0", - "filp/whoops": "~2.0", "nunomaduro/collision": "^3.0", - "beyondcode/laravel-dump-server": "^1.0" + "fakerphp/faker": "^1.9.1", + "facade/ignition": "^1.16.4" }, "autoload": { "classmap": [