Completed
Push — master ( 71feda...776f21 )
by claudio
06:53
created
app/Console/Commands/SyncCaldav/SyncCaldav.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -71,9 +71,9 @@  discard block
 block discarded – undo
71 71
      */
72 72
     private function makeForeground(Caldav $calendar)
73 73
     {
74
-        $this->info('Sync calendar ' . $calendar->calendar_id . ' started');
74
+        $this->info('Sync calendar '.$calendar->calendar_id.' started');
75 75
         (new Sync($calendar))->sync();
76
-        $this->info('Sync calendar ' . $calendar->calendar_id . ' completed');
76
+        $this->info('Sync calendar '.$calendar->calendar_id.' completed');
77 77
     }
78 78
 
79 79
     private function syncAll()
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
      */
98 98
     private function makeBackground(Caldav $calendar)
99 99
     {
100
-        $event = $this->schedule->command('sync:caldav ' . $calendar->calendar_id)->withoutOverlapping();
100
+        $event = $this->schedule->command('sync:caldav '.$calendar->calendar_id)->withoutOverlapping();
101 101
         if ($event->isDue($this->laravel))
102 102
             $event->run($this->laravel);
103 103
     }
Please login to merge, or discard this patch.
Braces   +14 added lines, -10 removed lines patch added patch discarded remove patch
@@ -59,10 +59,11 @@  discard block
 block discarded – undo
59 59
     {
60 60
         //
61 61
         $calendarId = $this->argument('calendarId');
62
-        if (is_numeric($calendarId))
63
-            $this->makeForeground(Caldav::findOrFail($calendarId));
64
-        else
65
-            $this->syncAll();
62
+        if (is_numeric($calendarId)) {
63
+                    $this->makeForeground(Caldav::findOrFail($calendarId));
64
+        } else {
65
+                    $this->syncAll();
66
+        }
66 67
     }
67 68
 
68 69
     /**
@@ -82,13 +83,15 @@  discard block
 block discarded – undo
82 83
         if ($this->option('background')) {
83 84
             \Log::debug(self::BACKGROUND_MOD_MEX);
84 85
             $this->info(self::BACKGROUND_MOD_MEX);
85
-            foreach ($calendars as $calendar)
86
-                $this->makeBackground($calendar);
86
+            foreach ($calendars as $calendar) {
87
+                            $this->makeBackground($calendar);
88
+            }
87 89
             \Log::debug(self::BACKGROUND_COMPLETED_MEX);
88 90
             $this->info(self::BACKGROUND_COMPLETED_MEX);
89
-        } else
90
-            foreach ($calendars as $calendar)
91
+        } else {
92
+                    foreach ($calendars as $calendar)
91 93
                 $this->makeForeground($calendar);
94
+        }
92 95
     }
93 96
 
94 97
     /**
@@ -98,7 +101,8 @@  discard block
 block discarded – undo
98 101
     private function makeBackground(Caldav $calendar)
99 102
     {
100 103
         $event = $this->schedule->command('sync:caldav ' . $calendar->calendar_id)->withoutOverlapping();
101
-        if ($event->isDue($this->laravel))
102
-            $event->run($this->laravel);
104
+        if ($event->isDue($this->laravel)) {
105
+                    $event->run($this->laravel);
106
+        }
103 107
     }
104 108
 }
Please login to merge, or discard this patch.
app/Employee.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -43,19 +43,19 @@  discard block
 block discarded – undo
43 43
      *
44 44
      * @var array
45 45
      */
46
-    protected $fillable = ['name', 'email', 'password'];
46
+    protected $fillable = [ 'name', 'email', 'password' ];
47 47
 
48 48
     /**
49 49
      * The attributes excluded from the model's JSON form.
50 50
      *
51 51
      * @var array
52 52
      */
53
-    protected $hidden = ['password', 'remember_token', 'pivot'];
53
+    protected $hidden = [ 'password', 'remember_token', 'pivot' ];
54 54
 
55 55
     /**
56 56
      * @var array
57 57
      */
58
-    protected $appends = ['is_planner'];
58
+    protected $appends = [ 'is_planner' ];
59 59
 
60 60
     public function getIsPlannerAttribute()
61 61
     {
@@ -97,16 +97,16 @@  discard block
 block discarded – undo
97 97
     public function getEmailForPasswordReset()
98 98
     {
99 99
         list(, $caller) = debug_backtrace(false);
100
-        if (isset($caller['class']))
101
-            $caller = explode('\\', $caller['class']);
100
+        if (isset($caller[ 'class' ]))
101
+            $caller = explode('\\', $caller[ 'class' ]);
102 102
         else
103 103
             $caller = '';
104 104
 
105 105
         //check if this function is called by email sender
106
-        if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == ''))
106
+        if ((count($caller) && $caller[ count($caller) - 1 ] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == ''))
107 107
             return $this->email;
108 108
         //return unique identify for token repository
109
-        return $this->email . $this->company->id;
109
+        return $this->email.$this->company->id;
110 110
     }
111 111
 
112 112
     /**
Please login to merge, or discard this patch.
Braces   +8 added lines, -6 removed lines patch added patch discarded remove patch
@@ -97,14 +97,16 @@
 block discarded – undo
97 97
     public function getEmailForPasswordReset()
98 98
     {
99 99
         list(, $caller) = debug_backtrace(false);
100
-        if (isset($caller['class']))
101
-            $caller = explode('\\', $caller['class']);
102
-        else
103
-            $caller = '';
100
+        if (isset($caller['class'])) {
101
+                    $caller = explode('\\', $caller['class']);
102
+        } else {
103
+                    $caller = '';
104
+        }
104 105
 
105 106
         //check if this function is called by email sender
106
-        if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == ''))
107
-            return $this->email;
107
+        if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == '')) {
108
+                    return $this->email;
109
+        }
108 110
         //return unique identify for token repository
109 111
         return $this->email . $this->company->id;
110 112
     }
Please login to merge, or discard this patch.
app/Group.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,17 +31,17 @@
 block discarded – undo
31 31
      *
32 32
      * @var array
33 33
      */
34
-    protected $fillable = ['name', 'description', 'planner_id'];
34
+    protected $fillable = [ 'name', 'description', 'planner_id' ];
35 35
 
36 36
     /**
37 37
      * @var array
38 38
      */
39
-    protected $hidden = ['planner', 'pivot'];
39
+    protected $hidden = [ 'planner', 'pivot' ];
40 40
 
41 41
     /**
42 42
      * @var array
43 43
      */
44
-    protected $appends = ['planner_name'];
44
+    protected $appends = [ 'planner_name' ];
45 45
 
46 46
     public function getPlannerNameAttribute()
47 47
     {
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,8 +45,9 @@
 block discarded – undo
45 45
 
46 46
     public function getPlannerNameAttribute()
47 47
     {
48
-        if (is_object($this->planner) && $this->planner->exists)
49
-            return $this->planner->name;
48
+        if (is_object($this->planner) && $this->planner->exists) {
49
+                    return $this->planner->name;
50
+        }
50 51
         return null;
51 52
     }
52 53
 
Please login to merge, or discard this patch.
app/Http/Controllers/Companies/Auth/PasswordController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
      * cn = company normal
32 32
      * @var array
33 33
      */
34
-    protected $custom = ['mode' => 'cn'];
34
+    protected $custom = [ 'mode' => 'cn' ];
35 35
 
36 36
 
37 37
     /**
@@ -40,8 +40,8 @@  discard block
 block discarded – undo
40 40
      */
41 41
     public function __construct()
42 42
     {
43
-        config(['auth.model' => \plunner\Company::class]);
44
-        config(['jwt.user' => \plunner\Company::class]);
45
-        config(['auth.password.table' => 'password_resets_companies', 'auth.password.email' => 'emails.companies.password']);
43
+        config([ 'auth.model' => \plunner\Company::class ]);
44
+        config([ 'jwt.user' => \plunner\Company::class ]);
45
+        config([ 'auth.password.table' => 'password_resets_companies', 'auth.password.email' => 'emails.companies.password' ]);
46 46
     }
47 47
 }
Please login to merge, or discard this patch.
app/Http/Controllers/Companies/Employees/EmployeesController.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -18,8 +18,8 @@  discard block
 block discarded – undo
18 18
 {
19 19
     public function __construct()
20 20
     {
21
-        config(['auth.model' => \plunner\Company::class]);
22
-        config(['jwt.user' => \plunner\Company::class]);
21
+        config([ 'auth.model' => \plunner\Company::class ]);
22
+        config([ 'jwt.user' => \plunner\Company::class ]);
23 23
         $this->middleware('jwt.authandrefresh:mode-cn');
24 24
     }
25 25
 
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
50 50
         //
51 51
         $company = \Auth::user();
52 52
         $input = $request->all();
53
-        if (isset($input['password']))
54
-            $input['password'] = bcrypt($input['password']);
53
+        if (isset($input[ 'password' ]))
54
+            $input[ 'password' ] = bcrypt($input[ 'password' ]);
55 55
         $employee = $company->employees()->create($input);
56 56
         return $employee;
57 57
     }
@@ -83,8 +83,8 @@  discard block
 block discarded – undo
83 83
         $employee = Employee::findOrFail($id);
84 84
         $this->authorize($employee);
85 85
         $input = $request->all();
86
-        if (isset($input['password']))
87
-            $input['password'] = bcrypt($input['password']);
86
+        if (isset($input[ 'password' ]))
87
+            $input[ 'password' ] = bcrypt($input[ 'password' ]);
88 88
         $employee->update($input);
89 89
         return $employee;
90 90
     }
Please login to merge, or discard this patch.
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -50,8 +50,9 @@  discard block
 block discarded – undo
50 50
         //
51 51
         $company = \Auth::user();
52 52
         $input = $request->all();
53
-        if (isset($input['password']))
54
-            $input['password'] = bcrypt($input['password']);
53
+        if (isset($input['password'])) {
54
+                    $input['password'] = bcrypt($input['password']);
55
+        }
55 56
         $employee = $company->employees()->create($input);
56 57
         return $employee;
57 58
     }
@@ -83,8 +84,9 @@  discard block
 block discarded – undo
83 84
         $employee = Employee::findOrFail($id);
84 85
         $this->authorize($employee);
85 86
         $input = $request->all();
86
-        if (isset($input['password']))
87
-            $input['password'] = bcrypt($input['password']);
87
+        if (isset($input['password'])) {
88
+                    $input['password'] = bcrypt($input['password']);
89
+        }
88 90
         $employee->update($input);
89 91
         return $employee;
90 92
     }
Please login to merge, or discard this patch.
app/Http/Controllers/Companies/Groups/EmployeesController.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,8 +19,8 @@  discard block
 block discarded – undo
19 19
 {
20 20
     public function __construct()
21 21
     {
22
-        config(['auth.model' => \plunner\Company::class]);
23
-        config(['jwt.user' => \plunner\Company::class]);
22
+        config([ 'auth.model' => \plunner\Company::class ]);
23
+        config([ 'jwt.user' => \plunner\Company::class ]);
24 24
         $this->middleware('jwt.authandrefresh:mode-cn');
25 25
     }
26 26
 
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
         //
52 52
         $group = Group::findOrFail($groupId);
53 53
         $this->authorize($group);
54
-        $id = $request->all()['id'];
54
+        $id = $request->all()[ 'id' ];
55 55
         $group->employees()->attach($id);
56 56
         return $group->employees;
57 57
     }
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
         $this->authorize($employee);
71 71
         $group = Group::findOrFail($groupId);
72 72
         if (!$employee->belongsToGroup($group))
73
-            return Response::json(['error' => 'employId <> groupId'], 404);
73
+            return Response::json([ 'error' => 'employId <> groupId' ], 404);
74 74
         $employee->groups()->detach($groupId);
75 75
         return $group->employees;
76 76
     }
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -69,8 +69,9 @@
 block discarded – undo
69 69
         $employee = Employee::findOrFail($employeeId);
70 70
         $this->authorize($employee);
71 71
         $group = Group::findOrFail($groupId);
72
-        if (!$employee->belongsToGroup($group))
73
-            return Response::json(['error' => 'employId <> groupId'], 404);
72
+        if (!$employee->belongsToGroup($group)) {
73
+                    return Response::json(['error' => 'employId <> groupId'], 404);
74
+        }
74 75
         $employee->groups()->detach($groupId);
75 76
         return $group->employees;
76 77
     }
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Calendars/CalendarsController.php 2 patches
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.
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -66,8 +66,9 @@  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 72
         $calendar->caldav()->create($input);
72 73
         //TODO test
73 74
         //TODO validator
@@ -120,15 +121,17 @@  discard block
 block discarded – undo
120 121
         if ($caldav) {
121 122
             $this->validateCaldav($request);
122 123
         }
123
-        if (isset($input['password']))
124
-            $input['password'] = \Crypt::encrypt($input['password']);
124
+        if (isset($input['password'])) {
125
+                    $input['password'] = \Crypt::encrypt($input['password']);
126
+        }
125 127
         $calendar->update($input);
126 128
         //TODO test
127 129
         //TODO validator
128 130
         //TODO check if caldav exists?
129 131
 
130
-        if ($caldav)
131
-            $caldav->update($input);
132
+        if ($caldav) {
133
+                    $caldav->update($input);
134
+        }
132 135
         return $calendar;
133 136
     }
134 137
 
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.