Completed
Pull Request — develop (#124)
by Tony
03:18
created
app/Http/Controllers/General/SearchController.php 1 patch
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,10 +25,10 @@
 block discarded – undo
25 25
 
26 26
 namespace App\Http\Controllers\General;
27 27
 
28
+use App\DataTables\General\ArpDataTable;
28 29
 use App\DataTables\General\IPv4DataTable;
29 30
 use App\DataTables\General\IPv6DataTable;
30 31
 use App\DataTables\General\MacDataTable;
31
-use App\DataTables\General\ArpDataTable;
32 32
 use App\Http\Controllers\Controller;
33 33
 use Illuminate\Http\Request;
34 34
 
Please login to merge, or discard this patch.
app/Http/Controllers/UserController.php 1 patch
Doc Comments   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
      * Store a newly created resource in storage.
53 53
      *
54 54
      * @param CreateUserRequest $request
55
-     * @return \Illuminate\Http\Response
55
+     * @return \Illuminate\Http\JsonResponse
56 56
      */
57 57
     public function store(CreateUserRequest $request)
58 58
     {
@@ -108,7 +108,6 @@  discard block
 block discarded – undo
108 108
      * @param UpdateUserRequest|Request $request
109 109
      * @param $user_id
110 110
      * @param $type Type of update info|password|adddevice|removedevice|addpor|removeport
111
-     * @param  int $id
112 111
      * @return \Illuminate\Http\Response
113 112
      */
114 113
     public function update(UpdateUserRequest $request, $user_id)
@@ -129,7 +128,7 @@  discard block
 block discarded – undo
129 128
      * Remove the specified resource from storage.
130 129
      *
131 130
      * @param  int $user_id
132
-     * @return \Illuminate\Http\Response
131
+     * @return \Illuminate\Http\JsonResponse
133 132
      */
134 133
     public function destroy(DeleteUserRequest $request, $user_id)
135 134
     {
Please login to merge, or discard this patch.
app/Http/Controllers/UserDeviceController.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,6 @@
 block discarded – undo
3 3
 namespace App\Api\Controllers;
4 4
 
5 5
 use DB;
6
-use App\Http\Requests;
7 6
 use Illuminate\Http\Request;
8 7
 
9 8
 class ApiController extends Controller
Please login to merge, or discard this patch.
app/Http/Controllers/UserPortController.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,6 @@
 block discarded – undo
3 3
 namespace App\Api\Controllers;
4 4
 
5 5
 use DB;
6
-use App\Http\Requests;
7 6
 use Illuminate\Http\Request;
8 7
 
9 8
 class ApiController extends Controller
Please login to merge, or discard this patch.
app/Http/Requests/UpdateUserRequest.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
         if ($this->input('update') == 'password') {
57 57
             $user_id = $this->input('user_id');
58 58
             $rules = ['password'              => 'required|min:5|max:255',
59
-                      'password_confirmation' => 'required|same:password',
59
+                        'password_confirmation' => 'required|same:password',
60 60
             ];
61 61
             if (!Auth::user()->isAdmin() || Auth::id() == $user_id) {
62 62
                 $rules['current_password'] = 'required|password:'.$user_id;
Please login to merge, or discard this patch.
app/Models/User.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@
 block discarded – undo
122 122
      * Encrypt passwords before saving
123 123
      * @param $password
124 124
      */
125
-    public function setPasswordAttribute($password){
125
+    public function setPasswordAttribute($password) {
126 126
         $this->attributes['password'] = bcrypt($password);
127 127
     }
128 128
 }
Please login to merge, or discard this patch.