Merge branch 'devel'

rakieta2015 · rakieta2015 · commit 4dd1659d9466 · 2020-06-18T13:07:02.000+02:00
diff --git a/laravel/app/User.php b/laravel/app/User.php
@@ -67,4 +67,8 @@ public function getJWTCustomClaims()
     ];
     
     protected $guard_name = 'api';
+
+    protected $attributes = [ 
+        'menuroles' => 'user',
+    ];
 }
diff --git a/laravel/composer.json b/laravel/composer.json
@@ -10,7 +10,7 @@
     "require": {
         "php": "^7.2",
         "fideloper/proxy": "^4.0",
-        "laravel/framework": "^7.0",
+        "laravel/framework": "^7.4",
         "laravel/tinker": "^2.0",
         "spatie/laravel-medialibrary": "^7.19.0",
         "spatie/laravel-permission": "^3.6",
diff --git a/laravel/composer.lock b/laravel/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -67,4 +67,8 @@ public function getJWTCustomClaims()`
`67`	`67`	`];`
`68`	`68`
`69`	`69`	`protected $guard_name = 'api';`
	`70`	`+`
	`71`	`+ protected $attributes = [`
	`72`	`+ 'menuroles' => 'user',`
	`73`	`+ ];`
`70`	`74`	`}`