@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | * Send a reset link to the given user. |
79 | 79 | * |
80 | 80 | * @param Request $request |
81 | - * @return Response |
|
81 | + * @return \Illuminate\Http\RedirectResponse|null |
|
82 | 82 | */ |
83 | 83 | public function postReset(Request $request) |
84 | 84 | { |
@@ -128,7 +128,6 @@ discard block |
||
128 | 128 | /** |
129 | 129 | * Display the password reset view for the given token. |
130 | 130 | * |
131 | - * @param string $token |
|
132 | 131 | * @return Response |
133 | 132 | */ |
134 | 133 | public function getPassword(Request $request) |
@@ -147,7 +146,7 @@ discard block |
||
147 | 146 | * Reset the given user's password. |
148 | 147 | * |
149 | 148 | * @param Request $request |
150 | - * @return Response |
|
149 | + * @return \Illuminate\Http\RedirectResponse |
|
151 | 150 | */ |
152 | 151 | public function postPassword(Request $request) |
153 | 152 | { |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | |
13 | 13 | class PasswordController extends Controller { |
14 | 14 | |
15 | - /* |
|
15 | + /* |
|
16 | 16 | |-------------------------------------------------------------------------- |
17 | 17 | | Password Reset Controller |
18 | 18 | |-------------------------------------------------------------------------- |
@@ -182,8 +182,8 @@ discard block |
||
182 | 182 | $passwordConfig = app('config')->get('xe.member.password'); |
183 | 183 | $passwordLevel = array_get($passwordConfig['levels'], $passwordConfig['default']); |
184 | 184 | return redirect()->back() |
185 | - ->withInput($request->only('email')) |
|
186 | - ->with('alert', ['type' => 'danger', 'message' => $passwordLevel['description']]); |
|
185 | + ->withInput($request->only('email')) |
|
186 | + ->with('alert', ['type' => 'danger', 'message' => $passwordLevel['description']]); |
|
187 | 187 | } |
188 | 188 | } |
189 | 189 |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use Illuminate\Contracts\Auth\PasswordBroker; |
6 | 6 | use Illuminate\Http\Request; |
7 | 7 | use Illuminate\Http\Response; |
8 | -use InvalidArgumentException; |
|
9 | 8 | use XePresenter; |
10 | 9 | use Session; |
11 | 10 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | |
95 | 95 | $response = $this->passwords->sendResetLink( |
96 | 96 | $request->only('email'), |
97 | - function ($m) { |
|
97 | + function($m) { |
|
98 | 98 | $m->subject($this->getEmailSubject()); |
99 | 99 | } |
100 | 100 | ); |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | throw new NotFoundHttpException; |
137 | 137 | } |
138 | 138 | |
139 | - return XePresenter::make('password', compact('email','token')); |
|
139 | + return XePresenter::make('password', compact('email', 'token')); |
|
140 | 140 | } |
141 | 141 | |
142 | 142 | /** |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | |
160 | 160 | $response = $this->passwords->reset( |
161 | 161 | $credentials, |
162 | - function ($user, $password) { |
|
162 | + function($user, $password) { |
|
163 | 163 | $password = bcrypt($password); |
164 | 164 | |
165 | 165 | $this->handler->update($user, compact('password')); |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | * @param MenuConfigHandler $configHandler menu config like theme config handler |
109 | 109 | * @param MenuPermissionHandler $permissionHandler menu permission handler |
110 | 110 | * |
111 | - * @return mixed |
|
111 | + * @return RedirectResponse |
|
112 | 112 | * @throws Exception |
113 | 113 | */ |
114 | 114 | public function store( |
@@ -433,7 +433,7 @@ discard block |
||
433 | 433 | * @param MenuPermissionHandler $permissionHandler store item permission handler |
434 | 434 | * @param string $menuId where to store |
435 | 435 | * |
436 | - * @return $this|RedirectResponse |
|
436 | + * @return RedirectResponse |
|
437 | 437 | * @throws Exception |
438 | 438 | */ |
439 | 439 | public function storeItem( |
@@ -824,7 +824,7 @@ |
||
824 | 824 | |
825 | 825 | XeDB::commit(); |
826 | 826 | |
827 | - return Redirect::back()->with('alert', ['type' => 'success', 'message' => 'success']); |
|
827 | + return Redirect::back()->with('alert', ['type' => 'success', 'message' => 'success']); |
|
828 | 828 | } |
829 | 829 | |
830 | 830 | /** |
@@ -353,7 +353,7 @@ |
||
353 | 353 | |
354 | 354 | protected function inputFilterParser($prefix, $inputs = []) |
355 | 355 | { |
356 | - $inputs = array_where($inputs, function ($key, $value) use ($prefix) { |
|
356 | + $inputs = array_where($inputs, function($key, $value) use ($prefix) { |
|
357 | 357 | return starts_with($key, $prefix); |
358 | 358 | }); |
359 | 359 |
@@ -1,7 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | namespace App\Http\Controllers; |
3 | 3 | |
4 | -use App\Http\Requests; |
|
5 | 4 | use Storage; |
6 | 5 | use Xpressengine\Http\Request; |
7 | 6 | use Xpressengine\Menu\MenuRetrieveHandler; |
@@ -90,7 +90,7 @@ |
||
90 | 90 | foreach ($permissionGroups as $tab => &$group) { |
91 | 91 | foreach ($group as $key => &$item) { |
92 | 92 | $permission = $permissionHandler->find($item['id']); |
93 | - if($permission === null) { |
|
93 | + if ($permission === null) { |
|
94 | 94 | $permission = $permissionHandler->register($item['id'], new Grant()); |
95 | 95 | } |
96 | 96 | $item['permission'] = $permission; |
@@ -58,7 +58,7 @@ |
||
58 | 58 | /** |
59 | 59 | * Get the services provided by the provider. |
60 | 60 | * |
61 | - * @return array |
|
61 | + * @return string[] |
|
62 | 62 | */ |
63 | 63 | public function provides() |
64 | 64 | { |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use Xpressengine\Settings\SettingsMenuPermission; |
7 | 7 | use Xpressengine\Permission\Factory as PermissionFactory; |
8 | 8 | use Xpressengine\Themes\SettingsTheme; |
9 | -use Xpressengine\Themes\DefaultSettings; |
|
10 | 9 | use Xpressengine\UIObjects\Settings\SettingsPermission; |
11 | 10 | |
12 | 11 | class SettingsServiceProvider extends ServiceProvider |
@@ -36,7 +36,7 @@ |
||
36 | 36 | { |
37 | 37 | $this->app->singleton( |
38 | 38 | 'xe.uiobject', |
39 | - function ($app) { |
|
39 | + function($app) { |
|
40 | 40 | |
41 | 41 | $aliases = $app['config']->get('xe.uiobject.aliases'); |
42 | 42 |
@@ -30,8 +30,8 @@ |
||
30 | 30 | /** |
31 | 31 | * makeView |
32 | 32 | * |
33 | - * @param $target |
|
34 | - * @param $instanceId |
|
33 | + * @param string $target |
|
34 | + * @param string|null $instanceId |
|
35 | 35 | * @param $mode |
36 | 36 | * |
37 | 37 | * @return \Illuminate\Contracts\View\View |
@@ -54,7 +54,7 @@ |
||
54 | 54 | // get skin list |
55 | 55 | $skinList = $skinHandler->getList($target); |
56 | 56 | |
57 | - $skins = function ($skinList, $selectedSkin) { |
|
57 | + $skins = function($skinList, $selectedSkin) { |
|
58 | 58 | yield [ |
59 | 59 | 'text' => '선택하세요', |
60 | 60 | 'selected' => false |
@@ -193,6 +193,9 @@ |
||
193 | 193 | $permissionHandler->registerItemPermission($item, new Grant); |
194 | 194 | } |
195 | 195 | |
196 | + /** |
|
197 | + * @param string $mainMenu |
|
198 | + */ |
|
196 | 199 | protected function setThemeConfig($mainMenu) |
197 | 200 | { |
198 | 201 | /** @var ThemeHandler $themeHandler */ |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use Xpressengine\Menu\MenuHandler; |
7 | 7 | use Xpressengine\Menu\Models\Menu; |
8 | 8 | use Xpressengine\Menu\Models\MenuItem; |
9 | -use Xpressengine\Permission\Grant; |
|
10 | 9 | use Xpressengine\Support\Migration; |
11 | 10 | use Xpressengine\Theme\ThemeHandler; |
12 | 11 | use Xpressengine\Config\ConfigManager; |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | |
17 | 17 | public function install() |
18 | 18 | { |
19 | - Schema::create('menu', function (Blueprint $table) { |
|
19 | + Schema::create('menu', function(Blueprint $table) { |
|
20 | 20 | $table->engine = "InnoDB"; |
21 | 21 | |
22 | 22 | $table->string('id', 8); |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | $table->primary('id'); |
28 | 28 | }); |
29 | 29 | |
30 | - Schema::create('menuItem', function (Blueprint $table) { |
|
30 | + Schema::create('menuItem', function(Blueprint $table) { |
|
31 | 31 | $table->engine = "InnoDB"; |
32 | 32 | |
33 | 33 | $table->string('id', 8); |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | $table->primary('id'); |
46 | 46 | }); |
47 | 47 | |
48 | - Schema::create('menuTreePath', function (Blueprint $table) { |
|
48 | + Schema::create('menuTreePath', function(Blueprint $table) { |
|
49 | 49 | $table->engine = "InnoDB"; |
50 | 50 | |
51 | 51 | $table->increments('id'); |
@@ -192,8 +192,8 @@ discard block |
||
192 | 192 | { |
193 | 193 | /** @var ThemeHandler $themeHandler */ |
194 | 194 | $themeHandler = app('xe.theme'); |
195 | - $themeHandler->setThemeConfig('alice', 'mainMenu', $mainMenu ); |
|
196 | - $themeHandler->setThemeConfig('alice', 'subMenu', $mainMenu ); |
|
195 | + $themeHandler->setThemeConfig('alice', 'mainMenu', $mainMenu); |
|
196 | + $themeHandler->setThemeConfig('alice', 'subMenu', $mainMenu); |
|
197 | 197 | } |
198 | 198 | |
199 | 199 | /** |
@@ -89,8 +89,6 @@ |
||
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
92 | - * @param ConfigEntity $config |
|
93 | - * @param DynamicFieldHandler $handler |
|
94 | 92 | * @param array $args |
95 | 93 | * @param array $wheres |
96 | 94 | * @throws \Exception |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use Xpressengine\DynamicField\ColumnEntity; |
6 | 6 | use Xpressengine\DynamicField\ColumnDataType; |
7 | 7 | use Xpressengine\Config\ConfigEntity; |
8 | -use XeRegister; |
|
9 | 8 | use Xpressengine\DynamicField\DynamicFieldHandler; |
10 | 9 | use Xpressengine\FieldSkins\Number\DefaultSkin; |
11 | 10 | use View; |
@@ -68,7 +68,7 @@ |
||
68 | 68 | */ |
69 | 69 | public function getSettingsView(ConfigEntity $config = null) |
70 | 70 | { |
71 | - return View::make('dynamicField/number/createType', ['config' => $config,])->render(); |
|
71 | + return View::make('dynamicField/number/createType', ['config' => $config, ])->render(); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | /** |
@@ -1,6 +1,5 @@ |
||
1 | 1 | <?php namespace Xpressengine\UIObjects\Menu; |
2 | 2 | |
3 | -use PhpQuery\PhpQuery; |
|
4 | 3 | use Xpressengine\UIObject\AbstractUIObject; |
5 | 4 | |
6 | 5 | class Menu extends AbstractUIObject |
@@ -2,9 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace Xpressengine\UIObjects\Menu; |
4 | 4 | |
5 | -use PhpQuery\PhpQuery; |
|
6 | -use Xpressengine\Menu\MenuEntity; |
|
7 | -use ReflectionClass; |
|
8 | 5 | use Xpressengine\UIObject\AbstractUIObject; |
9 | 6 | |
10 | 7 | /** |