@@ -3,10 +3,10 @@ |
||
3 | 3 | namespace Sco\Admin\Http\Controllers\Auth; |
4 | 4 | |
5 | 5 | use Auth; |
6 | +use Illuminate\Foundation\Auth\AuthenticatesUsers; |
|
6 | 7 | use Illuminate\Foundation\Validation\ValidatesRequests; |
7 | 8 | use Illuminate\Http\Request; |
8 | 9 | use Illuminate\Routing\Controller; |
9 | -use Illuminate\Foundation\Auth\AuthenticatesUsers; |
|
10 | 10 | |
11 | 11 | class LoginController extends Controller |
12 | 12 | { |
@@ -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 | { |
@@ -3,9 +3,6 @@ |
||
3 | 3 | namespace Sco\Admin\Console; |
4 | 4 | |
5 | 5 | use Illuminate\Console\Command; |
6 | -use Symfony\Component\Process\Exception\ProcessFailedException; |
|
7 | -use Symfony\Component\Process\ExecutableFinder; |
|
8 | -use Symfony\Component\Process\Process; |
|
9 | 6 | |
10 | 7 | class InstallCommand extends Command |
11 | 8 | { |
@@ -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 | { |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use Illuminate\Http\Request; |
6 | 6 | use Illuminate\Routing\Controller; |
7 | 7 | use Sco\Admin\Http\Requests\StorePermissionRequest; |
8 | -use Sco\Admin\Http\Requests\PermissionRequest; |
|
9 | 8 | use Sco\Admin\Http\Requests\UpdatePermissionRequest; |
10 | 9 | use Sco\Admin\Models\Permission; |
11 | 10 |
@@ -4,8 +4,8 @@ |
||
4 | 4 | |
5 | 5 | use Closure; |
6 | 6 | use Illuminate\Auth\Access\AuthorizationException; |
7 | -use Route; |
|
8 | 7 | use Illuminate\Contracts\Auth\Factory as Auth; |
8 | +use Route; |
|
9 | 9 | |
10 | 10 | class RouteAuthorize |
11 | 11 | { |
@@ -27,6 +27,10 @@ |
||
27 | 27 | //$this->storePermission('admin.system.menu', '菜单'); |
28 | 28 | } |
29 | 29 | |
30 | + /** |
|
31 | + * @param string $name |
|
32 | + * @param string $displayName |
|
33 | + */ |
|
30 | 34 | private function storePermission($name, $displayName, $description = '') |
31 | 35 | { |
32 | 36 | $permissionModelName = config('entrust.permission'); |
@@ -40,6 +40,9 @@ |
||
40 | 40 | return $this->configManagers->get($name); |
41 | 41 | } |
42 | 42 | |
43 | + /** |
|
44 | + * @param string $name |
|
45 | + */ |
|
43 | 46 | private function getConfigFile($name) |
44 | 47 | { |
45 | 48 | return $this->app['path.config'] |
@@ -24,6 +24,9 @@ |
||
24 | 24 | protected $model; |
25 | 25 | protected $elements; |
26 | 26 | |
27 | + /** |
|
28 | + * @param string $name |
|
29 | + */ |
|
27 | 30 | public function __construct($name, Application $app, Repository $repository) |
28 | 31 | { |
29 | 32 | $this->name = $name; |
@@ -5,10 +5,10 @@ |
||
5 | 5 | |
6 | 6 | use AdminElement; |
7 | 7 | use Illuminate\Contracts\Config\Repository; |
8 | -use Illuminate\Foundation\Application; |
|
9 | -use JsonSerializable; |
|
10 | 8 | use Illuminate\Contracts\Support\Arrayable; |
11 | 9 | use Illuminate\Contracts\Support\Jsonable; |
10 | +use Illuminate\Foundation\Application; |
|
11 | +use JsonSerializable; |
|
12 | 12 | use Sco\Admin\Contracts\ConfigManagerInterface; |
13 | 13 | |
14 | 14 | class ConfigManager implements ConfigManagerInterface, Arrayable, Jsonable, JsonSerializable |
@@ -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); |
@@ -3,11 +3,11 @@ |
||
3 | 3 | |
4 | 4 | namespace Sco\Admin\View\Columns; |
5 | 5 | |
6 | +use Illuminate\Contracts\Support\Arrayable; |
|
7 | +use Illuminate\Contracts\Support\Jsonable; |
|
6 | 8 | use Illuminate\Database\Eloquent\Model; |
7 | 9 | use Illuminate\Support\Collection; |
8 | 10 | use JsonSerializable; |
9 | -use Illuminate\Contracts\Support\Arrayable; |
|
10 | -use Illuminate\Contracts\Support\Jsonable; |
|
11 | 11 | use Sco\Admin\Contracts\View\ColumnInterface; |
12 | 12 | use Sco\Admin\Contracts\WithModel; |
13 | 13 |