@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | * Remove the specified resource from storage. |
| 52 | 52 | * |
| 53 | 53 | * @param int $id |
| 54 | - * @return \Illuminate\Http\Response |
|
| 54 | + * @return \Illuminate\Http\JsonResponse |
|
| 55 | 55 | */ |
| 56 | 56 | public function destroy($id) |
| 57 | 57 | { |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | /** |
| 166 | 166 | * Show accept user invitation form. |
| 167 | 167 | * |
| 168 | - * @param $invitation |
|
| 168 | + * @param boolean $invitation |
|
| 169 | 169 | * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View |
| 170 | 170 | */ |
| 171 | 171 | protected function showAcceptUserInvitationForm($invitation) |
@@ -5,8 +5,8 @@ |
||
| 5 | 5 | use App\User; |
| 6 | 6 | use Illuminate\Database\Eloquent\Model; |
| 7 | 7 | |
| 8 | -use Acacha\Stateful\Traits\StatefulTrait; |
|
| 9 | 8 | use Acacha\Stateful\Contracts\Stateful; |
| 9 | +use Acacha\Stateful\Traits\StatefulTrait; |
|
| 10 | 10 | use Venturecraft\Revisionable\RevisionableTrait; |
| 11 | 11 | |
| 12 | 12 | /** |
@@ -167,7 +167,7 @@ |
||
| 167 | 167 | /** |
| 168 | 168 | * Get users to migrate by request. |
| 169 | 169 | * |
| 170 | - * @param $request |
|
| 170 | + * @param UsersMigrationRequest $request |
|
| 171 | 171 | * @return \Illuminate\Database\Eloquent\Collection|void|static[] |
| 172 | 172 | */ |
| 173 | 173 | protected function usersToMigrateByRequest($request) |
@@ -8,10 +8,10 @@ |
||
| 8 | 8 | use Acacha\Users\Models\ProgressBatch; |
| 9 | 9 | use Acacha\Users\Models\UserMigration; |
| 10 | 10 | use Acacha\Users\Services\MigrationBatch; |
| 11 | +use App\User as UserOnDestination; |
|
| 11 | 12 | use Illuminate\Http\Request; |
| 12 | 13 | use Redis; |
| 13 | 14 | use Scool\EbreEscoolModel\User; |
| 14 | -use App\User as UserOnDestination; |
|
| 15 | 15 | |
| 16 | 16 | /** |
| 17 | 17 | * Class UsersMigrationController. |
@@ -117,8 +117,8 @@ |
||
| 117 | 117 | * Finish migration batch. |
| 118 | 118 | * |
| 119 | 119 | * @param ProgressBatch $batch |
| 120 | - * @param $migratedUsers |
|
| 121 | - * @param $errorUsers |
|
| 120 | + * @param integer $migratedUsers |
|
| 121 | + * @param integer $errorUsers |
|
| 122 | 122 | */ |
| 123 | 123 | protected function finishMigrationBatch(ProgressBatch $batch , $migratedUsers, $errorUsers) |
| 124 | 124 | { |
@@ -4,13 +4,13 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Acacha\Users\Events\ProgressBarStatusHasBeenUpdated; |
| 6 | 6 | use Acacha\Users\Events\UserCreated; |
| 7 | +use Acacha\Users\Events\UserHasBeenMigrated; |
|
| 8 | +use Acacha\Users\Exceptions\MigrationException; |
|
| 7 | 9 | use Acacha\Users\Models\ProgressBatch; |
| 10 | +use Illuminate\Database\QueryException; |
|
| 8 | 11 | use Illuminate\Support\Collection; |
| 9 | 12 | use Psr\Log\InvalidArgumentException; |
| 10 | 13 | use Scool\EbreEscoolModel\User; |
| 11 | -use Acacha\Users\Events\UserHasBeenMigrated; |
|
| 12 | -use Acacha\Users\Exceptions\MigrationException; |
|
| 13 | -use Illuminate\Database\QueryException; |
|
| 14 | 14 | |
| 15 | 15 | /** |
| 16 | 16 | * Class UserMigrations. |
@@ -7,7 +7,6 @@ |
||
| 7 | 7 | use Acacha\Users\Traits\HasPaginator; |
| 8 | 8 | use Google; |
| 9 | 9 | use Illuminate\Http\Request; |
| 10 | -use Illuminate\Pagination\LengthAwarePaginator; |
|
| 11 | 10 | |
| 12 | 11 | /** |
| 13 | 12 | * Class GoogleAppsUsersController. |