Skip to content

Commit e760324

Browse files
committed
Update to laravel commit: ddb26fbc504cd64fb1b89511773aa8d03c758c6d
1 parent 8cbb3f7 commit e760324

File tree

14 files changed

+223
-85
lines changed

14 files changed

+223
-85
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ _ide_helper.php
2222
.project
2323
composer.phar
2424
coverage.xml
25+
docker-compose.override.yml
2526
error.log
2627
Homestead.json
2728
Homestead.yaml

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ All notable changes to this project will be documented in this file.
88
## Changed
99

1010
- Update dependencies
11+
- Update to laravel commit: ddb26fbc504cd64fb1b89511773aa8d03c758c6d
12+
- Update exception handling to match laravel
13+
- Added sail docker file
1114

1215
## [8.0.0] - 2020-10-21
1316

app/Exceptions/Handler.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ class Handler extends ExceptionHandler
2222
GeneralException::class,
2323
];
2424

25+
/**
26+
* A list of the inputs that are never flashed for validation exceptions.
27+
*
28+
* @var array
29+
*/
30+
protected $dontFlash = [
31+
'password',
32+
'password_confirmation',
33+
];
34+
2535
/**
2636
* Report or log an exception.
2737
*

app/Providers/RouteServiceProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function boot()
7171
protected function configureRateLimiting()
7272
{
7373
RateLimiter::for('api', function (Request $request) {
74-
return Limit::perMinute(60);
74+
return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip());
7575
});
7676
}
7777
}

composer.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
],
1010
"license": "MIT",
1111
"require": {
12-
"php": "^7.3",
12+
"php": "^7.3|^8.0",
1313
"arcanedev/log-viewer": "8.x",
1414
"darkghosthunter/laraguard": "dev-master",
15-
"fideloper/proxy": "^4.2",
15+
"fideloper/proxy": "^4.4",
1616
"fruitcake/laravel-cors": "^2.0",
1717
"guzzlehttp/guzzle": "^7.0.1",
1818
"jamesmills/laravel-timezone": "^1.9",
1919
"lab404/laravel-impersonate": "^1.6",
2020
"langleyfoxall/laravel-nist-password-rules": "^4.1",
21-
"laravel/framework": "^8.0",
21+
"laravel/framework": "^8.12",
2222
"laravel/socialite": "^5.0",
23-
"laravel/tinker": "^2.0",
23+
"laravel/tinker": "^2.5",
2424
"laravel/ui": "^3.0",
2525
"livewire/livewire": "^2.0",
2626
"rappasoft/laravel-livewire-tables": "^0.3",
@@ -34,12 +34,13 @@
3434
"barryvdh/laravel-debugbar": "^3.2",
3535
"barryvdh/laravel-ide-helper": "^2.6",
3636
"codedungeon/phpunit-result-printer": "^0.29",
37-
"facade/ignition": "^2.3.6",
37+
"facade/ignition": "^2.5",
3838
"friendsofphp/php-cs-fixer": "^2.16",
39-
"fzaninotto/faker": "^1.9.1",
40-
"mockery/mockery": "^1.3.1",
39+
"fakerphp/faker": "^1.9.1",
40+
"laravel/sail": "^0.0.5",
41+
"mockery/mockery": "^1.4.2",
4142
"nunomaduro/collision": "^5.0",
42-
"phpunit/phpunit": "^9.0"
43+
"phpunit/phpunit": "^9.3.3"
4344
},
4445
"config": {
4546
"optimize-autoloader": true,

composer.lock

Lines changed: 113 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/app.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
'Password' => Illuminate\Support\Facades\Password::class,
221221
'Queue' => Illuminate\Support\Facades\Queue::class,
222222
'Redirect' => Illuminate\Support\Facades\Redirect::class,
223-
'Redis' => Illuminate\Support\Facades\Redis::class,
223+
// 'Redis' => Illuminate\Support\Facades\Redis::class,
224224
'Request' => Illuminate\Support\Facades\Request::class,
225225
'Response' => Illuminate\Support\Facades\Response::class,
226226
'Route' => Illuminate\Support\Facades\Route::class,

config/broadcasting.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@
4141
],
4242
],
4343

44+
'ably' => [
45+
'driver' => 'ably',
46+
'key' => env('ABLY_KEY'),
47+
],
48+
4449
'redis' => [
4550
'driver' => 'redis',
4651
'connection' => 'default',

config/cache.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
| using this caching library. This connection is used when another is
1414
| not explicitly specified when executing a given caching function.
1515
|
16-
| Supported: "apc", "array", "database", "file",
17-
| "memcached", "redis", "dynamodb"
16+
| Supported drivers: "apc", "array", "database", "file",
17+
| "memcached", "redis", "dynamodb", "null"
1818
|
1919
*/
2020

config/cors.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
|
1616
*/
1717

18-
'paths' => ['api/*'],
18+
'paths' => ['api/*', 'sanctum/csrf-cookie'],
1919

2020
'allowed_methods' => ['*'],
2121

0 commit comments

Comments
 (0)