Merge branch '3.x' of github.com:BinarCode/laravel-restify into 3.x

BinarCode · Jul 17, 2020 · dddd1d3 · dddd1d3
2 parents 9423e4e + 5746794
commit dddd1d3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 21 deletions.
diff --git a/src/Http/Controllers/ProfileController.php b/src/Http/Controllers/ProfileController.php
@@ -5,7 +5,6 @@
 use Binaryk\LaravelRestify\Http\Requests\ProfileAvatarRequest;
 use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
 use Binaryk\LaravelRestify\Repositories\Repository;
-use Binaryk\LaravelRestify\Repositories\UserProfile;
 use Binaryk\LaravelRestify\Services\Search\RepositorySearchService;
 
 class ProfileController extends RepositoryController
@@ -29,7 +28,7 @@ public function __invoke(RestifyRequest $request)
         $meta = [];
 
         if (method_exists($user, 'profile')) {
-            $meta = (array)call_user_func([$user, 'profile'], $request);
+            $meta = (array) call_user_func([$user, 'profile'], $request);
         }
 
         return $this->response()
@@ -41,12 +40,12 @@ public function guessRepository(RestifyRequest $request): ?Repository
     {
         $repository = $request->repository('users');
 
-        if (!$repository) {
+        if (! $repository) {
             return null;
         }
 
         if (method_exists($repository, 'canUseForProfile')) {
-            if (!call_user_func([$repository, 'canUseForProfile'], $request)) {
+            if (! call_user_func([$repository, 'canUseForProfile'], $request)) {
                 return null;
             }
         }

diff --git a/src/Http/Controllers/ProfileUpdateController.php b/src/Http/Controllers/ProfileUpdateController.php
@@ -42,7 +42,7 @@ public function guessRepository(RestifyRequest $request): ?Repository
         }
 
         if (method_exists($repository, 'canUseForProfileUpdate')) {
-            if (!call_user_func([$repository, 'canUseForProfileUpdate'], $request)) {
+            if (! call_user_func([$repository, 'canUseForProfileUpdate'], $request)) {
                 return null;
             }
         }

diff --git a/src/Repositories/UserProfile.php b/src/Repositories/UserProfile.php
@@ -34,10 +34,10 @@ public static function metaProfile(Request $request): array
     public function resolveShowMeta($request)
     {
         return [
-                'authorizedToShow' => $this->authorizedToShow($request),
-                'authorizedToStore' => $this->authorizedToStore($request),
-                'authorizedToUpdate' => $this->authorizedToUpdate($request),
-                'authorizedToDelete' => $this->authorizedToDelete($request),
-            ] + static::metaProfile($request);
+            'authorizedToShow' => $this->authorizedToShow($request),
+            'authorizedToStore' => $this->authorizedToStore($request),
+            'authorizedToUpdate' => $this->authorizedToUpdate($request),
+            'authorizedToDelete' => $this->authorizedToDelete($request),
+        ] + static::metaProfile($request);
     }
 }
diff --git a/tests/Controllers/ProfileControllerTest.php b/tests/Controllers/ProfileControllerTest.php
@@ -45,10 +45,10 @@ public function test_profile_returns_authenticated_user_with_related_posts()
                 'data' => [
                     'posts' => [
                         [
-                            'title'
-                        ]
-                    ]
-                ]
+                            'title',
+                        ],
+                    ],
+                ],
             ]);
     }
 
@@ -140,7 +140,7 @@ public function test_get_profile_can_use_repository()
             ->assertStatus(200)
             ->assertJsonStructure([
                 'attributes',
-                'meta'
+                'meta',
             ]);
 
         $response->assertJsonFragment([
@@ -159,10 +159,10 @@ public function test_profile_returns_authenticated_user_with_related_posts_via_r
                 'relationships' => [
                     'posts' => [
                         [
-                            'attributes'
-                        ]
-                    ]
-                ]
+                            'attributes',
+                        ],
+                    ],
+                ],
             ]);
 
         $response->assertJsonFragment([
@@ -203,6 +203,4 @@ public function test_profile_update_via_repository()
             'name' => 'Eduard',
         ]);
     }
-
-
 }