idevelopment / RingMe

app/Http/Controllers/DepartmentController.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use App\Departments;
 use Illuminate\Http\Request;
-
 use App\Http\Requests;
 
 /**

Spacing +9 added lines, -9 removed lines

@@ -32,7 +32,7 @@ 
      */
     public function index()
     {
-        $data['query'] = Departments::with('managers')->paginate(15);
+        $data[ 'query' ] = Departments::with('managers')->paginate(15);
         return view('departments.index', $data);
     }
 
@@ -55,7 +55,7 @@ 
     public function search(Request $request)
     {
         $term = $request->get('name');
-        $data['query'] = Departments::where('name', 'LIKE', "%$term%")->with('managers')->paginate(15);
+        $data[ 'query' ] = Departments::where('name', 'LIKE', "%$term%")->with('managers')->paginate(15);
         return view('departments.index', $data);
     }
 
@@ -79,7 +79,7 @@ 
      */
     public function show($id)
     {
-        $data['query'] = Departments::find($id);
+        $data[ 'query' ] = Departments::find($id);
         return view('departments.specific', $data);
     }
 
@@ -91,7 +91,7 @@ 
      */
     public function edit($id)
     {
-        $data['query'] = Departments::find($id);
+        $data[ 'query' ] = Departments::find($id);
         return view('departments.update', $data);
     }
 
@@ -128,12 +128,12 @@ 
     public function get_departments()
     {
         $items = Departments::all();
-        $data2 = [];
+        $data2 = [ ];
 
-        foreach($items as $department) {
-            $data2[] = [
-                'value' => $department["id"],
-                'text'  => $department["name"]
+        foreach ($items as $department) {
+            $data2[ ] = [
+                'value' => $department[ "id" ],
+                'text'  => $department[ "name" ]
             ];
         }
 

app/Http/Controllers/CustomersController.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
      */
     public function index()
     {
-        $data['customers'] = Customer::paginate(15);
+        $data[ 'customers' ] = Customer::paginate(15);
         return view('customers/index', $data);
     }
 
@@ -38,7 +38,7 @@ 
      */
     public function register()
     {
-        $data['countries'] = Countries::all();
+        $data[ 'countries' ] = Countries::all();
         return view('customers/register', $data);
     }
 
@@ -64,7 +64,7 @@ 
      */
     public function edit($id)
     {
-        $data['customer'] = Customer::where('id', $id)->get();
+        $data[ 'customer' ] = Customer::where('id', $id)->get();
         return view('customers/edit', $data);
     }
 }

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

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/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');