idevelopment / RingMe

app/Http/Controllers/ApiKeyController.php

Unused Use Statements -2 removed lines

@@ -2,10 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\User;
 use Illuminate\Http\Request;
 use Chrisbjr\ApiGuard\Models\ApiKey;
-use App\Http\Requests;
 
 class ApiKeyController extends Controller
 {

app/Http/Controllers/StaffController.php

Indentation +5 added lines, -5 removed lines

@@ -81,9 +81,9 @@ 
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function index()
-	{
-		$data['users'] = User::paginate(15);
-    	return view('users/index', $data);
+    {
+        $data['users'] = User::paginate(15);
+        return view('users/index', $data);
     }
 
     /**
@@ -123,7 +123,7 @@ 
     {
         $id = auth()->user()->id;
         $data['tokens'] = ApiKey::where('user_id', $id)->get();
-    	return view('users/profile', $data);
+        return view('users/profile', $data);
     }
 
     /**
@@ -149,7 +149,7 @@ 
         $data2 = [];
         foreach($items as $role)
         {
-         $data2[] = [
+            $data2[] = [
         'value' => $role["id"],
         'text'  => $role["name"]
         ];

Spacing +9 added lines, -9 removed lines

@@ -71,7 +71,7 @@ 
      */
     public function edit($id)
     {
-        $data['query'] = User::find($id);
+        $data[ 'query' ] = User::find($id);
         return view('staff.edit', $data);
     }
 
@@ -82,7 +82,7 @@ 
      */
     public function index()
 	{
-		$data['users'] = User::paginate(15);
+		$data[ 'users' ] = User::paginate(15);
     	return view('users/index', $data);
     }
 
@@ -122,7 +122,7 @@ 
     public function profile()
     {
         $id = auth()->user()->id;
-        $data['tokens'] = ApiKey::where('user_id', $id)->get();
+        $data[ 'tokens' ] = ApiKey::where('user_id', $id)->get();
     	return view('users/profile', $data);
     }
 
@@ -135,7 +135,7 @@ 
     public function destroy($id)
     {
         $user = User::find($id);
-        $user->roles()->sync([]);
+        $user->roles()->sync([ ]);
 
         User::destroy($id);
         session()->flash('message', 'User deleted');
@@ -146,12 +146,12 @@ 
     public function get_roles()
     {
         $items = Roles::all();
-        $data2 = [];
-        foreach($items as $role)
+        $data2 = [ ];
+        foreach ($items as $role)
         {
-         $data2[] = [
-        'value' => $role["id"],
-        'text'  => $role["name"]
+         $data2[ ] = [
+        'value' => $role[ "id" ],
+        'text'  => $role[ "name" ]
         ];
 
         }

Unused Use Statements -4 removed lines

@@ -4,11 +4,7 @@
 
 use App\User;
 use App\Roles;
-
 use Chrisbjr\ApiGuard\Models\ApiKey;
-use Illuminate\Http\Request;
-
-use App\Http\Requests;
 use Bouncer;
 
 /**

app/Http/Controllers/ProfileController.php

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Customer;
-use Illuminate\Http\Request;
-
 use App\Http\Requests;
 
 class CustomersController extends Controller

Spacing +4 added lines, -4 removed lines

@@ -29,13 +29,13 @@ 
     public function updateProfile(Requests\ProfileValidator $input)
     {
         // User information
-        User::find(auth()->user()->id)->update($input->except(['_token', 'avatar']));
+        User::find(auth()->user()->id)->update($input->except([ '_token', 'avatar' ]));
 
         // User image information.
         if (Input::file()) {
             $image    = Input::file('avatar');
-            $filename = time() . '.' . $image->getClientOriginalExtension();
-            $path     = public_path('profilepics/' . $filename);
+            $filename = time().'.'.$image->getClientOriginalExtension();
+            $path     = public_path('profilepics/'.$filename);
             
             Image::make($image->getRealPath())->resize(80, 80)->save($path);
 
@@ -56,7 +56,7 @@ 
      */
     public function updateSecurity(Requests\PasswordValidation $input)
     {
-        $data['password'] = bcrypt($input->password);
+        $data[ 'password' ] = bcrypt($input->password);
 
         User::find(auth()->user()->id)->update($data);
         session()->flash('message', 'Your password has been updated.');

app/Http/Requests/PasswordValidation.php

Spacing +1 added lines, -1 removed lines

@@ -26,6 +26,6 @@
      */
     public function rules()
     {
-        return ['password' => 'required|min:6|confirmed'];
+        return [ 'password' => 'required|min:6|confirmed' ];
     }
 }

app/Roles.php

Spacing +1 added lines, -1 removed lines

@@ -19,5 +19,5 @@
      *
      * @var array
      */
-    protected $fillable = ['name'];
+    protected $fillable = [ 'name' ];
 }

app/Http/Controllers/RolesController.php

Doc Comments +1 added lines, -5 removed lines

@@ -102,8 +102,4 @@
      */
     public function destroy($id)
     {
-        Roles::destroy($id);
-        session()->flash('message', 'Role deleted');
-        return redirect()->back(302);
-    }
-}
+        Roles::destroy($id
\ No newline at end of file

Unused Use Statements +1 added lines, -5 removed lines

@@ -102,8 +102,4 @@
      */
     public function destroy($id)
     {
-        Roles::destroy($id);
-        session()->flash('message', 'Role deleted');
-        return redirect()->back(302);
-    }
-}
+        Roles::destroy($id
\ No newline at end of file

Indentation +3 added lines, -7 removed lines

@@ -16,8 +16,8 @@ 
      */
     public function index()
     {
-    	$data['roles'] = Roles::all();
-    	return view('roles.index', $data);
+        $data['roles'] = Roles::all();
+        return view('roles.index', $data);
     }
 
 <<<<<<< HEAD
@@ -102,8 +102,4 @@ 
      */
     public function destroy($id)
     {
-        Roles::destroy($id);
-        session()->flash('message', 'Role deleted');
-        return redirect()->back(302);
-    }
-}
+        Roles::destroy($id
\ No newline at end of file

Switch Indentation +1 added lines, -5 removed lines

@@ -102,8 +102,4 @@
      */
     public function destroy($id)
     {
-        Roles::destroy($id);
-        session()->flash('message', 'Role deleted');
-        return redirect()->back(302);
-    }
-}
+        Roles::destroy($id
\ No newline at end of file

Spacing +6 added lines, -10 removed lines

@@ -16,11 +16,11 @@ 
      */
     public function index()
     {
-    	$data['roles'] = Roles::all();
+    	$data[ 'roles' ] = Roles::all();
     	return view('roles.index', $data);
     }
 
-<<<<<<< HEAD
+<< << <<< HEAD
     /**
      * Search for a specific role.
      *
@@ -30,7 +30,7 @@ 
     public function search(Request $request)
     {
         $term = $request->get('term');
-        $data['roles'] = Roles::where('name', 'LIKE', "$term")->get();
+        $data[ 'roles'] = Roles::where('name', 'LIKE', "$term")->get();
         return view('roles.index', $data);
     }
 
@@ -42,7 +42,7 @@ 
      */
     public function show($id)
     {
-        $data['query'] = Roles::find($id);
+        $data[ 'query'] = Roles::find($id);
         return view('roles.specific', $data);
     }
 
@@ -80,7 +80,7 @@ 
      */
     public function edit($id)
     {
-        $data['query'] = Roles::find($id);
+        $data[ 'query'] = Roles::find($id);
         return view('roles.edit', $data);
     }
 
@@ -102,8 +102,4 @@ 
      */
     public function destroy($id)
     {
-        Roles::destroy($id);
-        session()->flash('message', 'Role deleted');
-        return redirect()->back(302);
-    }
-}
+        Roles::destroy($id
\ No newline at end of file

Braces +1 added lines, -5 removed lines

@@ -102,8 +102,4 @@
      */
     public function destroy($id)
     {
-        Roles::destroy($id);
-        session()->flash('message', 'Role deleted');
-        return redirect()->back(302);
-    }
-}
+        Roles::destroy($id
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -5 removed lines

@@ -102,8 +102,4 @@
      */
     public function destroy($id)
     {
-        Roles::destroy($id);
-        session()->flash('message', 'Role deleted');
-        return redirect()->back(302);
-    }
-}
+        Roles::destroy($id
\ No newline at end of file