Completed
Push — master ( 6807e8...093c08 )
by claudio
08:56
created
app/Console/Commands/SyncCaldav/Sync.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
         $caldavClient = new SimpleCaldavAdapter();
109 109
         $caldavClient->connect($this->calendar->url, $this->calendar->username, \Crypt::decrypt($this->calendar->password));
110 110
         $calendars = $caldavClient->findCalendars();
111
-        $caldavClient->setCalendar($calendars[$this->calendar->calendar_name]);//TODO error if the calendar name is wrong
111
+        $caldavClient->setCalendar($calendars[ $this->calendar->calendar_name ]); //TODO error if the calendar name is wrong
112 112
         /**
113 113
          * 26 hours before to avoid tiemezone problems and dst problems
114 114
          * 30 days after
@@ -124,15 +124,15 @@  discard block
 block discarded – undo
124 124
     {
125 125
         $pattern = "/^((DTSTART;)|(DTEND;))(.*)\$/m";
126 126
         if (preg_match_all($pattern, $event->getData(), $matches)) {
127
-            if (!isset($matches[4]) || count($matches[4]) != 2)
127
+            if (!isset($matches[ 4 ]) || count($matches[ 4 ]) != 2)
128 128
                 return null;
129
-            $ret = [];
130
-            if ($tmp = $this->parseDate($matches[4][0]))
131
-                $ret['time_start'] = $tmp;
129
+            $ret = [ ];
130
+            if ($tmp = $this->parseDate($matches[ 4 ][ 0 ]))
131
+                $ret[ 'time_start' ] = $tmp;
132 132
             else
133 133
                 return null;
134
-            if ($tmp = $this->parseDate($matches[4][1]))
135
-                $ret['time_end'] = $tmp;
134
+            if ($tmp = $this->parseDate($matches[ 4 ][ 1 ]))
135
+                $ret[ 'time_end' ] = $tmp;
136 136
             else
137 137
                 return null;
138 138
             return $ret;
@@ -148,10 +148,10 @@  discard block
 block discarded – undo
148 148
     {
149 149
         $pattern = "/^((TZID=)|(VALUE=))(.*):(.*)\$/m";
150 150
         if (preg_match_all($pattern, $date, $matches)) {
151
-            if ($matches[1][0] == 'TZID=') {
152
-                return \DateTime::createFromFormat('Ymd\THis', $matches[5][0], new \DateTimeZone($matches[4][0]));
153
-            } else if ($matches[1][0] == 'VALUE=' && $matches[4][0] == 'DATE') {
154
-                return \DateTime::createFromFormat('Ymd\THis', $matches[5][0] . 'T000000');
151
+            if ($matches[ 1 ][ 0 ] == 'TZID=') {
152
+                return \DateTime::createFromFormat('Ymd\THis', $matches[ 5 ][ 0 ], new \DateTimeZone($matches[ 4 ][ 0 ]));
153
+            } else if ($matches[ 1 ][ 0 ] == 'VALUE=' && $matches[ 4 ][ 0 ] == 'DATE') {
154
+                return \DateTime::createFromFormat('Ymd\THis', $matches[ 5 ][ 0 ].'T000000');
155 155
             }
156 156
         }
157 157
         return null;
Please login to merge, or discard this patch.
app/Console/Commands/SyncCaldav/SyncCaldav.php 1 patch
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.
app/Employee.php 1 patch
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.
app/Group.php 1 patch
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.
app/Http/Controllers/Companies/Auth/AuthController.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
      * cn = company normal
41 41
      * @var array
42 42
      */
43
-    protected $custom = ['mode' => 'cn'];
43
+    protected $custom = [ 'mode' => 'cn' ];
44 44
 
45 45
     /**
46 46
      * Create a new authentication controller instance.
@@ -48,19 +48,19 @@  discard block
 block discarded – undo
48 48
      */
49 49
     public function __construct()
50 50
     {
51
-        config(['auth.model' => \plunner\Company::class]);
52
-        config(['jwt.user' => \plunner\Company::class]);
51
+        config([ 'auth.model' => \plunner\Company::class ]);
52
+        config([ 'jwt.user' => \plunner\Company::class ]);
53 53
     }
54 54
 
55 55
     public function postLogin(Request $request)
56 56
     {
57 57
         //remember me
58
-        $this->validate($request, ['remember' => 'boolean']);//TODO insert required
58
+        $this->validate($request, [ 'remember' => 'boolean' ]); //TODO insert required
59 59
         if ($request->input('remember', false)) {
60
-            config(['jwt.ttl' => '43200']); //30 days
61
-            $this->custom = array_merge($this->custom, ['remember' => 'true']);
60
+            config([ 'jwt.ttl' => '43200' ]); //30 days
61
+            $this->custom = array_merge($this->custom, [ 'remember' => 'true' ]);
62 62
         } else
63
-            $this->custom = array_merge($this->custom, ['remember' => 'false']);
63
+            $this->custom = array_merge($this->custom, [ 'remember' => 'false' ]);
64 64
         return $this->postLoginOriginal($request);
65 65
     }
66 66
 
@@ -88,9 +88,9 @@  discard block
 block discarded – undo
88 88
     protected function create(array $data)
89 89
     {
90 90
         return Company::create([
91
-            'name' => $data['name'],
92
-            'email' => $data['email'],
93
-            'password' => bcrypt($data['password']),
91
+            'name' => $data[ 'name' ],
92
+            'email' => $data[ 'email' ],
93
+            'password' => bcrypt($data[ 'password' ]),
94 94
         ]);
95 95
     }
96 96
 
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 1 patch
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.
app/Http/Controllers/Companies/Groups/EmployeesController.php 1 patch
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.
app/Http/Controllers/Employees/Auth/AuthController.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
      * en = employee normal
44 44
      * @var array
45 45
      */
46
-    protected $custom = ['mode' => 'en'];
46
+    protected $custom = [ 'mode' => 'en' ];
47 47
 
48 48
     /**
49 49
      * @var company
@@ -56,13 +56,13 @@  discard block
 block discarded – undo
56 56
      */
57 57
     public function __construct()
58 58
     {
59
-        config(['auth.model' => \plunner\Employee::class]);
60
-        config(['jwt.user' => \plunner\Employee::class]);
59
+        config([ 'auth.model' => \plunner\Employee::class ]);
60
+        config([ 'jwt.user' => \plunner\Employee::class ]);
61 61
     }
62 62
 
63 63
     public function postRegister(Request $request)
64 64
     {
65
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
65
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
66 66
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
67 67
         return $this->postRegisterOriginal($request);
68 68
     }
@@ -70,17 +70,17 @@  discard block
 block discarded – undo
70 70
     public function postLogin(Request $request)
71 71
     {
72 72
         //get company ID and impiled it in the request
73
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
73
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
74 74
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
75
-        $request->merge(['company_id' => $this->company->id]);
75
+        $request->merge([ 'company_id' => $this->company->id ]);
76 76
 
77 77
         //remember me
78
-        $this->validate($request, ['remember' => 'boolean']);//TODO insert required
78
+        $this->validate($request, [ 'remember' => 'boolean' ]); //TODO insert required
79 79
         if ($request->input('remember', false)) {
80
-            config(['jwt.ttl' => '43200']); //30 days
81
-            $this->custom = array_merge($this->custom, ['remember' => 'true']);
80
+            config([ 'jwt.ttl' => '43200' ]); //30 days
81
+            $this->custom = array_merge($this->custom, [ 'remember' => 'true' ]);
82 82
         } else
83
-            $this->custom = array_merge($this->custom, ['remember' => 'false']);
83
+            $this->custom = array_merge($this->custom, [ 'remember' => 'false' ]);
84 84
 
85 85
         return $this->postLoginOriginal($request);
86 86
     }
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
     {
96 96
         return Validator::make($data, [
97 97
             'name' => 'required|min:1|max:255',
98
-            'email' => 'required|email|max:255|unique:employees,email,NULL,id,company_id,' . $this->company->id,
98
+            'email' => 'required|email|max:255|unique:employees,email,NULL,id,company_id,'.$this->company->id,
99 99
             'password' => 'required|confirmed|min:6',
100 100
         ]);
101 101
     }
@@ -109,9 +109,9 @@  discard block
 block discarded – undo
109 109
     protected function create(array $data)
110 110
     {
111 111
         return $this->company->save(new employee([
112
-            'name' => $data['name'],
113
-            'email' => $data['email'],
114
-            'password' => bcrypt($data['password']),
112
+            'name' => $data[ 'name' ],
113
+            'email' => $data[ 'email' ],
114
+            'password' => bcrypt($data[ 'password' ]),
115 115
         ]));
116 116
     }
117 117
 }
Please login to merge, or discard this patch.