@@ -100,7 +100,7 @@ |
||
100 | 100 | * |
101 | 101 | * @param Request $request |
102 | 102 | * |
103 | - * @return \Illuminate\Http\Response |
|
103 | + * @return \Illuminate\Http\RedirectResponse |
|
104 | 104 | */ |
105 | 105 | public function logout(Request $request) |
106 | 106 | { |
@@ -34,7 +34,7 @@ |
||
34 | 34 | /** |
35 | 35 | * 菜单列表 |
36 | 36 | * |
37 | - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View |
|
37 | + * @return \Illuminate\Http\JsonResponse |
|
38 | 38 | */ |
39 | 39 | public function getList() |
40 | 40 | { |
@@ -141,6 +141,9 @@ discard block |
||
141 | 141 | } |
142 | 142 | } |
143 | 143 | |
144 | + /** |
|
145 | + * @param \Illuminate\Http\Request $request |
|
146 | + */ |
|
144 | 147 | protected function isAdmin($request) |
145 | 148 | { |
146 | 149 | $route = $request->route(); |
@@ -151,7 +154,7 @@ discard block |
||
151 | 154 | * @param \Illuminate\Http\Request $request |
152 | 155 | * @param \Sco\Admin\Contracts\ExceptionInterface $exception |
153 | 156 | * |
154 | - * @return \Illuminate\Contracts\Routing\ResponseFactory|\Symfony\Component\HttpFoundation\Response |
|
157 | + * @return \Symfony\Component\HttpFoundation\Response|null |
|
155 | 158 | */ |
156 | 159 | protected function renderAdminException( |
157 | 160 | $request, |
@@ -115,6 +115,9 @@ |
||
115 | 115 | return $this->getValueFromObject($this->getModel(), $this->getName()); |
116 | 116 | } |
117 | 117 | |
118 | + /** |
|
119 | + * @param Model $instance |
|
120 | + */ |
|
118 | 121 | protected function getValueFromObject($instance, $name) |
119 | 122 | { |
120 | 123 | $parts = explode('.', $name); |
@@ -52,6 +52,9 @@ discard block |
||
52 | 52 | return $this->getRepository()->isRestorable(); |
53 | 53 | } |
54 | 54 | |
55 | + /** |
|
56 | + * @param string $class |
|
57 | + */ |
|
55 | 58 | public function registerObserver($class = null) |
56 | 59 | { |
57 | 60 | if (!$class) { |
@@ -72,6 +75,9 @@ discard block |
||
72 | 75 | $this->permissions[$permission] = $callback; |
73 | 76 | } |
74 | 77 | |
78 | + /** |
|
79 | + * @param string $permission |
|
80 | + */ |
|
75 | 81 | public function can($permission) |
76 | 82 | { |
77 | 83 | if (is_callable($this->permissions[$permission])) { |
@@ -75,7 +75,7 @@ |
||
75 | 75 | } |
76 | 76 | |
77 | 77 | /** |
78 | - * @param Model|string $options |
|
78 | + * @param string $options |
|
79 | 79 | * |
80 | 80 | * @return array |
81 | 81 | */ |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | * |
281 | 281 | * @param \Illuminate\Http\UploadedFile $file |
282 | 282 | * |
283 | - * @return mixed|string |
|
283 | + * @return string |
|
284 | 284 | */ |
285 | 285 | public function getUploadFileName(UploadedFile $file) |
286 | 286 | { |
@@ -355,6 +355,9 @@ discard block |
||
355 | 355 | ]; |
356 | 356 | } |
357 | 357 | |
358 | + /** |
|
359 | + * @param string $rule |
|
360 | + */ |
|
358 | 361 | public function addValidationRule($rule, $message = null) |
359 | 362 | { |
360 | 363 | $uploadRules = [ |
@@ -24,6 +24,10 @@ |
||
24 | 24 | $this->storePermission('delete_permission', '删除权限'); |
25 | 25 | } |
26 | 26 | |
27 | + /** |
|
28 | + * @param string $name |
|
29 | + * @param string $displayName |
|
30 | + */ |
|
27 | 31 | private function storePermission($name, $displayName, $description = '') |
28 | 32 | { |
29 | 33 | $permissionModelName = config('entrust.permission'); |