idevelopment / RingMe

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/Http/Controllers/ProfileController.php

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/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

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