| @@ -41,7 +41,7 @@ discard block | ||
| 41 | 41 | /** | 
| 42 | 42 | * Return the logged in user account. | 
| 43 | 43 | * | 
| 44 | - * @return object | |
| 44 | + * @return \Illuminate\Http\JsonResponse | |
| 45 | 45 | */ | 
| 46 | 46 | public function getAccount() | 
| 47 | 47 |      { | 
| @@ -52,7 +52,7 @@ discard block | ||
| 52 | 52 | /** | 
| 53 | 53 | * Logout the user. | 
| 54 | 54 | * | 
| 55 | - * @return void | |
| 55 | + * @return \Illuminate\Http\JsonResponse | |
| 56 | 56 | */ | 
| 57 | 57 | public function getLogout() | 
| 58 | 58 |      { | 
| @@ -63,7 +63,7 @@ discard block | ||
| 63 | 63 | * Handle a registration request. | 
| 64 | 64 | * | 
| 65 | 65 | * @param \Illuminate\Http\Request $request | 
| 66 | - * @return \Illuminate\Http\Response | |
| 66 | + * @return \Illuminate\Http\JsonResponse | |
| 67 | 67 | */ | 
| 68 | 68 | public function postRegister(Request $request) | 
| 69 | 69 |      { | 
| @@ -76,7 +76,7 @@ discard block | ||
| 76 | 76 | * Handle a login request to the application. | 
| 77 | 77 | * | 
| 78 | 78 | * @param \Illuminate\Http\Request $request | 
| 79 | - * @return \Illuminate\Http\Response | |
| 79 | + * @return \Illuminate\Http\JsonResponse|null | |
| 80 | 80 | */ | 
| 81 | 81 | public function postLogin(Request $request) | 
| 82 | 82 |      { | 
| @@ -96,7 +96,7 @@ discard block | ||
| 96 | 96 | * Handle an assign groups to user request. | 
| 97 | 97 | * | 
| 98 | 98 | * @param \Illuminate\Http\Request $request | 
| 99 | - * @return \Illuminate\Http\Response | |
| 99 | + * @return \Illuminate\Http\JsonResponse | |
| 100 | 100 | */ | 
| 101 | 101 | public function postAssigngroups(Request $request) | 
| 102 | 102 |      { | 
| @@ -1,7 +1,6 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | namespace App\Modules\Acl\Http\Controllers; | 
| 3 | 3 | |
| 4 | -use Illuminate\Foundation\Http\FormRequest; | |
| 5 | 4 | use App\Modules\Core\Http\Controllers\BaseApiController; | 
| 6 | 5 | use Illuminate\Http\Request; | 
| 7 | 6 | |
| @@ -51,7 +51,7 @@ discard block | ||
| 51 | 51 | * | 
| 52 | 52 | * @param array $relations | 
| 53 | 53 | * @param string $sortBy | 
| 54 | - * @param boolean $desc | |
| 54 | + * @param integer $desc | |
| 55 | 55 | * @param array $columns | 
| 56 | 56 | * @return collection | 
| 57 | 57 | */ | 
| @@ -69,7 +69,7 @@ discard block | ||
| 69 | 69 | * @param integer $perPage | 
| 70 | 70 | * @param array $relations | 
| 71 | 71 | * @param string $sortBy | 
| 72 | - * @param boolean $desc | |
| 72 | + * @param integer $desc | |
| 73 | 73 | * @param array $columns | 
| 74 | 74 | * @return collection | 
| 75 | 75 | */ | 
| @@ -116,7 +116,7 @@ discard block | ||
| 116 | 116 | * @param integer $perPage | 
| 117 | 117 | * @param array $relations | 
| 118 | 118 | * @param string $sortBy | 
| 119 | - * @param boolean $desc | |
| 119 | + * @param integer $desc | |
| 120 | 120 | * @param array $columns | 
| 121 | 121 | * @return collection | 
| 122 | 122 | */ | 
| @@ -134,7 +134,7 @@ discard block | ||
| 134 | 134 | * @param integer $perPage | 
| 135 | 135 | * @param array $relations | 
| 136 | 136 | * @param string $sortBy | 
| 137 | - * @param boolean $desc | |
| 137 | + * @param integer $desc | |
| 138 | 138 | * @param array $columns | 
| 139 | 139 | * @return collection | 
| 140 | 140 | */ | 
| @@ -391,7 +391,7 @@ discard block | ||
| 391 | 391 | * @param array $conditions array of conditions | 
| 392 | 392 | * @param array $relations | 
| 393 | 393 | * @param string $sortBy | 
| 394 | - * @param boolean $desc | |
| 394 | + * @param integer $desc | |
| 395 | 395 | * @param array $columns | 
| 396 | 396 | * @return collection | 
| 397 | 397 | */ | 
| @@ -408,7 +408,7 @@ discard block | ||
| 408 | 408 | * | 
| 409 | 409 | * @param array $conditions array of conditions | 
| 410 | 410 | * @param array $relations | 
| 411 | - * @param array $colunmns | |
| 411 | + * @param array $columns | |
| 412 | 412 | * @return object | 
| 413 | 413 | */ | 
| 414 | 414 |      public function first($conditions, $relations = [], $columns = array('*')) | 
| @@ -452,9 +452,9 @@ discard block | ||
| 452 | 452 | * Abstract method that is called in after | 
| 453 | 453 | * the save method finish. | 
| 454 | 454 | * | 
| 455 | - * @param object $model | |
| 455 | + * @param boolean $model | |
| 456 | 456 | * @param array $relations | 
| 457 | - * @return void | |
| 457 | + * @return boolean | |
| 458 | 458 | */ | 
| 459 | 459 | protected function afterSave($model, $relations) | 
| 460 | 460 |      { | 
| @@ -54,9 +54,7 @@ discard block | ||
| 54 | 54 | /** | 
| 55 | 55 | * Fetch all records with relations from model repository. | 
| 56 | 56 | * | 
| 57 | - * @param string $sortBy | |
| 58 | - * @param boolean $desc | |
| 59 | - * @return \Illuminate\Http\Response | |
| 57 | + * @return \Illuminate\Http\JsonResponse|null | |
| 60 | 58 | */ | 
| 61 | 59 | public function getIndex() | 
| 62 | 60 |      { | 
| @@ -71,7 +69,7 @@ discard block | ||
| 71 | 69 | * Fetch the single object with relations from model repository. | 
| 72 | 70 | * | 
| 73 | 71 | * @param integer $id | 
| 74 | - * @return \Illuminate\Http\Response | |
| 72 | + * @return \Illuminate\Http\JsonResponse|null | |
| 75 | 73 | */ | 
| 76 | 74 | public function getFind($id) | 
| 77 | 75 |      { | 
| @@ -89,8 +87,8 @@ discard block | ||
| 89 | 87 | * @param string $query | 
| 90 | 88 | * @param integer $perPage | 
| 91 | 89 | * @param string $sortBy | 
| 92 | - * @param boolean $desc | |
| 93 | - * @return \Illuminate\Http\Response | |
| 90 | + * @param integer $desc | |
| 91 | + * @return \Illuminate\Http\JsonResponse|null | |
| 94 | 92 | */ | 
| 95 | 93 | public function getSearch($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1) | 
| 96 | 94 |      { | 
| @@ -107,8 +105,8 @@ discard block | ||
| 107 | 105 | * | 
| 108 | 106 | * @param \Illuminate\Http\Request $request | 
| 109 | 107 | * @param string $sortBy | 
| 110 | - * @param boolean $desc | |
| 111 | - * @return \Illuminate\Http\Response | |
| 108 | + * @param integer $desc | |
| 109 | + * @return \Illuminate\Http\JsonResponse|null | |
| 112 | 110 | */ | 
| 113 | 111 | public function postFindby(Request $request, $sortBy = 'created_at', $desc = 1) | 
| 114 | 112 |      { | 
| @@ -124,7 +122,7 @@ discard block | ||
| 124 | 122 | * condition. | 
| 125 | 123 | * | 
| 126 | 124 | * @param \Illuminate\Http\Request $request | 
| 127 | - * @return \Illuminate\Http\Response | |
| 125 | + * @return \Illuminate\Http\JsonResponse|null | |
| 128 | 126 | */ | 
| 129 | 127 | public function postFirst(Request $request) | 
| 130 | 128 |      { | 
| @@ -140,8 +138,8 @@ discard block | ||
| 140 | 138 | * | 
| 141 | 139 | * @param integer $perPage | 
| 142 | 140 | * @param string $sortBy | 
| 143 | - * @param boolean $desc | |
| 144 | - * @return \Illuminate\Http\Response | |
| 141 | + * @param integer $desc | |
| 142 | + * @return \Illuminate\Http\JsonResponse|null | |
| 145 | 143 | */ | 
| 146 | 144 | public function getPaginate($perPage = 15, $sortBy = 'created_at', $desc = 1) | 
| 147 | 145 |      { | 
| @@ -159,8 +157,8 @@ discard block | ||
| 159 | 157 | * @param \Illuminate\Http\Request $request | 
| 160 | 158 | * @param integer $perPage | 
| 161 | 159 | * @param string $sortBy | 
| 162 | - * @param boolean $desc | |
| 163 | - * @return \Illuminate\Http\Response | |
| 160 | + * @param integer $desc | |
| 161 | + * @return \Illuminate\Http\JsonResponse|null | |
| 164 | 162 | */ | 
| 165 | 163 | public function postPaginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) | 
| 166 | 164 |      { | 
| @@ -175,7 +173,7 @@ discard block | ||
| 175 | 173 | * Save the given model to repository. | 
| 176 | 174 | * | 
| 177 | 175 | * @param \Illuminate\Http\Request $request | 
| 178 | - * @return \Illuminate\Http\Response | |
| 176 | + * @return \Illuminate\Http\JsonResponse|null | |
| 179 | 177 | */ | 
| 180 | 178 | public function postSave(Request $request) | 
| 181 | 179 |      { | 
| @@ -208,7 +206,7 @@ discard block | ||
| 208 | 206 | * Delete by the given id from model repository. | 
| 209 | 207 | * | 
| 210 | 208 | * @param integer $id | 
| 211 | - * @return \Illuminate\Http\Response | |
| 209 | + * @return \Illuminate\Http\JsonResponse|null | |
| 212 | 210 | */ | 
| 213 | 211 | public function getDelete($id) | 
| 214 | 212 |      { | 
| @@ -7,7 +7,7 @@ discard block | ||
| 7 | 7 | * | 
| 8 | 8 | * @param array $relations | 
| 9 | 9 | * @param array $sortBy | 
| 10 | - * @param array $desc | |
| 10 | + * @param integer $desc | |
| 11 | 11 | * @param array $columns | 
| 12 | 12 | * @return collection | 
| 13 | 13 | */ | 
| @@ -21,7 +21,7 @@ discard block | ||
| 21 | 21 | * @param integer $perPage | 
| 22 | 22 | * @param array $relations | 
| 23 | 23 | * @param array $sortBy | 
| 24 | - * @param array $desc | |
| 24 | + * @param integer $desc | |
| 25 | 25 | * @param array $columns | 
| 26 | 26 | * @return collection | 
| 27 | 27 | */ | 
| @@ -33,7 +33,7 @@ discard block | ||
| 33 | 33 | * @param integer $perPage | 
| 34 | 34 | * @param array $relations | 
| 35 | 35 | * @param array $sortBy | 
| 36 | - * @param array $desc | |
| 36 | + * @param integer $desc | |
| 37 | 37 | * @param array $columns | 
| 38 | 38 | * @return collection | 
| 39 | 39 | */ | 
| @@ -47,7 +47,7 @@ discard block | ||
| 47 | 47 | * @param integer $perPage | 
| 48 | 48 | * @param array $relations | 
| 49 | 49 | * @param array $sortBy | 
| 50 | - * @param array $desc | |
| 50 | + * @param integer $desc | |
| 51 | 51 | * @param array $columns | 
| 52 | 52 | * @return collection | 
| 53 | 53 | */ | 
| @@ -109,7 +109,7 @@ discard block | ||
| 109 | 109 | * @param array $conditions array of conditions | 
| 110 | 110 | * @param array $relations | 
| 111 | 111 | * @param array $sortBy | 
| 112 | - * @param array $desc | |
| 112 | + * @param integer $desc | |
| 113 | 113 | * @param array $columns | 
| 114 | 114 | * @return collection | 
| 115 | 115 | */ | 
| @@ -120,7 +120,6 @@ discard block | ||
| 120 | 120 | * condition. | 
| 121 | 121 | * | 
| 122 | 122 | * @param array $conditions array of conditions | 
| 123 | - * @param [type] $value condition value | |
| 124 | 123 | * @param array $relations | 
| 125 | 124 | * @param array $columns | 
| 126 | 125 | * @return object | 
| @@ -46,7 +46,7 @@ | ||
| 46 | 46 | * | 
| 47 | 47 | * @param array $conditions array of conditions | 
| 48 | 48 | * @param array $relations | 
| 49 | - * @param array $colunmns | |
| 49 | + * @param array $columns | |
| 50 | 50 | * @return object | 
| 51 | 51 | */ | 
| 52 | 52 |      public function first($conditions, $relations = [], $columns = array('*')) | 
| @@ -1,6 +1,5 @@ | ||
| 1 | 1 | <?php namespace App\Modules\Acl; | 
| 2 | 2 | |
| 3 | -use Illuminate\Database\Eloquent\Model; | |
| 4 | 3 | use App\User; | 
| 5 | 4 | use Illuminate\Database\Eloquent\SoftDeletes; | 
| 6 | 5 | |