dsd-meetme / backend

app/Http/Controllers/Companies/Groups/EmployeesController.php

Spacing +4 added lines, -4 removed lines

@@ -19,8 +19,8 @@ 
 {
     public function __construct()
     {
-        config(['auth.model' => \plunner\Company::class]);
-        config(['jwt.user' => \plunner\Company::class]);
+        config([ 'auth.model' => \plunner\Company::class ]);
+        config([ 'jwt.user' => \plunner\Company::class ]);
         $this->middleware('jwt.authandrefresh:mode-cn');
     }
 
@@ -51,7 +51,7 @@ 
         //
         $group = Group::findOrFail($groupId);
         $this->authorize($group);
-        $id = $request->all()['id'];
+        $id = $request->all()[ 'id' ];
         $group->employees()->attach($id);
         return $group->employees;
     }
@@ -70,7 +70,7 @@ 
         $this->authorize($employee);
         $group = Group::findOrFail($groupId);
         if (!$employee->belongsToGroup($group))
-            return Response::json(['error' => 'employId <> groupId'], 404);
+            return Response::json([ 'error' => 'employId <> groupId' ], 404);
         $employee->groups()->detach($groupId);
         return $group->employees;
     }

Braces +3 added lines, -2 removed lines

@@ -69,8 +69,9 @@
         $employee = Employee::findOrFail($employeeId);
         $this->authorize($employee);
         $group = Group::findOrFail($groupId);
-        if (!$employee->belongsToGroup($group))
-            return Response::json(['error' => 'employId <> groupId'], 404);
+        if (!$employee->belongsToGroup($group)) {
+                    return Response::json(['error' => 'employId <> groupId'], 404);
+        }
         $employee->groups()->detach($groupId);
         return $group->employees;
     }

app/Http/Controllers/Employees/Auth/AuthController.php

Braces +3 added lines, -2 removed lines

@@ -79,8 +79,9 @@
         if ($request->input('remember', false)) {
             config(['jwt.ttl' => '43200']); //30 days
             $this->custom = array_merge($this->custom, ['remember' => 'true']);
-        } else
-            $this->custom = array_merge($this->custom, ['remember' => 'false']);
+        } else {
+                    $this->custom = array_merge($this->custom, ['remember' => 'false']);
+        }
 
         return $this->postLoginOriginal($request);
     }

Spacing +15 added lines, -15 removed lines

@@ -42,13 +42,13 @@ 
      * en = employee normal
      * @var array
      */
-    protected $custom = ['mode' => 'en'];
+    protected $custom = [ 'mode' => 'en' ];
 
     /**
      * unique identifiers of the user
      * @var array
      */
-    protected $username = ['company_id', 'email'];
+    protected $username = [ 'company_id', 'email' ];
 
     /**
      * @var company
@@ -61,13 +61,13 @@ 
      */
     public function __construct()
     {
-        config(['auth.model' => \plunner\Employee::class]);
-        config(['jwt.user' => \plunner\Employee::class]);
+        config([ 'auth.model' => \plunner\Employee::class ]);
+        config([ 'jwt.user' => \plunner\Employee::class ]);
     }
 
     public function postRegister(Request $request)
     {
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
         return $this->postRegisterOriginal($request);
     }
@@ -75,17 +75,17 @@ 
     public function postLogin(Request $request)
     {
         //get company ID and impiled it in the request
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
-        $request->merge(['company_id' => $this->company->id]);
+        $request->merge([ 'company_id' => $this->company->id ]);
 
         //remember me
-        $this->validate($request, ['remember' => 'required|boolean']);
+        $this->validate($request, [ 'remember' => 'required|boolean' ]);
         if ($request->input('remember', false)) {
-            config(['jwt.ttl' => '43200']); //30 days
-            $this->custom = array_merge($this->custom, ['remember' => 'true']);
+            config([ 'jwt.ttl' => '43200' ]); //30 days
+            $this->custom = array_merge($this->custom, [ 'remember' => 'true' ]);
         } else
-            $this->custom = array_merge($this->custom, ['remember' => 'false']);
+            $this->custom = array_merge($this->custom, [ 'remember' => 'false' ]);
 
         return $this->postLoginOriginal($request);
     }
@@ -100,7 +100,7 @@ 
     {
         return Validator::make($data, [
             'name' => 'required|min:1|max:255',
-            'email' => 'required|email|max:255|unique:employees,email,NULL,id,company_id,' . $this->company->id,
+            'email' => 'required|email|max:255|unique:employees,email,NULL,id,company_id,'.$this->company->id,
             'password' => 'required|confirmed|min:6',
         ]);
     }
@@ -114,9 +114,9 @@ 
     protected function create(array $data)
     {
         return $this->company->save(new employee([
-            'name' => $data['name'],
-            'email' => $data['email'],
-            'password' => bcrypt($data['password']),
+            'name' => $data[ 'name' ],
+            'email' => $data[ 'email' ],
+            'password' => bcrypt($data[ 'password' ]),
         ]));
     }
 }

app/Http/Controllers/Employees/Auth/PasswordController.php

Spacing +9 added lines, -9 removed lines

@@ -36,12 +36,12 @@ 
      * en = employee normal
      * @var array
      */
-    protected $custom = ['mode' => 'en'];
+    protected $custom = [ 'mode' => 'en' ];
 
     /**
      * @var array
      */
-    protected $username = ['email', 'company_id'];
+    protected $username = [ 'email', 'company_id' ];
 
     /**
      * @var company
@@ -54,24 +54,24 @@ 
      */
     public function __construct()
     {
-        config(['auth.model' => \plunner\Employee::class]);
-        config(['jwt.user' => \plunner\Employee::class]);
-        config(['auth.password.table' => 'password_resets_employees', 'auth.password.email' => 'emails.employees.password']);
+        config([ 'auth.model' => \plunner\Employee::class ]);
+        config([ 'jwt.user' => \plunner\Employee::class ]);
+        config([ 'auth.password.table' => 'password_resets_employees', 'auth.password.email' => 'emails.employees.password' ]);
     }
 
     public function postEmail(Request $request)
     {
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
-        $request->merge(['company_id' => $this->company->id]);
+        $request->merge([ 'company_id' => $this->company->id ]);
         return $this->postEmailOriginal($request);
     }
 
     public function postReset(Request $request)
     {
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
-        $request->merge(['company_id' => $this->company->id]);
+        $request->merge([ 'company_id' => $this->company->id ]);
         return $this->postResetOriginal($request);
     }
 

app/Http/Controllers/Employees/Calendars/CalendarsController.php

Spacing +8 added lines, -8 removed lines

@@ -16,8 +16,8 @@ 
 {
     public function __construct()
     {
-        config(['auth.model' => \plunner\Employee::class]);
-        config(['jwt.user' => \plunner\Employee::class]);
+        config([ 'auth.model' => \plunner\Employee::class ]);
+        config([ 'jwt.user' => \plunner\Employee::class ]);
         $this->middleware('jwt.authandrefresh:mode-en');
     }
 
@@ -66,8 +66,8 @@ 
         $employee = \Auth::user();
         $input = $request->all();
         $calendar = $employee->calendars()->create($input);
-        if (isset($input['password']))
-            $input['password'] = \Crypt::encrypt($input['password']);
+        if (isset($input[ 'password' ]))
+            $input[ 'password' ] = \Crypt::encrypt($input[ 'password' ]);
         $calendar->caldav()->create($input);
         //TODO test
         //TODO validator
@@ -84,7 +84,7 @@ 
         $this->validate($request, [
             'url' => 'required|max:255',
             'username' => 'required|max:255',
-            'password' => ((\Route::current()->getName() == 'employees.calendars.caldav') ? '' : 'sometimes|') . 'required',
+            'password' => ((\Route::current()->getName() == 'employees.calendars.caldav') ? '' : 'sometimes|').'required',
             'calendar_name' => 'required|max:255',
         ]);
     }
@@ -120,8 +120,8 @@ 
         if ($caldav) {
             $this->validateCaldav($request);
         }
-        if (isset($input['password']))
-            $input['password'] = \Crypt::encrypt($input['password']);
+        if (isset($input[ 'password' ]))
+            $input[ 'password' ] = \Crypt::encrypt($input[ 'password' ]);
         $calendar->update($input);
         //TODO test
         //TODO validator
@@ -162,7 +162,7 @@ 
             $calendars = $caldavClient->findCalendars();
             return array_keys($calendars);
         } catch (\it\thecsea\caldav_client_adapter\CaldavException $e) {
-            return Response::json(['error' => $e->getMessage()], 422);
+            return Response::json([ 'error' => $e->getMessage() ], 422);
         }
     }
 }

Braces +9 added lines, -6 removed lines

@@ -66,8 +66,9 @@ 
         $employee = \Auth::user();
         $input = $request->all();
         $calendar = $employee->calendars()->create($input);
-        if (isset($input['password']))
-            $input['password'] = \Crypt::encrypt($input['password']);
+        if (isset($input['password'])) {
+                    $input['password'] = \Crypt::encrypt($input['password']);
+        }
         $calendar->caldav()->create($input);
         //TODO test
         //TODO validator
@@ -120,15 +121,17 @@ 
         if ($caldav) {
             $this->validateCaldav($request);
         }
-        if (isset($input['password']))
-            $input['password'] = \Crypt::encrypt($input['password']);
+        if (isset($input['password'])) {
+                    $input['password'] = \Crypt::encrypt($input['password']);
+        }
         $calendar->update($input);
         //TODO test
         //TODO validator
         //TODO check if caldav exists?
 
-        if ($caldav)
-            $caldav->update($input);
+        if ($caldav) {
+                    $caldav->update($input);
+        }
         return $calendar;
     }
 

Doc Comments +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
     }
 
     /**
-     * @param Request $request
+     * @param CalendarRequest $request
      */
     private function validateCaldav(Request $request)
     {

app/Http/Controllers/Employees/Groups/GroupsController.php

Spacing +4 added lines, -4 removed lines

@@ -11,8 +11,8 @@ 
 {
     public function __construct()
     {
-        config(['auth.model' => \plunner\Employee::class]);
-        config(['jwt.user' => \plunner\Employee::class]);
+        config([ 'auth.model' => \plunner\Employee::class ]);
+        config([ 'jwt.user' => \plunner\Employee::class ]);
         $this->middleware('jwt.authandrefresh:mode-en');
     }
 
@@ -24,9 +24,9 @@ 
     public function index()
     {
         $employee = \Auth::user();
-        return $employee->groups()->with(['meetings' => function ($query) {
+        return $employee->groups()->with([ 'meetings' => function($query) {
             $query->where('start_time', '=', NULL);
-        }])->get();
+        } ])->get();
         //TODO get only current meetings via a query
     }
 

app/Http/Kernel.php

Spacing +1 added lines, -1 removed lines

@@ -30,6 +30,6 @@
         'auth' => \plunner\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'guest' => \plunner\Http\Middleware\RedirectIfAuthenticated::class,
-        'jwt.authandrefresh' => \plunner\Http\Middleware\GetUserAndRefresh::class,//'Tymon\JWTAuth\Middleware\GetUserAndRefresh',
+        'jwt.authandrefresh' => \plunner\Http\Middleware\GetUserAndRefresh::class, //'Tymon\JWTAuth\Middleware\GetUserAndRefresh',
     ];
 }

app/Http/Requests/Companies/Company/CompanyRequest.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
     public function rules()
     {
         return [
-            'name' => 'sometimes|required|min:1|max:255|unique:companies,name,' . $this->user()->id,
+            'name' => 'sometimes|required|min:1|max:255|unique:companies,name,'.$this->user()->id,
             'password' => 'sometimes|required|confirmed|min:6',
         ];
     }

app/Http/Requests/Companies/Employees/EmployeeRequest.php

Spacing +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
     {
         return [
             'name' => 'required|min:1|max:255',
-            'email' => 'required|email|max:255|unique:employees,email,' . $this->route('employees') . ',id,company_id,' . $this->user()->id,
-            'password' => ((\Route::current()->getName() == 'companies.employees.store') ? '' : 'sometimes|') . 'required|confirmed|min:6',
+            'email' => 'required|email|max:255|unique:employees,email,'.$this->route('employees').',id,company_id,'.$this->user()->id,
+            'password' => ((\Route::current()->getName() == 'companies.employees.store') ? '' : 'sometimes|').'required|confirmed|min:6',
         ];
     }
 }

app/Http/Requests/Companies/Groups/EmployeeRequest.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     public function rules()
     {
         return [
-            'id' => 'required|array|exists:employees,id,company_id,' . $this->user()->id,
+            'id' => 'required|array|exists:employees,id,company_id,'.$this->user()->id,
         ];
     }
 }