Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Laravel 6.x Shift #8

Merged
merged 3 commits into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/Providers/RouteServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
31 changes: 15 additions & 16 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
15 changes: 15 additions & 0 deletions config/auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
'api' => [
'driver' => 'token',
'provider' => 'users',
'hash' => false,
],
],

Expand Down Expand Up @@ -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,

];
2 changes: 1 addition & 1 deletion config/broadcasting.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
'app_id' => env('PUSHER_APP_ID'),
'options' => [
'cluster' => env('PUSHER_APP_CLUSTER'),
'encrypted' => true,
'useTLS' => true,
],
],

Expand Down
12 changes: 6 additions & 6 deletions config/database.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,27 +119,27 @@

'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_'),
],

'default' => [
'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'),
],

],
Expand Down
3 changes: 2 additions & 1 deletion config/filesystems.php
Original file line number Diff line number Diff line change
Expand Up @@ -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"
|
*/

Expand All @@ -62,6 +62,7 @@
'region' => env('AWS_DEFAULT_REGION'),
'bucket' => env('AWS_BUCKET'),
'url' => env('AWS_URL'),
'endpoint' => env('AWS_ENDPOINT'),
],

],
Expand Down
12 changes: 11 additions & 1 deletion config/logging.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php

use Monolog\Handler\NullHandler;
use Monolog\Handler\StreamHandler;
use Monolog\Handler\SyslogUdpHandler;

Expand Down Expand Up @@ -36,7 +37,7 @@
'channels' => [
'stack' => [
'driver' => 'stack',
'channels' => ['daily'],
'channels' => ['single'],
'ignore_exceptions' => false,
],

Expand Down Expand Up @@ -89,6 +90,15 @@
'driver' => 'errorlog',
'level' => 'debug',
],

'null' => [
'driver' => 'monolog',
'handler' => NullHandler::class,
],

'emergency' => [
'path' => storage_path('logs/laravel.log'),
],
],

];
4 changes: 2 additions & 2 deletions config/mail.php
Original file line number Diff line number Diff line change
Expand Up @@ -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"
|
*/

Expand Down
1 change: 1 addition & 0 deletions config/queue.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
*/

'failed' => [
'driver' => env('QUEUE_FAILED_DRIVER', 'database'),
'database' => env('DB_CONNECTION', 'mysql'),
'table' => 'failed_jobs',
],
Expand Down
6 changes: 1 addition & 5 deletions config/services.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
|
Expand All @@ -30,8 +30,4 @@
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
],

'sparkpost' => [
'secret' => env('SPARKPOST_SECRET'),
],

];