Completed
Push — master ( 848848...fe7ae6 )
by claudio
09:33
created
app/Http/Controllers/Employees/Auth/PasswordController.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -36,12 +36,12 @@  discard block
 block discarded – undo
36 36
      * en = employee normal
37 37
      * @var array
38 38
      */
39
-    protected $custom = ['mode' => 'en'];
39
+    protected $custom = [ 'mode' => 'en' ];
40 40
 
41 41
     /**
42 42
      * @var array
43 43
      */
44
-    protected $username = ['email', 'company_id'];
44
+    protected $username = [ 'email', 'company_id' ];
45 45
 
46 46
     /**
47 47
      * @var company
@@ -54,24 +54,24 @@  discard block
 block discarded – undo
54 54
      */
55 55
     public function __construct()
56 56
     {
57
-        config(['auth.model' => \plunner\Employee::class]);
58
-        config(['jwt.user' => \plunner\Employee::class]);
59
-        config(['auth.password.table' => 'password_resets_employees', 'auth.password.email' => 'emails.employees.password']);
57
+        config([ 'auth.model' => \plunner\Employee::class ]);
58
+        config([ 'jwt.user' => \plunner\Employee::class ]);
59
+        config([ 'auth.password.table' => 'password_resets_employees', 'auth.password.email' => 'emails.employees.password' ]);
60 60
     }
61 61
 
62 62
     public function postEmail(Request $request)
63 63
     {
64
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
64
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
65 65
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
66
-        $request->merge(['company_id' => $this->company->id]);
66
+        $request->merge([ 'company_id' => $this->company->id ]);
67 67
         return $this->postEmailOriginal($request);
68 68
     }
69 69
 
70 70
     public function postReset(Request $request)
71 71
     {
72
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
72
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
73 73
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
74
-        $request->merge(['company_id' => $this->company->id]);
74
+        $request->merge([ 'company_id' => $this->company->id ]);
75 75
         return $this->postResetOriginal($request);
76 76
     }
77 77
 
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Calendars/CalendarsController.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -16,8 +16,8 @@  discard block
 block discarded – undo
16 16
 {
17 17
     public function __construct()
18 18
     {
19
-        config(['auth.model' => \plunner\Employee::class]);
20
-        config(['jwt.user' => \plunner\Employee::class]);
19
+        config([ 'auth.model' => \plunner\Employee::class ]);
20
+        config([ 'jwt.user' => \plunner\Employee::class ]);
21 21
         $this->middleware('jwt.authandrefresh:mode-en');
22 22
     }
23 23
 
@@ -66,8 +66,8 @@  discard block
 block discarded – undo
66 66
         $employee = \Auth::user();
67 67
         $input = $request->all();
68 68
         $calendar = $employee->calendars()->create($input);
69
-        if (isset($input['password']))
70
-            $input['password'] = \Crypt::encrypt($input['password']);
69
+        if (isset($input[ 'password' ]))
70
+            $input[ 'password' ] = \Crypt::encrypt($input[ 'password' ]);
71 71
         $calendar->caldav()->create($input);
72 72
         //TODO test
73 73
         //TODO validator
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
         $this->validate($request, [
85 85
             'url' => 'required|max:255',
86 86
             'username' => 'required|max:255',
87
-            'password' => ((\Route::current()->getName() == 'employees.calendars.caldav') ? '' : 'sometimes|') . 'required',
87
+            'password' => ((\Route::current()->getName() == 'employees.calendars.caldav') ? '' : 'sometimes|').'required',
88 88
             'calendar_name' => 'required|max:255',
89 89
         ]);
90 90
     }
@@ -120,8 +120,8 @@  discard block
 block discarded – undo
120 120
         if ($caldav) {
121 121
             $this->validateCaldav($request);
122 122
         }
123
-        if (isset($input['password']))
124
-            $input['password'] = \Crypt::encrypt($input['password']);
123
+        if (isset($input[ 'password' ]))
124
+            $input[ 'password' ] = \Crypt::encrypt($input[ 'password' ]);
125 125
         $calendar->update($input);
126 126
         //TODO test
127 127
         //TODO validator
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
             $calendars = $caldavClient->findCalendars();
163 163
             return array_keys($calendars);
164 164
         } catch (\it\thecsea\caldav_client_adapter\CaldavException $e) {
165
-            return Response::json(['error' => $e->getMessage()], 422);
165
+            return Response::json([ 'error' => $e->getMessage() ], 422);
166 166
         }
167 167
     }
168 168
 }
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Groups/GroupsController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -11,8 +11,8 @@  discard block
 block discarded – undo
11 11
 {
12 12
     public function __construct()
13 13
     {
14
-        config(['auth.model' => \plunner\Employee::class]);
15
-        config(['jwt.user' => \plunner\Employee::class]);
14
+        config([ 'auth.model' => \plunner\Employee::class ]);
15
+        config([ 'jwt.user' => \plunner\Employee::class ]);
16 16
         $this->middleware('jwt.authandrefresh:mode-en');
17 17
     }
18 18
 
@@ -24,9 +24,9 @@  discard block
 block discarded – undo
24 24
     public function index()
25 25
     {
26 26
         $employee = \Auth::user();
27
-        return $employee->groups()->with(['meetings' => function ($query) {
27
+        return $employee->groups()->with([ 'meetings' => function($query) {
28 28
             $query->where('start_time', '=', NULL);
29
-        }])->get();
29
+        } ])->get();
30 30
         //TODO get only current meetings via a query
31 31
     }
32 32
 
Please login to merge, or discard this patch.
app/Http/Kernel.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,6 +30,6 @@
 block discarded – undo
30 30
         'auth' => \plunner\Http\Middleware\Authenticate::class,
31 31
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
32 32
         'guest' => \plunner\Http\Middleware\RedirectIfAuthenticated::class,
33
-        'jwt.authandrefresh' => \plunner\Http\Middleware\GetUserAndRefresh::class,//'Tymon\JWTAuth\Middleware\GetUserAndRefresh',
33
+        'jwt.authandrefresh' => \plunner\Http\Middleware\GetUserAndRefresh::class, //'Tymon\JWTAuth\Middleware\GetUserAndRefresh',
34 34
     ];
35 35
 }
Please login to merge, or discard this patch.
app/Http/Middleware/GetUserAndRefresh.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 
35 35
         //this to add the remember me mode field in the new token, but we have the custom check that is an useless
36 36
         //overhead
37
-        $custom = $custom . ';remember-' . $remember == 'true' ? 'true' : 'false';
37
+        $custom = $custom.';remember-'.$remember == 'true' ? 'true' : 'false';
38 38
         return parent::handle($request, $next, $custom);
39 39
     }
40 40
 
Please login to merge, or discard this patch.
app/Http/Requests/Companies/Company/CompanyRequest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
     public function rules()
25 25
     {
26 26
         return [
27
-            'name' => 'sometimes|required|min:1|max:255|unique:companies,name,' . $this->user()->id,
27
+            'name' => 'sometimes|required|min:1|max:255|unique:companies,name,'.$this->user()->id,
28 28
             'password' => 'sometimes|required|confirmed|min:6',
29 29
         ];
30 30
     }
Please login to merge, or discard this patch.
app/Http/Requests/Companies/Employees/EmployeeRequest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,8 +32,8 @@
 block discarded – undo
32 32
     {
33 33
         return [
34 34
             'name' => 'required|min:1|max:255',
35
-            'email' => 'required|email|max:255|unique:employees,email,' . $this->route('employees') . ',id,company_id,' . $this->user()->id,
36
-            'password' => ((\Route::current()->getName() == 'companies.employees.store') ? '' : 'sometimes|') . 'required|confirmed|min:6',
35
+            'email' => 'required|email|max:255|unique:employees,email,'.$this->route('employees').',id,company_id,'.$this->user()->id,
36
+            'password' => ((\Route::current()->getName() == 'companies.employees.store') ? '' : 'sometimes|').'required|confirmed|min:6',
37 37
         ];
38 38
     }
39 39
 }
Please login to merge, or discard this patch.
app/Http/Requests/Companies/Groups/EmployeeRequest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
     public function rules()
32 32
     {
33 33
         return [
34
-            'id' => 'required|array|exists:employees,id,company_id,' . $this->user()->id,
34
+            'id' => 'required|array|exists:employees,id,company_id,'.$this->user()->id,
35 35
         ];
36 36
     }
37 37
 }
Please login to merge, or discard this patch.
app/Http/Requests/Companies/Groups/GroupRequest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@
 block discarded – undo
31 31
     public function rules()
32 32
     {
33 33
         return [
34
-            'name' => 'required|max:255|unique:groups,name,' . $this->route('groups') . ',id,company_id,' . $this->user()->id,
34
+            'name' => 'required|max:255|unique:groups,name,'.$this->route('groups').',id,company_id,'.$this->user()->id,
35 35
             'description' => 'sometimes|required|max:255',
36
-            'planner_id' => 'required|exists:employees,id,company_id,' . $this->user()->id,
36
+            'planner_id' => 'required|exists:employees,id,company_id,'.$this->user()->id,
37 37
         ];
38 38
     }
39 39
 }
Please login to merge, or discard this patch.