idevelopment / RingMe

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"]
         ];

Unused Use Statements -3 removed lines

@@ -5,10 +5,7 @@
 use App\Departments;
 use App\User;
 use App\Roles;
-
 use Chrisbjr\ApiGuard\Models\ApiKey;
-use Illuminate\Http\Request;
-
 use App\Http\Requests;
 use Bouncer;
 

Spacing +11 added lines, -11 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function create()
     {
-        $data['departments'] = Departments::all();
+        $data[ 'departments' ] = Departments::all();
         return view('staff.create', $data);
     }
 
@@ -50,7 +50,7 @@ 
      */
     public function store(Requests\NewStaffValidator $input)
     {
-        $newUser = User::create($input->except(['_token', 'department']))->id;
+        $newUser = User::create($input->except([ '_token', 'department' ]))->id;
         User::find($newUser)->departments()->attach($input->department);
 
         session()->flash('message', 'New staff member created');
@@ -78,7 +78,7 @@ 
      */
     public function edit($id)
     {
-        $data['query'] = User::find($id);
+        $data[ 'query' ] = User::find($id);
         return view('staff.edit', $data);
     }
 
@@ -89,7 +89,7 @@ 
      */
     public function index()
 	{
-		$data['users'] = User::paginate(15);
+		$data[ 'users' ] = User::paginate(15);
     	return view('users/index', $data);
     }
 
@@ -129,7 +129,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);
     }
 
@@ -142,7 +142,7 @@ 
     public function destroy($id)
     {
         $user = User::find($id);
-        $user->roles()->sync([]);
+        $user->roles()->sync([ ]);
 
         User::destroy($id);
         session()->flash('message', 'User deleted');
@@ -153,12 +153,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" ]
         ];
 
         }

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/Departments.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 class Departments extends Model
 {
-    protected $fillable = ['name', 'manager'];
+    protected $fillable = [ 'name', 'manager' ];
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany

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

Unused Use Statements -2 removed lines

@@ -4,8 +4,6 @@
 
 use Illuminate\Http\Request;
 
-use App\Http\Requests;
-
 class DepartmentController extends Controller
 {
     /**

Spacing +4 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
      */
     public function index()
     {
-    	$data['roles'] = Roles::all();
+    	$data[ 'roles' ] = Roles::all();
     	return view('roles.index', $data);
     }
 
@@ -28,7 +28,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);
     }
 
@@ -40,7 +40,7 @@ 
      */
     public function show($id)
     {
-        $data['query'] = Roles::find($id);
+        $data[ 'query' ] = Roles::find($id);
         return view('', $data);
     }
 
@@ -71,7 +71,7 @@ 
      */
     public function edit($id)
     {
-        $data['query'] = Roles::find($id);
+        $data[ 'query' ] = Roles::find($id);
         return view('', $data)
     }
 

Indentation +3 added lines, -3 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);
     }
 
     /**
@@ -52,7 +52,7 @@ 
      */
     public function edit($id)
     {
-    	return view('roles.edit');
+        return view('roles.edit');
     }
 
     public function store()

app/Http/routes.php

Doc Comments -11 removed lines

@@ -67,14 +67,3 @@
 // Roles routes
 Route::get('/roles', 'RolesController@index')->name('roles');
 <<<<<<< HEAD
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
-=======
-<<<<<<< HEAD
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
-=======
-Route::post('/roles', 'RolesController@store')->name('roles.store');
->>>>>>> master
->>>>>>> development
-
-Route::get('/roles/edit/{id}', 'RolesController@edit')->name('roles.edit');
-Route::post('/roles/edit/{id}', 'RolesController@update')->name('roles.update');

Unused Use Statements -11 removed lines

@@ -67,14 +67,3 @@
 // Roles routes
 Route::get('/roles', 'RolesController@index')->name('roles');
 <<<<<<< HEAD
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
-=======
-<<<<<<< HEAD
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
-=======
-Route::post('/roles', 'RolesController@store')->name('roles.store');
->>>>>>> master
->>>>>>> development
-
-Route::get('/roles/edit/{id}', 'RolesController@edit')->name('roles.edit');
-Route::post('/roles/edit/{id}', 'RolesController@update')->name('roles.update');

Indentation -11 removed lines

@@ -67,14 +67,3 @@
 // Roles routes
 Route::get('/roles', 'RolesController@index')->name('roles');
 <<<<<<< HEAD
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
-=======
-<<<<<<< HEAD
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
-=======
-Route::post('/roles', 'RolesController@store')->name('roles.store');
->>>>>>> master
->>>>>>> development
-
-Route::get('/roles/edit/{id}', 'RolesController@edit')->name('roles.edit');
-Route::post('/roles/edit/{id}', 'RolesController@update')->name('roles.update');

Switch Indentation -11 removed lines

@@ -67,14 +67,3 @@
 // Roles routes
 Route::get('/roles', 'RolesController@index')->name('roles');
 <<<<<<< HEAD
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
-=======
-<<<<<<< HEAD
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
-=======
-Route::post('/roles', 'RolesController@store')->name('roles.store');
->>>>>>> master
->>>>>>> development
-
-Route::get('/roles/edit/{id}', 'RolesController@edit')->name('roles.edit');
-Route::post('/roles/edit/{id}', 'RolesController@update')->name('roles.update');

Spacing +2 added lines, -13 removed lines

@@ -11,7 +11,7 @@ 
 |
 */
 
-Route::get('/', function () {
+Route::get('/', function() {
     return view('welcome');
 });
 
@@ -66,15 +66,4 @@ 
 
 // Roles routes
 Route::get('/roles', 'RolesController@index')->name('roles');
-<<<<<<< HEAD
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
-=======
-<<<<<<< HEAD
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
-=======
-Route::post('/roles', 'RolesController@store')->name('roles.store');
->>>>>>> master
->>>>>>> development
-
-Route::get('/roles/edit/{id}', 'RolesController@edit')->name('roles.edit');
-Route::post('/roles/edit/{id}', 'RolesController@update')->name('roles.update');
+<< << <<< HEAD

Braces -11 removed lines

@@ -67,14 +67,3 @@
 // Roles routes
 Route::get('/roles', 'RolesController@index')->name('roles');
 <<<<<<< HEAD
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
-=======
-<<<<<<< HEAD
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
-=======
-Route::post('/roles', 'RolesController@store')->name('roles.store');
->>>>>>> master
->>>>>>> development
-
-Route::get('/roles/edit/{id}', 'RolesController@edit')->name('roles.edit');
-Route::post('/roles/edit/{id}', 'RolesController@update')->name('roles.update');

Upper-Lower-Casing -11 removed lines

@@ -67,14 +67,3 @@
 // Roles routes
 Route::get('/roles', 'RolesController@index')->name('roles');
 <<<<<<< HEAD
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
-=======
-<<<<<<< HEAD
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
-=======
-Route::post('/roles', 'RolesController@store')->name('roles.store');
->>>>>>> master
->>>>>>> development
-
-Route::get('/roles/edit/{id}', 'RolesController@edit')->name('roles.edit');
-Route::post('/roles/edit/{id}', 'RolesController@update')->name('roles.update');