@@ -8,7 +8,6 @@ |
||
8 | 8 | use Illuminate\Database\Eloquent\ModelNotFoundException; |
9 | 9 | use Symfony\Component\HttpKernel\Exception\HttpException; |
10 | 10 | use Laravel\Lumen\Exceptions\Handler as ExceptionHandler; |
11 | - |
|
12 | 11 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
13 | 12 | use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException; |
14 | 13 |
@@ -48,15 +48,15 @@ |
||
48 | 48 | */ |
49 | 49 | public function render($request, Exception $e) |
50 | 50 | { |
51 | - if(env('APP_DEBUG')){ |
|
51 | + if (env('APP_DEBUG')) { |
|
52 | 52 | return parent::render($request, $e); |
53 | 53 | } |
54 | 54 | |
55 | - if($e instanceof NotFoundHttpException){ |
|
55 | + if ($e instanceof NotFoundHttpException) { |
|
56 | 56 | return response()->json(['message' => 'Bad Request', 'code' => 400], 400); |
57 | 57 | } |
58 | 58 | |
59 | - if($e instanceof MethodNotAllowedHttpException){ |
|
59 | + if ($e instanceof MethodNotAllowedHttpException) { |
|
60 | 60 | return response()->json(['message' => 'Not Found', 'code' => 404], 404); |
61 | 61 | } |
62 | 62 |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | use App\Post; |
4 | 4 | use App\Comment; |
5 | - |
|
6 | 5 | use Illuminate\Http\Request; |
7 | 6 | |
8 | 7 | class PostCommentController extends Controller{ |
@@ -5,19 +5,19 @@ discard block |
||
5 | 5 | |
6 | 6 | use Illuminate\Http\Request; |
7 | 7 | |
8 | -class PostCommentController extends Controller{ |
|
8 | +class PostCommentController extends Controller { |
|
9 | 9 | |
10 | - public function __construct(){ |
|
10 | + public function __construct() { |
|
11 | 11 | |
12 | 12 | $this->middleware('oauth', ['except' => ['index', 'show']]); |
13 | 13 | $this->middleware('authorize:' . __CLASS__, ['except' => ['index', 'show', 'store']]); |
14 | 14 | } |
15 | 15 | |
16 | - public function index($post_id){ |
|
16 | + public function index($post_id) { |
|
17 | 17 | |
18 | 18 | $post = Post::find($post_id); |
19 | 19 | |
20 | - if(!$post){ |
|
20 | + if (!$post) { |
|
21 | 21 | return $this->error("The post with {$post_id} doesn't exist", 404); |
22 | 22 | } |
23 | 23 | |
@@ -25,11 +25,11 @@ discard block |
||
25 | 25 | return $this->success($comments, 200); |
26 | 26 | } |
27 | 27 | |
28 | - public function store(Request $request, $post_id){ |
|
28 | + public function store(Request $request, $post_id) { |
|
29 | 29 | |
30 | 30 | $post = Post::find($post_id); |
31 | 31 | |
32 | - if(!$post){ |
|
32 | + if (!$post) { |
|
33 | 33 | return $this->error("The post with {$post_id} doesn't exist", 404); |
34 | 34 | } |
35 | 35 | |
@@ -44,12 +44,12 @@ discard block |
||
44 | 44 | return $this->success("The comment with id {$comment->id} has been created and assigned to the post with id {$post_id}", 201); |
45 | 45 | } |
46 | 46 | |
47 | - public function update(Request $request, $post_id, $comment_id){ |
|
47 | + public function update(Request $request, $post_id, $comment_id) { |
|
48 | 48 | |
49 | - $comment = Comment::find($comment_id); |
|
50 | - $post = Post::find($post_id); |
|
49 | + $comment = Comment::find($comment_id); |
|
50 | + $post = Post::find($post_id); |
|
51 | 51 | |
52 | - if(!$comment || !$post){ |
|
52 | + if (!$comment || !$post) { |
|
53 | 53 | return $this->error("The comment with {$comment_id} or the post with id {$post_id} doesn't exist", 404); |
54 | 54 | } |
55 | 55 | |
@@ -64,16 +64,16 @@ discard block |
||
64 | 64 | return $this->success("The comment with with id {$comment->id} has been updated", 200); |
65 | 65 | } |
66 | 66 | |
67 | - public function destroy($post_id, $comment_id){ |
|
67 | + public function destroy($post_id, $comment_id) { |
|
68 | 68 | |
69 | - $comment = Comment::find($comment_id); |
|
70 | - $post = Post::find($post_id); |
|
69 | + $comment = Comment::find($comment_id); |
|
70 | + $post = Post::find($post_id); |
|
71 | 71 | |
72 | - if(!$comment || !$post){ |
|
72 | + if (!$comment || !$post) { |
|
73 | 73 | return $this->error("The comment with {$comment_id} or the post with id {$post_id} doesn't exist", 404); |
74 | 74 | } |
75 | 75 | |
76 | - if(!$post->comments()->find($comment_id)){ |
|
76 | + if (!$post->comments()->find($comment_id)) { |
|
77 | 77 | return $this->error("The comment with id {$comment_id} isn't assigned to the post with id {$post_id}", 409); |
78 | 78 | } |
79 | 79 | |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | return $this->success("The comment with id {$comment_id} has been removed of the post {$post_id}", 200); |
83 | 83 | } |
84 | 84 | |
85 | - public function validateRequest(Request $request){ |
|
85 | + public function validateRequest(Request $request) { |
|
86 | 86 | |
87 | 87 | $rules = [ |
88 | 88 | 'content' => 'required' |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | $this->validate($request, $rules); |
92 | 92 | } |
93 | 93 | |
94 | - public function isAuthorized(Request $request){ |
|
94 | + public function isAuthorized(Request $request) { |
|
95 | 95 | |
96 | 96 | $resource = "comments"; |
97 | 97 | $comment = Comment::find($this->getArgs($request)["comment_id"]); |
@@ -1,7 +1,6 @@ |
||
1 | 1 | <?php namespace App\Http\Controllers; |
2 | 2 | |
3 | 3 | use App\Post; |
4 | - |
|
5 | 4 | use Illuminate\Http\Request; |
6 | 5 | |
7 | 6 | class PostController extends Controller{ |
@@ -4,21 +4,21 @@ discard block |
||
4 | 4 | |
5 | 5 | use Illuminate\Http\Request; |
6 | 6 | |
7 | -class PostController extends Controller{ |
|
7 | +class PostController extends Controller { |
|
8 | 8 | |
9 | - public function __construct(){ |
|
9 | + public function __construct() { |
|
10 | 10 | |
11 | 11 | $this->middleware('oauth', ['except' => ['index', 'show']]); |
12 | 12 | $this->middleware('authorize:' . __CLASS__, ['except' => ['index', 'show', 'store']]); |
13 | 13 | } |
14 | 14 | |
15 | - public function index(){ |
|
15 | + public function index() { |
|
16 | 16 | |
17 | 17 | $posts = Post::all(); |
18 | 18 | return $this->success($posts, 200); |
19 | 19 | } |
20 | 20 | |
21 | - public function store(Request $request){ |
|
21 | + public function store(Request $request) { |
|
22 | 22 | |
23 | 23 | $this->validateRequest($request); |
24 | 24 | |
@@ -31,28 +31,28 @@ discard block |
||
31 | 31 | return $this->success("The post with with id {$post->id} has been created", 201); |
32 | 32 | } |
33 | 33 | |
34 | - public function show($id){ |
|
34 | + public function show($id) { |
|
35 | 35 | |
36 | 36 | $post = Post::find($id); |
37 | 37 | |
38 | - if(!$post){ |
|
38 | + if (!$post) { |
|
39 | 39 | return $this->error("The post with {$id} doesn't exist", 404); |
40 | 40 | } |
41 | 41 | |
42 | 42 | return $this->success($post, 200); |
43 | 43 | } |
44 | 44 | |
45 | - public function update(Request $request, $id){ |
|
45 | + public function update(Request $request, $id) { |
|
46 | 46 | |
47 | 47 | $post = Post::find($id); |
48 | 48 | |
49 | - if(!$post){ |
|
49 | + if (!$post) { |
|
50 | 50 | return $this->error("The post with {$id} doesn't exist", 404); |
51 | 51 | } |
52 | 52 | |
53 | 53 | $this->validateRequest($request); |
54 | 54 | |
55 | - $post->title = $request->get('title'); |
|
55 | + $post->title = $request->get('title'); |
|
56 | 56 | $post->content = $request->get('content'); |
57 | 57 | $post->user_id = $this->getUserId(); |
58 | 58 | |
@@ -61,11 +61,11 @@ discard block |
||
61 | 61 | return $this->success("The post with with id {$post->id} has been updated", 200); |
62 | 62 | } |
63 | 63 | |
64 | - public function destroy($id){ |
|
64 | + public function destroy($id) { |
|
65 | 65 | |
66 | 66 | $post = Post::find($id); |
67 | 67 | |
68 | - if(!$post){ |
|
68 | + if (!$post) { |
|
69 | 69 | return $this->error("The post with {$id} doesn't exist", 404); |
70 | 70 | } |
71 | 71 | |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | return $this->success("The post with with id {$id} has been deleted along with it's comments", 200); |
78 | 78 | } |
79 | 79 | |
80 | - public function validateRequest(Request $request){ |
|
80 | + public function validateRequest(Request $request) { |
|
81 | 81 | |
82 | 82 | $rules = [ |
83 | 83 | 'title' => 'required', |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | $this->validate($request, $rules); |
88 | 88 | } |
89 | 89 | |
90 | - public function isAuthorized(Request $request){ |
|
90 | + public function isAuthorized(Request $request) { |
|
91 | 91 | |
92 | 92 | $resource = "posts"; |
93 | 93 | $post = Post::find($this->getArgs($request)["post_id"]); |
@@ -1,7 +1,6 @@ |
||
1 | 1 | <?php namespace App\Http\Controllers; |
2 | 2 | |
3 | 3 | use App\User; |
4 | - |
|
5 | 4 | use Illuminate\Http\Request; |
6 | 5 | use Illuminate\Support\Facades\Hash; |
7 | 6 |
@@ -5,21 +5,21 @@ discard block |
||
5 | 5 | use Illuminate\Http\Request; |
6 | 6 | use Illuminate\Support\Facades\Hash; |
7 | 7 | |
8 | -class UserController extends Controller{ |
|
8 | +class UserController extends Controller { |
|
9 | 9 | |
10 | - public function __construct(){ |
|
10 | + public function __construct() { |
|
11 | 11 | |
12 | 12 | $this->middleware('oauth', ['except' => ['index', 'show']]); |
13 | 13 | $this->middleware('authorize:' . __CLASS__, ['except' => ['index', 'show']]); |
14 | 14 | } |
15 | 15 | |
16 | - public function index(){ |
|
16 | + public function index() { |
|
17 | 17 | |
18 | 18 | $users = User::all(); |
19 | 19 | return $this->success($users, 200); |
20 | 20 | } |
21 | 21 | |
22 | - public function store(Request $request){ |
|
22 | + public function store(Request $request) { |
|
23 | 23 | |
24 | 24 | $this->validateRequest($request); |
25 | 25 | |
@@ -31,40 +31,40 @@ discard block |
||
31 | 31 | return $this->success("The user with with id {$user->id} has been created", 201); |
32 | 32 | } |
33 | 33 | |
34 | - public function show($id){ |
|
34 | + public function show($id) { |
|
35 | 35 | |
36 | 36 | $user = User::find($id); |
37 | 37 | |
38 | - if(!$user){ |
|
38 | + if (!$user) { |
|
39 | 39 | return $this->error("The user with {$id} doesn't exist", 404); |
40 | 40 | } |
41 | 41 | |
42 | 42 | return $this->success($user, 200); |
43 | 43 | } |
44 | 44 | |
45 | - public function update(Request $request, $id){ |
|
45 | + public function update(Request $request, $id) { |
|
46 | 46 | |
47 | 47 | $user = User::find($id); |
48 | 48 | |
49 | - if(!$user){ |
|
49 | + if (!$user) { |
|
50 | 50 | return $this->error("The user with {$id} doesn't exist", 404); |
51 | 51 | } |
52 | 52 | |
53 | 53 | $this->validateRequest($request); |
54 | 54 | |
55 | - $user->email = $request->get('email'); |
|
56 | - $user->password = Hash::make($request->get('password')); |
|
55 | + $user->email = $request->get('email'); |
|
56 | + $user->password = Hash::make($request->get('password')); |
|
57 | 57 | |
58 | 58 | $user->save(); |
59 | 59 | |
60 | 60 | return $this->success("The user with with id {$user->id} has been updated", 200); |
61 | 61 | } |
62 | 62 | |
63 | - public function destroy($id){ |
|
63 | + public function destroy($id) { |
|
64 | 64 | |
65 | 65 | $user = User::find($id); |
66 | 66 | |
67 | - if(!$user){ |
|
67 | + if (!$user) { |
|
68 | 68 | return $this->error("The user with {$id} doesn't exist", 404); |
69 | 69 | } |
70 | 70 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | return $this->success("The user with with id {$id} has been deleted", 200); |
74 | 74 | } |
75 | 75 | |
76 | - public function validateRequest(Request $request){ |
|
76 | + public function validateRequest(Request $request) { |
|
77 | 77 | |
78 | 78 | $rules = [ |
79 | 79 | 'email' => 'required|email|unique:users', |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | $this->validate($request, $rules); |
84 | 84 | } |
85 | 85 | |
86 | - public function isAuthorized(Request $request){ |
|
86 | + public function isAuthorized(Request $request) { |
|
87 | 87 | |
88 | 88 | $resource = "users"; |
89 | 89 | // $user = User::find($this->getArgs($request)["user_id"]); |
@@ -3,8 +3,6 @@ |
||
3 | 3 | namespace App\Listeners; |
4 | 4 | |
5 | 5 | use App\Events\ExampleEvent; |
6 | -use Illuminate\Queue\InteractsWithQueue; |
|
7 | -use Illuminate\Contracts\Queue\ShouldQueue; |
|
8 | 6 | |
9 | 7 | class ExampleListener |
10 | 8 | { |
@@ -7,7 +7,6 @@ |
||
7 | 7 | use Illuminate\Database\Eloquent\Model; |
8 | 8 | use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract; |
9 | 9 | use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract; |
10 | - |
|
11 | 10 | use Illuminate\Support\Facades\Hash; |
12 | 11 | |
13 | 12 | class User extends Model implements AuthenticatableContract, AuthorizableContract{ |
@@ -40,11 +40,11 @@ |
||
40 | 40 | * @return int|boolean |
41 | 41 | * @see https://github.com/lucadegasperi/oauth2-server-laravel/blob/master/docs/authorization-server/password.md |
42 | 42 | */ |
43 | - public function verify($email, $password){ |
|
43 | + public function verify($email, $password) { |
|
44 | 44 | |
45 | 45 | $user = User::where('email', $email)->first(); |
46 | 46 | |
47 | - if($user && Hash::check($password, $user->password)){ |
|
47 | + if ($user && Hash::check($password, $user->password)) { |
|
48 | 48 | return $user->id; |
49 | 49 | } |
50 | 50 |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | use Illuminate\Database\Eloquent\Model; |
4 | 4 | |
5 | -class Comment extends Model{ |
|
5 | +class Comment extends Model { |
|
6 | 6 | |
7 | 7 | /** |
8 | 8 | * The attributes that are mass assignable. |
@@ -16,14 +16,14 @@ discard block |
||
16 | 16 | * |
17 | 17 | * @var array |
18 | 18 | */ |
19 | - protected $hidden = ['created_at', 'updated_at']; |
|
19 | + protected $hidden = ['created_at', 'updated_at']; |
|
20 | 20 | |
21 | 21 | /** |
22 | 22 | * Define an inverse one-to-many relationship with App\Post. |
23 | 23 | * |
24 | 24 | * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
25 | 25 | */ |
26 | - public function post(){ |
|
26 | + public function post() { |
|
27 | 27 | return $this->belongsTo('App\Post'); |
28 | 28 | } |
29 | 29 |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | use Illuminate\Database\Eloquent\Model; |
4 | 4 | |
5 | -class Post extends Model{ |
|
5 | +class Post extends Model { |
|
6 | 6 | |
7 | 7 | /** |
8 | 8 | * The attributes that are mass assignable. |
@@ -16,14 +16,14 @@ discard block |
||
16 | 16 | * |
17 | 17 | * @var array |
18 | 18 | */ |
19 | - protected $hidden = ['created_at', 'updated_at']; |
|
19 | + protected $hidden = ['created_at', 'updated_at']; |
|
20 | 20 | |
21 | 21 | /** |
22 | 22 | * Define a one-to-many relationship with App\Comment |
23 | 23 | * |
24 | 24 | * @return \Illuminate\Database\Eloquent\Relations\HasMany |
25 | 25 | */ |
26 | - public function comments(){ |
|
26 | + public function comments() { |
|
27 | 27 | return $this->hasMany('App\Comment'); |
28 | 28 | } |
29 | 29 |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | * @param array $arguments |
57 | 57 | * @return boolean |
58 | 58 | */ |
59 | - private function isOwner($arguments = []){ |
|
59 | + private function isOwner($arguments = []) { |
|
60 | 60 | |
61 | 61 | foreach ($arguments as $resource => $actions) { |
62 | 62 | foreach ($actions as $action) { |
@@ -67,9 +67,9 @@ discard block |
||
67 | 67 | // } |
68 | 68 | // }); |
69 | 69 | |
70 | - Gate::define($this->ability($action, $resource), function ($user, $arg) { |
|
70 | + Gate::define($this->ability($action, $resource), function($user, $arg) { |
|
71 | 71 | |
72 | - if(is_null($arg)) { return false; } |
|
72 | + if (is_null($arg)) { return false; } |
|
73 | 73 | |
74 | 74 | return $arg->user_id === $user->id || $user->is_admin; |
75 | 75 | }); |
@@ -83,11 +83,11 @@ discard block |
||
83 | 83 | * @param array $arguments |
84 | 84 | * @return boolean |
85 | 85 | */ |
86 | - private function isAdmin($arguments){ |
|
86 | + private function isAdmin($arguments) { |
|
87 | 87 | |
88 | 88 | foreach ($arguments as $resource => $actions) { |
89 | 89 | foreach ($actions as $action) { |
90 | - Gate::define($this->ability($action, $resource), function ($user) { |
|
90 | + Gate::define($this->ability($action, $resource), function($user) { |
|
91 | 91 | return $user->is_admin; |
92 | 92 | }); |
93 | 93 | } |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | * @param string $resource |
102 | 102 | * @return string |
103 | 103 | */ |
104 | - private function ability($action, $resource){ |
|
104 | + private function ability($action, $resource) { |
|
105 | 105 | return "{$action}-{$resource}"; |
106 | 106 | } |
107 | 107 |