@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | * |
| 56 | 56 | * @param Request $request |
| 57 | 57 | * |
| 58 | - * @return $this|\Illuminate\Http\RedirectResponse |
|
| 58 | + * @return \Illuminate\Http\RedirectResponse |
|
| 59 | 59 | */ |
| 60 | 60 | public function authentication(Request $request) |
| 61 | 61 | { |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | * |
| 98 | 98 | * @param \Illuminate\Http\Request $request |
| 99 | 99 | * |
| 100 | - * @return $this|\Illuminate\Http\RedirectResponse |
|
| 100 | + * @return \Illuminate\Http\RedirectResponse |
|
| 101 | 101 | */ |
| 102 | 102 | public function registration(Request $request) |
| 103 | 103 | { |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | * |
| 167 | 167 | * @param \Illuminate\Http\Request $request |
| 168 | 168 | * |
| 169 | - * @return $this |
|
| 169 | + * @return \Illuminate\Http\RedirectResponse |
|
| 170 | 170 | */ |
| 171 | 171 | public function activation(Request $request) |
| 172 | 172 | { |
@@ -65,8 +65,8 @@ discard block |
||
| 65 | 65 | Flash::error($e->getMessage()); |
| 66 | 66 | |
| 67 | 67 | return redirect() |
| 68 | - ->route('auth.login') |
|
| 69 | - ->withErrors($e->getErrors()); |
|
| 68 | + ->route('auth.login') |
|
| 69 | + ->withErrors($e->getErrors()); |
|
| 70 | 70 | } catch (AuthenticationException $e) { |
| 71 | 71 | Flash::error($e->getMessage()); |
| 72 | 72 | |
@@ -113,15 +113,15 @@ discard block |
||
| 113 | 113 | Flash::error($e->getMessage()); |
| 114 | 114 | |
| 115 | 115 | return redirect() |
| 116 | - ->route('auth.register') |
|
| 117 | - ->withErrors($e->getErrors()) |
|
| 118 | - ->withInput(); |
|
| 116 | + ->route('auth.register') |
|
| 117 | + ->withErrors($e->getErrors()) |
|
| 118 | + ->withInput(); |
|
| 119 | 119 | } catch (RolesException $e) { |
| 120 | 120 | Flash::error($e->getMessage()); |
| 121 | 121 | |
| 122 | 122 | return redirect() |
| 123 | - ->route('auth.register') |
|
| 124 | - ->withInput(); |
|
| 123 | + ->route('auth.register') |
|
| 124 | + ->withInput(); |
|
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | if (!config('laraflock.dashboard.activations')) { |
@@ -182,15 +182,15 @@ discard block |
||
| 182 | 182 | Flash::error($e->getMessage()); |
| 183 | 183 | |
| 184 | 184 | return redirect() |
| 185 | - ->route('auth.activate') |
|
| 186 | - ->withErrors($e->getErrors()) |
|
| 187 | - ->withInput(); |
|
| 185 | + ->route('auth.activate') |
|
| 186 | + ->withErrors($e->getErrors()) |
|
| 187 | + ->withInput(); |
|
| 188 | 188 | } catch (AuthenticationException $e) { |
| 189 | 189 | Flash::error($e->getMessage()); |
| 190 | 190 | |
| 191 | 191 | return redirect() |
| 192 | - ->route('auth.activate') |
|
| 193 | - ->withInput(); |
|
| 192 | + ->route('auth.activate') |
|
| 193 | + ->withInput(); |
|
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | Flash::success(trans('dashboard::dashboard.flash.activation.success')); |
@@ -83,7 +83,7 @@ |
||
| 83 | 83 | /** |
| 84 | 84 | * Parses a view, using the package view namespace |
| 85 | 85 | * |
| 86 | - * @param $view |
|
| 86 | + * @param string $view |
|
| 87 | 87 | * @param array $data |
| 88 | 88 | * |
| 89 | 89 | * @return \Illuminate\View\View |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | /** |
| 23 | 23 | * Display a listing of the resource. |
| 24 | 24 | * |
| 25 | - * @return Response |
|
| 25 | + * @return \Illuminate\View\View |
|
| 26 | 26 | */ |
| 27 | 27 | public function index() |
| 28 | 28 | { |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | /** |
| 36 | 36 | * Create a new resource. |
| 37 | 37 | * |
| 38 | - * @return Response |
|
| 38 | + * @return \Illuminate\View\View |
|
| 39 | 39 | */ |
| 40 | 40 | public function create() |
| 41 | 41 | { |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | * |
| 52 | 52 | * @param Request $request |
| 53 | 53 | * |
| 54 | - * @return $this|\Illuminate\Http\RedirectResponse |
|
| 54 | + * @return \Illuminate\Http\RedirectResponse |
|
| 55 | 55 | */ |
| 56 | 56 | public function store(Request $request) |
| 57 | 57 | { |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | * @param \Illuminate\Http\Request $request |
| 110 | 110 | * @param int $id |
| 111 | 111 | * |
| 112 | - * @return $this|\Illuminate\Http\RedirectResponse |
|
| 112 | + * @return \Illuminate\Http\RedirectResponse |
|
| 113 | 113 | */ |
| 114 | 114 | public function update(Request $request, $id) |
| 115 | 115 | { |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | public function create() |
| 41 | 41 | { |
| 42 | 42 | $roles = $this->roleRepositoryInterface->getAll() |
| 43 | - ->lists('name', 'slug'); |
|
| 43 | + ->lists('name', 'slug'); |
|
| 44 | 44 | |
| 45 | 45 | return $this->view('users.create') |
| 46 | 46 | ->with('roles', $roles); |
@@ -61,9 +61,9 @@ discard block |
||
| 61 | 61 | Flash::error($e->getMessage()); |
| 62 | 62 | |
| 63 | 63 | return redirect() |
| 64 | - ->route('users.create') |
|
| 65 | - ->withErrors($e->getErrors()) |
|
| 66 | - ->withInput(); |
|
| 64 | + ->route('users.create') |
|
| 65 | + ->withErrors($e->getErrors()) |
|
| 66 | + ->withInput(); |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | Flash::success(trans('dashboard::dashboard.flash.user.create.success')); |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | $currentRoles = $user->getRoles() |
| 90 | - ->lists('name'); |
|
| 90 | + ->lists('name'); |
|
| 91 | 91 | |
| 92 | 92 | if (empty($currentRoles)) { |
| 93 | 93 | $currentRoles = new Collection(['name' => 'Not Available']); |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | $currentRoles = implode(', ', $currentRoles->toArray()); |
| 98 | 98 | |
| 99 | 99 | $roles = $this->roleRepositoryInterface->getAll() |
| 100 | - ->lists('name', 'slug'); |
|
| 100 | + ->lists('name', 'slug'); |
|
| 101 | 101 | |
| 102 | 102 | return $this->view('users.edit') |
| 103 | 103 | ->with(['user' => $user, 'currentRoles' => $currentRoles, 'roles' => $roles]); |
@@ -119,9 +119,9 @@ discard block |
||
| 119 | 119 | Flash::error($e->getMessage()); |
| 120 | 120 | |
| 121 | 121 | return redirect() |
| 122 | - ->route('users.edit', ['id' => $id]) |
|
| 123 | - ->withErrors($e->getErrors()) |
|
| 124 | - ->withInput(); |
|
| 122 | + ->route('users.edit', ['id' => $id]) |
|
| 123 | + ->withErrors($e->getErrors()) |
|
| 124 | + ->withInput(); |
|
| 125 | 125 | } catch (UsersException $e) { |
| 126 | 126 | Flash::error($e->getMessage()); |
| 127 | 127 | |
@@ -44,6 +44,7 @@ |
||
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | 46 | * {@inheritDoc} |
| 47 | + * @param integer $id |
|
| 47 | 48 | */ |
| 48 | 49 | public function getById($id) |
| 49 | 50 | { |
@@ -56,8 +56,8 @@ discard block |
||
| 56 | 56 | public function create(array $data, $validate = true) |
| 57 | 57 | { |
| 58 | 58 | $this->rules = [ |
| 59 | - 'name' => 'required', |
|
| 60 | - 'slug' => 'required|unique:permissions', |
|
| 59 | + 'name' => 'required', |
|
| 60 | + 'slug' => 'required|unique:permissions', |
|
| 61 | 61 | ]; |
| 62 | 62 | |
| 63 | 63 | if ($validate) { |
@@ -83,8 +83,8 @@ discard block |
||
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | $this->rules = [ |
| 86 | - 'name' => 'required', |
|
| 87 | - 'slug' => 'required|alpha_dash', |
|
| 86 | + 'name' => 'required', |
|
| 87 | + 'slug' => 'required|alpha_dash', |
|
| 88 | 88 | ]; |
| 89 | 89 | |
| 90 | 90 | if ($permission->slug != $data['slug']) { |
@@ -29,19 +29,19 @@ discard block |
||
| 29 | 29 | // parameter represents the DataTables column identifier. In this case simple |
| 30 | 30 | // indexes |
| 31 | 31 | $columns = array( |
| 32 | - array( 'db' => 'id', 'dt' => 0 ), |
|
| 33 | - array( 'db' => 'firstname', 'dt' => 1 ), |
|
| 34 | - array( 'db' => 'surname', 'dt' => 2 ), |
|
| 35 | - array( 'db' => 'zip', 'dt' => 3 ), |
|
| 36 | - array( 'db' => 'country', 'dt' => 4 ) |
|
| 32 | + array( 'db' => 'id', 'dt' => 0 ), |
|
| 33 | + array( 'db' => 'firstname', 'dt' => 1 ), |
|
| 34 | + array( 'db' => 'surname', 'dt' => 2 ), |
|
| 35 | + array( 'db' => 'zip', 'dt' => 3 ), |
|
| 36 | + array( 'db' => 'country', 'dt' => 4 ) |
|
| 37 | 37 | ); |
| 38 | 38 | |
| 39 | 39 | // SQL server connection information |
| 40 | 40 | $sql_details = array( |
| 41 | - 'user' => '', |
|
| 42 | - 'pass' => '', |
|
| 43 | - 'db' => '', |
|
| 44 | - 'host' => '' |
|
| 41 | + 'user' => '', |
|
| 42 | + 'pass' => '', |
|
| 43 | + 'db' => '', |
|
| 44 | + 'host' => '' |
|
| 45 | 45 | ); |
| 46 | 46 | |
| 47 | 47 | |
@@ -53,6 +53,6 @@ discard block |
||
| 53 | 53 | require( '../../../../examples/server_side/scripts/ssp.class.php' ); |
| 54 | 54 | |
| 55 | 55 | echo json_encode( |
| 56 | - SSP::simple( $_GET, $sql_details, $table, $primaryKey, $columns ) |
|
| 56 | + SSP::simple( $_GET, $sql_details, $table, $primaryKey, $columns ) |
|
| 57 | 57 | ); |
| 58 | 58 | |
@@ -29,11 +29,11 @@ discard block |
||
| 29 | 29 | // parameter represents the DataTables column identifier. In this case simple |
| 30 | 30 | // indexes |
| 31 | 31 | $columns = array( |
| 32 | - array( 'db' => 'id', 'dt' => 0 ), |
|
| 33 | - array( 'db' => 'firstname', 'dt' => 1 ), |
|
| 34 | - array( 'db' => 'surname', 'dt' => 2 ), |
|
| 35 | - array( 'db' => 'zip', 'dt' => 3 ), |
|
| 36 | - array( 'db' => 'country', 'dt' => 4 ) |
|
| 32 | + array('db' => 'id', 'dt' => 0), |
|
| 33 | + array('db' => 'firstname', 'dt' => 1), |
|
| 34 | + array('db' => 'surname', 'dt' => 2), |
|
| 35 | + array('db' => 'zip', 'dt' => 3), |
|
| 36 | + array('db' => 'country', 'dt' => 4) |
|
| 37 | 37 | ); |
| 38 | 38 | |
| 39 | 39 | // SQL server connection information |
@@ -50,9 +50,9 @@ discard block |
||
| 50 | 50 | * server-side, there is no need to edit below this line. |
| 51 | 51 | */ |
| 52 | 52 | |
| 53 | -require( '../../../../examples/server_side/scripts/ssp.class.php' ); |
|
| 53 | +require('../../../../examples/server_side/scripts/ssp.class.php'); |
|
| 54 | 54 | |
| 55 | 55 | echo json_encode( |
| 56 | - SSP::simple( $_GET, $sql_details, $table, $primaryKey, $columns ) |
|
| 56 | + SSP::simple($_GET, $sql_details, $table, $primaryKey, $columns) |
|
| 57 | 57 | ); |
| 58 | 58 | |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | // Load & Publish views. |
| 49 | 49 | $this->loadViewsFrom(__DIR__ . '/../Resources/views', $namespace); |
| 50 | 50 | $this->publishes([ |
| 51 | - __DIR__ . '/../Resources/views' => base_path('resources/views/vendor/' . $namespace), |
|
| 51 | + __DIR__ . '/../Resources/views' => base_path('resources/views/vendor/' . $namespace), |
|
| 52 | 52 | ], 'views'); |
| 53 | 53 | |
| 54 | 54 | // Load translations. |
@@ -72,12 +72,12 @@ discard block |
||
| 72 | 72 | $migrations = realpath(__DIR__ . '/../Database/Migrations'); |
| 73 | 73 | |
| 74 | 74 | $this->publishes([ |
| 75 | - $migrations => database_path('/migrations'), |
|
| 75 | + $migrations => database_path('/migrations'), |
|
| 76 | 76 | ], 'migrations'); |
| 77 | 77 | |
| 78 | 78 | // Publish assets. |
| 79 | 79 | $this->publishes([ |
| 80 | - __DIR__ . '/../Resources/assets' => public_path('vendor/laraflock'), |
|
| 80 | + __DIR__ . '/../Resources/assets' => public_path('vendor/laraflock'), |
|
| 81 | 81 | ], 'public'); |
| 82 | 82 | |
| 83 | 83 | // Setup interfaces. |
@@ -152,26 +152,26 @@ discard block |
||
| 152 | 152 | { |
| 153 | 153 | // Bind the Auth Repository Interface |
| 154 | 154 | $this->app->bind( |
| 155 | - 'Laraflock\Dashboard\Repositories\Auth\AuthRepositoryInterface', |
|
| 156 | - config('laraflock.dashboard.authRepositoryClass') |
|
| 155 | + 'Laraflock\Dashboard\Repositories\Auth\AuthRepositoryInterface', |
|
| 156 | + config('laraflock.dashboard.authRepositoryClass') |
|
| 157 | 157 | ); |
| 158 | 158 | |
| 159 | 159 | // Bind the Permission Repository Interface |
| 160 | 160 | $this->app->bind( |
| 161 | - 'Laraflock\Dashboard\Repositories\Permission\PermissionRepositoryInterface', |
|
| 162 | - config('laraflock.dashboard.permissionRepositoryClass') |
|
| 161 | + 'Laraflock\Dashboard\Repositories\Permission\PermissionRepositoryInterface', |
|
| 162 | + config('laraflock.dashboard.permissionRepositoryClass') |
|
| 163 | 163 | ); |
| 164 | 164 | |
| 165 | 165 | // Bind the Role Repository Interface |
| 166 | 166 | $this->app->bind( |
| 167 | - 'Laraflock\Dashboard\Repositories\Role\RoleRepositoryInterface', |
|
| 168 | - config('laraflock.dashboard.roleRepositoryClass') |
|
| 167 | + 'Laraflock\Dashboard\Repositories\Role\RoleRepositoryInterface', |
|
| 168 | + config('laraflock.dashboard.roleRepositoryClass') |
|
| 169 | 169 | ); |
| 170 | 170 | |
| 171 | 171 | // Bind the User Repository Interface |
| 172 | 172 | $this->app->bind( |
| 173 | - 'Laraflock\Dashboard\Repositories\User\UserRepositoryInterface', |
|
| 174 | - config('laraflock.dashboard.userRepositoryClass') |
|
| 173 | + 'Laraflock\Dashboard\Repositories\User\UserRepositoryInterface', |
|
| 174 | + config('laraflock.dashboard.userRepositoryClass') |
|
| 175 | 175 | ); |
| 176 | 176 | |
| 177 | 177 | // Bind the Module Repository Interface |
@@ -191,22 +191,22 @@ |
||
| 191 | 191 | protected function setupConsoleCommands() |
| 192 | 192 | { |
| 193 | 193 | // Share dashboard:install command with the application. |
| 194 | - $this->app['dashboard::install'] = $this->app->share(function () { |
|
| 194 | + $this->app['dashboard::install'] = $this->app->share(function() { |
|
| 195 | 195 | return new InstallerCommand(); |
| 196 | 196 | }); |
| 197 | 197 | |
| 198 | 198 | // Share dashboard:setup command with the application. |
| 199 | - $this->app['dashboard::setup'] = $this->app->share(function () { |
|
| 199 | + $this->app['dashboard::setup'] = $this->app->share(function() { |
|
| 200 | 200 | return new SetupCommand(); |
| 201 | 201 | }); |
| 202 | 202 | |
| 203 | 203 | // Share dashboard:fresh command with the application. |
| 204 | - $this->app['dashboard::fresh'] = $this->app->share(function () { |
|
| 204 | + $this->app['dashboard::fresh'] = $this->app->share(function() { |
|
| 205 | 205 | return new FreshCommand(); |
| 206 | 206 | }); |
| 207 | 207 | |
| 208 | 208 | // Share dashboard:uninstall command with the application. |
| 209 | - $this->app['dashboard::uninstall'] = $this->app->share(function () { |
|
| 209 | + $this->app['dashboard::uninstall'] = $this->app->share(function() { |
|
| 210 | 210 | return new UninstallCommand(); |
| 211 | 211 | }); |
| 212 | 212 | |
@@ -46,9 +46,9 @@ discard block |
||
| 46 | 46 | Flash::error($e->getMessage()); |
| 47 | 47 | |
| 48 | 48 | return redirect() |
| 49 | - ->route('account.edit') |
|
| 50 | - ->withErrors($e->getErrors()) |
|
| 51 | - ->withInput(); |
|
| 49 | + ->route('account.edit') |
|
| 50 | + ->withErrors($e->getErrors()) |
|
| 51 | + ->withInput(); |
|
| 52 | 52 | } catch (UsersException $e) { |
| 53 | 53 | Flash::error($e->getMessage()); |
| 54 | 54 | |
@@ -67,13 +67,13 @@ discard block |
||
| 67 | 67 | Flash::error($e->getMessage()); |
| 68 | 68 | |
| 69 | 69 | return redirect() |
| 70 | - ->route('account.edit') |
|
| 71 | - ->withErrors($e->getErrors()); |
|
| 70 | + ->route('account.edit') |
|
| 71 | + ->withErrors($e->getErrors()); |
|
| 72 | 72 | } catch (AuthenticationException $e) { |
| 73 | 73 | Flash::error(trans('dashboard::dashboard.flash.password.fail')); |
| 74 | 74 | |
| 75 | 75 | return redirect() |
| 76 | - ->route('account.edit'); |
|
| 76 | + ->route('account.edit'); |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | Flash::success(trans('dashboard::dashboard.flash.password.success')); |
@@ -57,9 +57,9 @@ discard block |
||
| 57 | 57 | Flash::error($e->getMessage()); |
| 58 | 58 | |
| 59 | 59 | return redirect() |
| 60 | - ->route('permissions.create') |
|
| 61 | - ->withErrors($e->getErrors()) |
|
| 62 | - ->withInput(); |
|
| 60 | + ->route('permissions.create') |
|
| 61 | + ->withErrors($e->getErrors()) |
|
| 62 | + ->withInput(); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | Flash::success(trans('dashboard::dashboard.flash.permission.create.success')); |
@@ -101,9 +101,9 @@ discard block |
||
| 101 | 101 | Flash::error($e->getMessage()); |
| 102 | 102 | |
| 103 | 103 | return redirect() |
| 104 | - ->route('permissions.edit', ['id' => $id]) |
|
| 105 | - ->withErrors($e->getErrors()) |
|
| 106 | - ->withInput(); |
|
| 104 | + ->route('permissions.edit', ['id' => $id]) |
|
| 105 | + ->withErrors($e->getErrors()) |
|
| 106 | + ->withInput(); |
|
| 107 | 107 | } catch (PermissionsException $e) { |
| 108 | 108 | Flash::error($e->getMessage()); |
| 109 | 109 | |
@@ -57,9 +57,9 @@ discard block |
||
| 57 | 57 | Flash::error($e->getMessage()); |
| 58 | 58 | |
| 59 | 59 | return redirect() |
| 60 | - ->route('roles.create') |
|
| 61 | - ->withErrors($e->getErrors()) |
|
| 62 | - ->withInput(); |
|
| 60 | + ->route('roles.create') |
|
| 61 | + ->withErrors($e->getErrors()) |
|
| 62 | + ->withInput(); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | Flash::success(trans('dashboard::dashboard.flash.role.create.success')); |
@@ -103,9 +103,9 @@ discard block |
||
| 103 | 103 | Flash::error($e->getMessage()); |
| 104 | 104 | |
| 105 | 105 | return redirect() |
| 106 | - ->route('roles.edit', ['id' => $id]) |
|
| 107 | - ->withErrors($e->getErrors()) |
|
| 108 | - ->withInput(); |
|
| 106 | + ->route('roles.edit', ['id' => $id]) |
|
| 107 | + ->withErrors($e->getErrors()) |
|
| 108 | + ->withInput(); |
|
| 109 | 109 | } catch (RolesException $e) { |
| 110 | 110 | Flash::error($e->getMessage()); |
| 111 | 111 | |