Skip to content

Commit fa011bb

Browse files
committed
Updated to Laravel commit: 4f8a0f35fabd8603fb756122bf820719a259ac9b
1 parent 75b0c4d commit fa011bb

File tree

13 files changed

+1919
-1409
lines changed

13 files changed

+1919
-1409
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
33

44
## [Unreleased]
55

6+
### Changed
7+
8+
- Updated composer/yarn lock files
9+
- Updated to Laravel commit: 4f8a0f35fabd8603fb756122bf820719a259ac9b
10+
611
## [8.2.2] - 2021-07-10
712

813
### Changed

app/Domains/Auth/Models/User.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,16 @@
1818
use Illuminate\Foundation\Auth\User as Authenticatable;
1919
use Illuminate\Notifications\Notifiable;
2020
use Lab404\Impersonate\Models\Impersonate;
21+
use Laravel\Sanctum\HasApiTokens;
2122
use Spatie\Permission\Traits\HasRoles;
2223

2324
/**
2425
* Class User.
2526
*/
2627
class User extends Authenticatable implements MustVerifyEmail, TwoFactorAuthenticatable
2728
{
28-
use HasFactory,
29+
use HasApiTokens,
30+
HasFactory,
2931
HasRoles,
3032
Impersonate,
3133
MustVerifyEmailTrait,
@@ -62,7 +64,7 @@ class User extends Authenticatable implements MustVerifyEmail, TwoFactorAuthenti
6264
];
6365

6466
/**
65-
* The attributes that should be hidden for arrays.
67+
* The attributes that should be hidden for serialization.
6668
*
6769
* @var array
6870
*/
@@ -81,7 +83,7 @@ class User extends Authenticatable implements MustVerifyEmail, TwoFactorAuthenti
8183
];
8284

8385
/**
84-
* The attributes that should be cast to native types.
86+
* The attributes that should be cast.
8587
*
8688
* @var array
8789
*/

app/Http/Kernel.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class Kernel extends HttpKernel
4545
],
4646

4747
'api' => [
48+
// \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
4849
'throttle:api',
4950
\Illuminate\Routing\Middleware\SubstituteBindings::class,
5051
],

app/Http/Middleware/TrustProxies.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace App\Http\Middleware;
44

5-
use Fideloper\Proxy\TrustProxies as Middleware;
5+
use Illuminate\Http\Middleware\TrustProxies as Middleware;
66
use Illuminate\Http\Request;
77

88
/**
@@ -22,5 +22,10 @@ class TrustProxies extends Middleware
2222
*
2323
* @var int
2424
*/
25-
protected $headers = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB;
25+
protected $headers =
26+
Request::HEADER_X_FORWARDED_FOR |
27+
Request::HEADER_X_FORWARDED_HOST |
28+
Request::HEADER_X_FORWARDED_PORT |
29+
Request::HEADER_X_FORWARDED_PROTO |
30+
Request::HEADER_X_FORWARDED_AWS_ELB;
2631
}

composer.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
"php": "^7.4|^8.0",
1313
"arcanedev/log-viewer": "8.x",
1414
"darkghosthunter/laraguard": "^3.0",
15-
"fideloper/proxy": "^4.4",
1615
"fruitcake/laravel-cors": "^2.0",
1716
"guzzlehttp/guzzle": "^7.0.1",
1817
"jamesmills/laravel-timezone": "^1.9",
1918
"lab404/laravel-impersonate": "^1.6",
2019
"langleyfoxall/laravel-nist-password-rules": "^4.1",
21-
"laravel/framework": "^8.40",
20+
"laravel/framework": "^8.54",
21+
"laravel/sanctum": "^2.11",
2222
"laravel/socialite": "^5.0",
2323
"laravel/tinker": "^2.5",
2424
"laravel/ui": "^3.0",
@@ -59,16 +59,17 @@
5959
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
6060
"@php artisan package:discover --ansi"
6161
],
62+
"post-update-cmd": [
63+
"@php artisan vendor:publish --tag=laravel-assets --ansi",
64+
"@php artisan ide-helper:generate",
65+
"@php artisan ide-helper:meta"
66+
],
6267
"post-root-package-install": [
6368
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
6469
],
6570
"post-create-project-cmd": [
6671
"@php artisan key:generate --ansi"
6772
],
68-
"post-update-cmd": [
69-
"@php artisan ide-helper:generate",
70-
"@php artisan ide-helper:meta"
71-
],
7273
"clear-all": [
7374
"@php artisan clear-compiled",
7475
"@php artisan cache:clear",

0 commit comments

Comments
 (0)