@@ -16,8 +16,8 @@ discard block |
||
16 | 16 | { |
17 | 17 | public function __construct() |
18 | 18 | { |
19 | - config(['auth.model' => \plunner\Planner::class]); |
|
20 | - config(['jwt.user' => \plunner\Planner::class]); |
|
19 | + config([ 'auth.model' => \plunner\Planner::class ]); |
|
20 | + config([ 'jwt.user' => \plunner\Planner::class ]); |
|
21 | 21 | $this->middleware('jwt.authandrefresh:mode-en'); |
22 | 22 | } |
23 | 23 | |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | |
36 | 36 | if ($meeting->group_id == $groupId) |
37 | 37 | return $meeting->timeslots; |
38 | - return Response::json(['error' => 'meeting->group_id <> groupId'], 403); |
|
38 | + return Response::json([ 'error' => 'meeting->group_id <> groupId' ], 403); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | |
58 | 58 | if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId) |
59 | 59 | return $timeslot; |
60 | - return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403); |
|
60 | + return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | /** |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | $meeting = Meeting::findOrFail($meetingId); |
74 | 74 | $this->authorize($meeting); |
75 | 75 | if ($meeting->start_time != NULL) |
76 | - return Response::json(['error' => 'the meeting is already planned'], 422); |
|
76 | + return Response::json([ 'error' => 'the meeting is already planned' ], 422); |
|
77 | 77 | |
78 | 78 | $input = $request->all(); |
79 | 79 | |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | $timeslot = $meeting->timeslots()->create($input); |
82 | 82 | return $timeslot; |
83 | 83 | } |
84 | - return Response::json(['error' => 'meeting->group_id <> groupId'], 403); |
|
84 | + return Response::json([ 'error' => 'meeting->group_id <> groupId' ], 403); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | /** |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $meeting = Meeting::findOrFail($meetingId); |
98 | 98 | $this->authorize($meeting); |
99 | 99 | if ($meeting->start_time != NULL) |
100 | - return Response::json(['error' => 'the meeting is already planned'], 422); |
|
100 | + return Response::json([ 'error' => 'the meeting is already planned' ], 422); |
|
101 | 101 | $timeslot = MeetingTimeslot::findOrFail($timeslotId); |
102 | 102 | $this->authorize($timeslot); |
103 | 103 | |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | $timeslot->update($input); |
108 | 108 | return $timeslot; |
109 | 109 | } |
110 | - return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403); |
|
110 | + return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403); |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | /** |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | $meeting = Meeting::findOrFail($meetingId); |
126 | 126 | $this->authorize($meeting); |
127 | 127 | if ($meeting->start_time != NULL) |
128 | - return Response::json(['error' => 'the meeting is already planned'], 422); |
|
128 | + return Response::json([ 'error' => 'the meeting is already planned' ], 422); |
|
129 | 129 | $timeslot = MeetingTimeslot::findOrFail($timeslotId); |
130 | 130 | $this->authorize($timeslot); |
131 | 131 | |
@@ -133,6 +133,6 @@ discard block |
||
133 | 133 | $timeslot->delete(); |
134 | 134 | return $timeslot; |
135 | 135 | } |
136 | - return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403); |
|
136 | + return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403); |
|
137 | 137 | } |
138 | 138 | } |
@@ -10,8 +10,8 @@ discard block |
||
10 | 10 | { |
11 | 11 | public function __construct() |
12 | 12 | { |
13 | - config(['auth.model' => \plunner\Company::class]); |
|
14 | - config(['jwt.user' => \plunner\Company::class]); |
|
13 | + config([ 'auth.model' => \plunner\Company::class ]); |
|
14 | + config([ 'jwt.user' => \plunner\Company::class ]); |
|
15 | 15 | $this->middleware('jwt.authandrefresh:mode-cn'); |
16 | 16 | } |
17 | 17 | |
@@ -36,9 +36,9 @@ discard block |
||
36 | 36 | public function update(CompanyRequest $request) |
37 | 37 | { |
38 | 38 | $company = \Auth::user(); |
39 | - $input = $request->only(['name', 'password']); |
|
40 | - if (isset($input['password'])) |
|
41 | - $input['password'] = bcrypt($input['password']); |
|
39 | + $input = $request->only([ 'name', 'password' ]); |
|
40 | + if (isset($input[ 'password' ])) |
|
41 | + $input[ 'password' ] = bcrypt($input[ 'password' ]); |
|
42 | 42 | $company->update($input); |
43 | 43 | return $company; |
44 | 44 | } |
@@ -36,7 +36,7 @@ |
||
36 | 36 | * @param Exception $previous |
37 | 37 | * @param bool $empty |
38 | 38 | */ |
39 | - public function __construct($message = "", $code = 0, Exception $previous = null, $empty = false) |
|
39 | + public function __construct($message = "", $code = 0, Exception $previous = null, $empty = false) |
|
40 | 40 | { |
41 | 41 | parent::__construct($message, $code, $previous); |
42 | 42 | $this->empty = $empty; |
@@ -70,17 +70,17 @@ discard block |
||
70 | 70 | */ |
71 | 71 | private function makeForeground(Company $company) |
72 | 72 | { |
73 | - $this->info('Optimisation company ' . $company->id . ' started'); |
|
73 | + $this->info('Optimisation company '.$company->id.' started'); |
|
74 | 74 | try { |
75 | 75 | (new Optimise($company, $this->schedule, $this->laravel))->optimise()->save(); |
76 | - $this->info('Optimisation ' . $company->id . ' completed'); |
|
77 | - }catch(OptimiseException $e) { |
|
76 | + $this->info('Optimisation '.$company->id.' completed'); |
|
77 | + } catch (OptimiseException $e) { |
|
78 | 78 | if ($e->isEmpty()) { |
79 | - $mex = 'Company ' . $company->id . ' doesn\'t have sufficient data'; |
|
79 | + $mex = 'Company '.$company->id.' doesn\'t have sufficient data'; |
|
80 | 80 | $this->warn($mex); |
81 | 81 | \Log::info($mex); |
82 | 82 | } else { |
83 | - $mex = 'Error during optimisation of company ' . $company->id . ': ' . $e->getMessage(); |
|
83 | + $mex = 'Error during optimisation of company '.$company->id.': '.$e->getMessage(); |
|
84 | 84 | $this->error($mex); |
85 | 85 | //TODO log cause, but don't send it to the user |
86 | 86 | //\Log::error($mex); //already logged in listener |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | */ |
110 | 110 | private function makeBackground(Company $company) |
111 | 111 | { |
112 | - $event = $this->schedule->command('optimise:meetings ' . $company->id)->withoutOverlapping(); |
|
112 | + $event = $this->schedule->command('optimise:meetings '.$company->id)->withoutOverlapping(); |
|
113 | 113 | if ($event->isDue($this->laravel)) |
114 | 114 | $event->run($this->laravel); |
115 | 115 | } |
@@ -110,9 +110,9 @@ discard block |
||
110 | 110 | $caldavClient = new SimpleCaldavAdapter(); |
111 | 111 | $caldavClient->connect($this->calendar->url, $this->calendar->username, \Crypt::decrypt($this->calendar->password)); |
112 | 112 | $calendars = $caldavClient->findCalendars(); |
113 | - if(!isset($calendars[$this->calendar->calendar_name])) |
|
113 | + if (!isset($calendars[ $this->calendar->calendar_name ])) |
|
114 | 114 | throw new CaldavException("calendar inserted doesn't exist"); |
115 | - $caldavClient->setCalendar($calendars[$this->calendar->calendar_name]); |
|
115 | + $caldavClient->setCalendar($calendars[ $this->calendar->calendar_name ]); |
|
116 | 116 | /** |
117 | 117 | * 26 hours before to avoid tiemezone problems and dst problems |
118 | 118 | * 30 days after |
@@ -128,15 +128,15 @@ discard block |
||
128 | 128 | { |
129 | 129 | $pattern = "/^((DTSTART;)|(DTEND;))(.*)\$/m"; |
130 | 130 | if (preg_match_all($pattern, $event->getData(), $matches)) { |
131 | - if (!isset($matches[4]) || count($matches[4]) != 2) |
|
131 | + if (!isset($matches[ 4 ]) || count($matches[ 4 ]) != 2) |
|
132 | 132 | return null; |
133 | - $ret = []; |
|
134 | - if ($tmp = $this->parseDate($matches[4][0])) |
|
135 | - $ret['time_start'] = $tmp; |
|
133 | + $ret = [ ]; |
|
134 | + if ($tmp = $this->parseDate($matches[ 4 ][ 0 ])) |
|
135 | + $ret[ 'time_start' ] = $tmp; |
|
136 | 136 | else |
137 | 137 | return null; |
138 | - if ($tmp = $this->parseDate($matches[4][1])) |
|
139 | - $ret['time_end'] = $tmp; |
|
138 | + if ($tmp = $this->parseDate($matches[ 4 ][ 1 ])) |
|
139 | + $ret[ 'time_end' ] = $tmp; |
|
140 | 140 | else |
141 | 141 | return null; |
142 | 142 | return $ret; |
@@ -152,10 +152,10 @@ discard block |
||
152 | 152 | { |
153 | 153 | $pattern = "/^((TZID=)|(VALUE=))(.*):(.*)\$/m"; |
154 | 154 | if (preg_match_all($pattern, $date, $matches)) { |
155 | - if ($matches[1][0] == 'TZID=') { |
|
156 | - return \DateTime::createFromFormat('Ymd\THis', $matches[5][0], new \DateTimeZone($matches[4][0])); |
|
157 | - } else if ($matches[1][0] == 'VALUE=' && $matches[4][0] == 'DATE') { |
|
158 | - return \DateTime::createFromFormat('Ymd\THis', $matches[5][0] . 'T000000'); |
|
155 | + if ($matches[ 1 ][ 0 ] == 'TZID=') { |
|
156 | + return \DateTime::createFromFormat('Ymd\THis', $matches[ 5 ][ 0 ], new \DateTimeZone($matches[ 4 ][ 0 ])); |
|
157 | + } else if ($matches[ 1 ][ 0 ] == 'VALUE=' && $matches[ 4 ][ 0 ] == 'DATE') { |
|
158 | + return \DateTime::createFromFormat('Ymd\THis', $matches[ 5 ][ 0 ].'T000000'); |
|
159 | 159 | } |
160 | 160 | } |
161 | 161 | return null; |
@@ -26,7 +26,7 @@ |
||
26 | 26 | { |
27 | 27 | // |
28 | 28 | $calendar = $event->getCalendar(); |
29 | - \Log::info('caldav (calendar id = ' . $calendar->calendar_id . ') correctly synchronized'); |
|
29 | + \Log::info('caldav (calendar id = '.$calendar->calendar_id.') correctly synchronized'); |
|
30 | 30 | //$calendar = $event->getCalendar()->fresh(); |
31 | 31 | $calendar->sync_errors = ''; |
32 | 32 | $calendar->save(); |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | public function handle(ErrorEvent $event) |
26 | 26 | { |
27 | 27 | // |
28 | - \Log::error('problems during optimise (company id = ' . $event->getCompany()->id . '): ' . $event->getError()); |
|
28 | + \Log::error('problems during optimise (company id = '.$event->getCompany()->id.'): '.$event->getError()); |
|
29 | 29 | $company = $event->getCompany(); |
30 | 30 | //$company = $event->getCompany()->fresh(); |
31 | 31 | self::sendEmail($company->email, $event->getError()); |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | */ |
38 | 38 | static private function sendEmail($email, $error) |
39 | 39 | { |
40 | - \Mail::queue('emails.optimise.error', ['error' => $error], function ($message) use ($email) { |
|
40 | + \Mail::queue('emails.optimise.error', [ 'error' => $error ], function($message) use ($email) { |
|
41 | 41 | $message->from(config('mail.from.address'), config('mail.from.name')); |
42 | 42 | $message->to($email)->subject('Problems during optimisation'); |
43 | 43 | }); |
@@ -26,19 +26,19 @@ |
||
26 | 26 | * |
27 | 27 | * @var array |
28 | 28 | */ |
29 | - protected $fillable = ['time_start', 'time_end']; |
|
29 | + protected $fillable = [ 'time_start', 'time_end' ]; |
|
30 | 30 | |
31 | 31 | /** |
32 | 32 | * The attributes excluded from the model's JSON form. |
33 | 33 | * |
34 | 34 | * @var array |
35 | 35 | */ |
36 | - protected $hidden = ['pivot', 'calendar']; |
|
36 | + protected $hidden = [ 'pivot', 'calendar' ]; |
|
37 | 37 | |
38 | 38 | /** |
39 | 39 | * @var array |
40 | 40 | */ |
41 | - protected $touches = ['calendar']; |
|
41 | + protected $touches = [ 'calendar' ]; |
|
42 | 42 | |
43 | 43 | /** |
44 | 44 | * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
@@ -34,12 +34,12 @@ |
||
34 | 34 | \JWTFactory::setTTL(43200); |
35 | 35 | //config(['jwt.ttl' =>'43200']); //30 days |
36 | 36 | } |
37 | - }catch(JWTException $e) |
|
37 | + } catch (JWTException $e) |
|
38 | 38 | {} |
39 | 39 | |
40 | 40 | //this to add the remember me mode field in the new token, but we have the custom check that is an useless |
41 | 41 | //overhead |
42 | - $custom = $custom . ';remember-' . $remember == 'true' ? 'true' : 'false'; |
|
42 | + $custom = $custom.';remember-'.$remember == 'true' ? 'true' : 'false'; |
|
43 | 43 | return parent::handle($request, $next, $custom); |
44 | 44 | } |
45 | 45 |