@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | private static $divisor = 0; |
| 39 | 39 | |
| 40 | 40 | /** |
| 41 | - * @return the CSS needed to display diff/overlap results in html |
|
| 41 | + * @return string CSS needed to display diff/overlap results in html |
|
| 42 | 42 | */ |
| 43 | 43 | public static function getCSS() |
| 44 | 44 | { |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | * @param string $s |
| 122 | 122 | * @param string $middle |
| 123 | 123 | * |
| 124 | - * @return array (head, middle, tail) |
|
| 124 | + * @return string[] (head, middle, tail) |
|
| 125 | 125 | */ |
| 126 | 126 | public static function tripartite($s, $middle) |
| 127 | 127 | { |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | * position in achars to the mapped contiguous array of elements. |
| 223 | 223 | * |
| 224 | 224 | * @param array $idmap |
| 225 | - * @param unknown_type $alen |
|
| 225 | + * @param integer $alen |
|
| 226 | 226 | * @param array $achars |
| 227 | 227 | * |
| 228 | 228 | * @return multitype:multitype:Ambigous <> Ambigous <> |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | * |
| 180 | 180 | * @param void |
| 181 | 181 | * |
| 182 | - * @return Illuminate\Database\Eloquent\Relations\BelongsToMany |
|
| 182 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany |
|
| 183 | 183 | */ |
| 184 | 184 | public function docs() |
| 185 | 185 | { |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | * |
| 231 | 231 | * @param void |
| 232 | 232 | * |
| 233 | - * @return Illuminate\Database\Eloquent\Relations\BelongsToMany |
|
| 233 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany |
|
| 234 | 234 | */ |
| 235 | 235 | public function groups() |
| 236 | 236 | { |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | * |
| 245 | 245 | * @param void |
| 246 | 246 | * |
| 247 | - * @return Illuminate\Database\Eloquent\Relations\HasMany |
|
| 247 | + * @return \Illuminate\Database\Eloquent\Relations\HasMany |
|
| 248 | 248 | */ |
| 249 | 249 | public function comments() |
| 250 | 250 | { |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | * |
| 259 | 259 | * @param void |
| 260 | 260 | * |
| 261 | - * @return Illuminate\Database\Eloquent\Relations\HasMany |
|
| 261 | + * @return \Illuminate\Database\Eloquent\Relations\HasMany |
|
| 262 | 262 | */ |
| 263 | 263 | public function annotations() |
| 264 | 264 | { |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | * |
| 318 | 318 | * @param void |
| 319 | 319 | * |
| 320 | - * @return Illuminate\Database\Eloquent\Relations\BelongsTo |
|
| 320 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
| 321 | 321 | * |
| 322 | 322 | * @todo This can be removed as we use Groups in place of Organizations |
| 323 | 323 | */ |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | * |
| 334 | 334 | * @param void |
| 335 | 335 | * |
| 336 | - * @return Illuminate\Database\Eloquent\Relations\HasMany |
|
| 336 | + * @return \Illuminate\Database\Eloquent\Relations\HasMany |
|
| 337 | 337 | */ |
| 338 | 338 | public function note_meta() |
| 339 | 339 | { |
@@ -347,7 +347,7 @@ discard block |
||
| 347 | 347 | * |
| 348 | 348 | * @param void |
| 349 | 349 | * |
| 350 | - * @return Illuminate\Database\Eloquent\Relations\HasMany |
|
| 350 | + * @return \Illuminate\Database\Eloquent\Relations\HasMany |
|
| 351 | 351 | */ |
| 352 | 352 | public function user_meta() |
| 353 | 353 | { |
@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | * |
| 452 | 452 | * @param void |
| 453 | 453 | * |
| 454 | - * @return Illuminate\Database\Eloquent\Relations\HasMany |
|
| 454 | + * @return \Illuminate\Database\Eloquent\Relations\HasMany |
|
| 455 | 455 | */ |
| 456 | 456 | public function doc_meta() |
| 457 | 457 | { |
@@ -586,7 +586,6 @@ discard block |
||
| 586 | 586 | * |
| 587 | 587 | * Validate input against merged rules |
| 588 | 588 | * |
| 589 | - * @param array $attributes |
|
| 590 | 589 | * |
| 591 | 590 | * @return bool |
| 592 | 591 | */ |
@@ -13,9 +13,7 @@ |
||
| 13 | 13 | use Illuminate\Support\Facades\Validator; |
| 14 | 14 | use Illuminate\Support\MessageBag; |
| 15 | 15 | use Illuminate\Database\Eloquent\Model; |
| 16 | -use Illuminate\Database\Eloquent\SoftDeletes; |
|
| 17 | 16 | use Session; |
| 18 | - |
|
| 19 | 17 | use Zizaco\Entrust\Traits\EntrustUserTrait; |
| 20 | 18 | |
| 21 | 19 | class User extends Model implements AuthenticatableContract, CanResetPasswordContract |