@@ -51,14 +51,14 @@ |
||
| 51 | 51 | * |
| 52 | 52 | * @var array |
| 53 | 53 | */ |
| 54 | - protected $fillable = ['name', 'email', 'password']; |
|
| 54 | + protected $fillable = [ 'name', 'email', 'password' ]; |
|
| 55 | 55 | |
| 56 | 56 | /** |
| 57 | 57 | * The attributes excluded from the model's JSON form. |
| 58 | 58 | * |
| 59 | 59 | * @var array |
| 60 | 60 | */ |
| 61 | - protected $hidden = ['password', 'remember_token']; |
|
| 61 | + protected $hidden = [ 'password', 'remember_token' ]; |
|
| 62 | 62 | |
| 63 | 63 | public function company() |
| 64 | 64 | { |
@@ -28,6 +28,6 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | public function handle() |
| 30 | 30 | { |
| 31 | - $this->comment(PHP_EOL . Inspiring::quote() . PHP_EOL); |
|
| 31 | + $this->comment(PHP_EOL.Inspiring::quote().PHP_EOL); |
|
| 32 | 32 | } |
| 33 | 33 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | //TODo max timeslots can be an environment var |
| 26 | 26 | const TIME_SLOT_DURATION = 900; //seconds -> 15 minutes |
| 27 | 27 | const DEFAULT_MAX_TIME_SLOTS = 20; //max duration of a meeting in term of timeslots //20 |
| 28 | - const DEFAULT_TIME_SLOTS = 672; //total amount of timeslots that must be optimised -> one week 4*24*7 = 672 |
|
| 28 | + const DEFAULT_TIME_SLOTS = 672; //total amount of timeslots that must be optimised -> one week 4*24*7 = 672 |
|
| 29 | 29 | |
| 30 | 30 | private $max_time_slots = self::DEFAULT_MAX_TIME_SLOTS; |
| 31 | 31 | private $time_slots = self::DEFAULT_TIME_SLOTS; |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | { |
| 87 | 87 | $this->startTime = clone $startTime; |
| 88 | 88 | $this->endTime = clone $this->startTime; |
| 89 | - $this->endTime->add(new \DateInterval('PT' . (($this->max_time_slots + $this->time_slots) * self::TIME_SLOT_DURATION) . 'S')); |
|
| 89 | + $this->endTime->add(new \DateInterval('PT'.(($this->max_time_slots + $this->time_slots) * self::TIME_SLOT_DURATION).'S')); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | /** |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | * @var $meetings \Illuminate\Support\Collection |
| 214 | 214 | */ |
| 215 | 215 | $meetings = collect($this->company->getMeetingsTimeSlots($this->startTime, $this->endTime)); |
| 216 | - $timeslots = $meetings->groupBy('id')->map(function ($item) { //convert timeslots |
|
| 216 | + $timeslots = $meetings->groupBy('id')->map(function($item) { //convert timeslots |
|
| 217 | 217 | return $this->durationConverter($this->timeSlotsConverter($item)); |
| 218 | 218 | }); |
| 219 | 219 | return $solver->setMeetings($timeslots->keys()->toArray()) |
@@ -227,8 +227,8 @@ discard block |
||
| 227 | 227 | */ |
| 228 | 228 | private function durationConverter($item) |
| 229 | 229 | { |
| 230 | - return $item->each(function ($item2) { |
|
| 231 | - $item2->duration = $this->convertDuration((int)$item2->duration); |
|
| 230 | + return $item->each(function($item2) { |
|
| 231 | + $item2->duration = $this->convertDuration((int) $item2->duration); |
|
| 232 | 232 | return $item2; |
| 233 | 233 | //TODO try catch |
| 234 | 234 | }); |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | */ |
| 241 | 241 | static private function convertDuration($duration) |
| 242 | 242 | { |
| 243 | - return (int)ceil($duration / self::TIME_SLOT_DURATION); |
|
| 243 | + return (int) ceil($duration / self::TIME_SLOT_DURATION); |
|
| 244 | 244 | } |
| 245 | 245 | |
| 246 | 246 | /** |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | */ |
| 250 | 250 | private function timeSlotsConverter($item) |
| 251 | 251 | { |
| 252 | - return $item->each(function ($item2) { |
|
| 252 | + return $item->each(function($item2) { |
|
| 253 | 253 | $item2->time_start = $this->toTimeSlot($item2->time_start); |
| 254 | 254 | $item2->time_end = $this->toTimeSlot($item2->time_end); |
| 255 | 255 | return $item2; |
@@ -267,13 +267,13 @@ discard block |
||
| 267 | 267 | $dateTime = new \DateTime($time); |
| 268 | 268 | $diff = $dateTime->diff($this->startTime); |
| 269 | 269 | $diff = explode(':', $diff->format('%R:%d:%h:%i:%s')); |
| 270 | - $diff = $diff[1] * 86400 + $diff[2] * 3600 + $diff[3] * 60 + $diff[4]; |
|
| 270 | + $diff = $diff[ 1 ] * 86400 + $diff[ 2 ] * 3600 + $diff[ 3 ] * 60 + $diff[ 4 ]; |
|
| 271 | 271 | //if($diff[0] != '-' && $diff != 0) |
| 272 | 272 | // throw new OptimiseException('timeslot time <= startTime'); |
| 273 | 273 | //TODO fix check |
| 274 | 274 | //TODO check if diff makes sense |
| 275 | 275 | //TODO check upper limit |
| 276 | - return (int)(round($diff / self::TIME_SLOT_DURATION) + 1); //TODO can round cause overlaps? |
|
| 276 | + return (int) (round($diff / self::TIME_SLOT_DURATION) + 1); //TODO can round cause overlaps? |
|
| 277 | 277 | } |
| 278 | 278 | |
| 279 | 279 | /** |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | */ |
| 284 | 284 | static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeslotsN, $free = true) |
| 285 | 285 | { |
| 286 | - $ret = []; |
|
| 286 | + $ret = [ ]; |
|
| 287 | 287 | foreach ($timeSlots as $id => $timeSlots2) { |
| 288 | 288 | $ret = self::fillTimeSlots($ret, $id, $timeSlots2, $free ? '1' : '0'); |
| 289 | 289 | $ret = self::fillRow($ret, $id, $timeslotsN, $free ? '0' : '1'); |
@@ -302,9 +302,9 @@ discard block |
||
| 302 | 302 | static private function fillTimeSlots(array $array, $id, \Illuminate\Support\Collection $timeSlots, $fill = '0') |
| 303 | 303 | { |
| 304 | 304 | foreach ($timeSlots as $timeSlot) { |
| 305 | - if (!isset($array[$id])) |
|
| 306 | - $array[$id] = []; |
|
| 307 | - $array[$id] = self::arrayPadInterval($array[$id], $timeSlot->time_start, $timeSlot->time_end, $fill); |
|
| 305 | + if (!isset($array[ $id ])) |
|
| 306 | + $array[ $id ] = [ ]; |
|
| 307 | + $array[ $id ] = self::arrayPadInterval($array[ $id ], $timeSlot->time_start, $timeSlot->time_end, $fill); |
|
| 308 | 308 | } |
| 309 | 309 | return $array; |
| 310 | 310 | } |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | static private function arrayPadInterval(array $array, $from, $to, $pad = '0') |
| 320 | 320 | { |
| 321 | 321 | for ($i = $from; $i < $to; $i++) |
| 322 | - $array[$i] = $pad; |
|
| 322 | + $array[ $i ] = $pad; |
|
| 323 | 323 | return $array; |
| 324 | 324 | } |
| 325 | 325 | |
@@ -332,8 +332,8 @@ discard block |
||
| 332 | 332 | static private function fillRow(array $array, $id, $until, $fill = '0') |
| 333 | 333 | { |
| 334 | 334 | for ($i = 1; $i <= $until; $i++) { |
| 335 | - if (!isset($array[$id][$i])) |
|
| 336 | - $array[$id][$i] = $fill; |
|
| 335 | + if (!isset($array[ $id ][ $i ])) |
|
| 336 | + $array[ $id ][ $i ] = $fill; |
|
| 337 | 337 | } |
| 338 | 338 | |
| 339 | 339 | return $array; |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | * @var $users \Illuminate\Support\Collection |
| 351 | 351 | */ |
| 352 | 352 | $users = collect($this->company->getEmployeesTimeSlots($this->startTime, $this->endTime)); |
| 353 | - $timeslots = $users->groupBy('id')->map(function ($item) { //convert timeslots |
|
| 353 | + $timeslots = $users->groupBy('id')->map(function($item) { //convert timeslots |
|
| 354 | 354 | return $this->timeSlotsConverter($item); |
| 355 | 355 | }); |
| 356 | 356 | return $solver->setUsersAvailability(self::getAvailabilityArray($timeslots, $this->time_slots, false)); |
@@ -381,14 +381,14 @@ discard block |
||
| 381 | 381 | */ |
| 382 | 382 | static private function getUsersMeetingsArray($users, $meetings, \Illuminate\Support\Collection $usersMeetings) |
| 383 | 383 | { |
| 384 | - $ret = []; |
|
| 384 | + $ret = [ ]; |
|
| 385 | 385 | foreach ($users as $user) { |
| 386 | 386 | $usersMeetingsTmp = $usersMeetings->get($user); |
| 387 | 387 | foreach ($meetings as $meeting) { |
| 388 | 388 | if ($usersMeetingsTmp->contains('meeting_id', $meeting)) { |
| 389 | - $ret[$user][$meeting] = 1; |
|
| 389 | + $ret[ $user ][ $meeting ] = 1; |
|
| 390 | 390 | } else { |
| 391 | - $ret[$user][$meeting] = 0; |
|
| 391 | + $ret[ $user ][ $meeting ] = 0; |
|
| 392 | 392 | } |
| 393 | 393 | } |
| 394 | 394 | } |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | { |
| 429 | 429 | $meetings = $solver->getYResults(); |
| 430 | 430 | foreach ($meetings as $id => $meeting) { |
| 431 | - $meetingO = \plunner\Meeting::findOrFail($id);//TODO catch error |
|
| 431 | + $meetingO = \plunner\Meeting::findOrFail($id); //TODO catch error |
|
| 432 | 432 | $meetingO->start_time = $this->toDateTime(array_search('1', $meeting)); |
| 433 | 433 | $meetingO->save(); |
| 434 | 434 | } |
@@ -441,7 +441,7 @@ discard block |
||
| 441 | 441 | private function toDateTime($timeslot) |
| 442 | 442 | { |
| 443 | 443 | $ret = clone $this->startTime; |
| 444 | - return $ret->add(new \DateInterval('PT' . (($timeslot - 1) * self::TIME_SLOT_DURATION) . 'S')); |
|
| 444 | + return $ret->add(new \DateInterval('PT'.(($timeslot - 1) * self::TIME_SLOT_DURATION).'S')); |
|
| 445 | 445 | } |
| 446 | 446 | |
| 447 | 447 | /** |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | foreach ($employeesMeetings as $eId => $employeeMeetings) { |
| 454 | 454 | $employee = \plunner\Employee::findOrFail($eId); |
| 455 | 455 | $employeeMeetings = collect($employeeMeetings); |
| 456 | - $employeeMeetings = $employeeMeetings->filter(function ($item) { |
|
| 456 | + $employeeMeetings = $employeeMeetings->filter(function($item) { |
|
| 457 | 457 | return $item == 1; |
| 458 | 458 | }); |
| 459 | 459 | $employee->meetings()->attach($employeeMeetings->keys()->toArray()); |
@@ -70,9 +70,9 @@ 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 | (new Optimise($company, $this->schedule, $this->laravel))->optimise()->save(); |
| 75 | - $this->info('Optimisation ' . $company->id . ' completed'); |
|
| 75 | + $this->info('Optimisation '.$company->id.' completed'); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | private function syncAll() |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | */ |
| 97 | 97 | private function makeBackground(Company $company) |
| 98 | 98 | { |
| 99 | - $event = $this->schedule->command('optimise:meetings ' . $company->id)->withoutOverlapping(); |
|
| 99 | + $event = $this->schedule->command('optimise:meetings '.$company->id)->withoutOverlapping(); |
|
| 100 | 100 | if ($event->isDue($this->laravel)) |
| 101 | 101 | $event->run($this->laravel); |
| 102 | 102 | } |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | if (file_exists($path->getPath())) |
| 54 | 54 | throw new OptimiseException('problem during creation of tmp dir (the directory already exists)'); |
| 55 | 55 | if (!@mkdir($path->getPath())) |
| 56 | - throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');; |
|
| 56 | + throw new OptimiseException('problem during creation of tmp dir (mkdir problem)'); ; |
|
| 57 | 57 | if (!is_dir($path->getPath())) |
| 58 | 58 | throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)'); |
| 59 | 59 | return $path; |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | */ |
| 105 | 105 | public function getModelPath() |
| 106 | 106 | { |
| 107 | - return $this->path . '/model.mod'; |
|
| 107 | + return $this->path.'/model.mod'; |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | /** |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | */ |
| 113 | 113 | public function getUsersPath() |
| 114 | 114 | { |
| 115 | - return $this->path . '/Users.csv'; |
|
| 115 | + return $this->path.'/Users.csv'; |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | /** |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | */ |
| 121 | 121 | public function getMeetingsPath() |
| 122 | 122 | { |
| 123 | - return $this->path . '/Meeting.csv'; |
|
| 123 | + return $this->path.'/Meeting.csv'; |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | /** |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | */ |
| 129 | 129 | public function getMeetingsDurationPath() |
| 130 | 130 | { |
| 131 | - return $this->path . '/MeetingsDuration.csv'; |
|
| 131 | + return $this->path.'/MeetingsDuration.csv'; |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | /** |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | */ |
| 137 | 137 | public function getMeetingsAvailabilityPath() |
| 138 | 138 | { |
| 139 | - return $this->path . '/MeetingsAvailability.csv'; |
|
| 139 | + return $this->path.'/MeetingsAvailability.csv'; |
|
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | /** |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | */ |
| 145 | 145 | public function getUsersAvailabilityPath() |
| 146 | 146 | { |
| 147 | - return $this->path . '/UsersAvailability.csv'; |
|
| 147 | + return $this->path.'/UsersAvailability.csv'; |
|
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | /** |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | */ |
| 153 | 153 | public function getUsersMeetingsPath() |
| 154 | 154 | { |
| 155 | - return $this->path . '/UsersMeetings.csv'; |
|
| 155 | + return $this->path.'/UsersMeetings.csv'; |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | /** |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | */ |
| 161 | 161 | public function getXPath() |
| 162 | 162 | { |
| 163 | - return $this->path . '/x.csv'; |
|
| 163 | + return $this->path.'/x.csv'; |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | /** |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | */ |
| 169 | 169 | public function getYPath() |
| 170 | 170 | { |
| 171 | - return $this->path . '/y.csv'; |
|
| 171 | + return $this->path.'/y.csv'; |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | /** |
@@ -176,6 +176,6 @@ discard block |
||
| 176 | 176 | */ |
| 177 | 177 | public function getOutputPath() |
| 178 | 178 | { |
| 179 | - return $this->path . '/out.txt'; |
|
| 179 | + return $this->path.'/out.txt'; |
|
| 180 | 180 | } |
| 181 | 181 | } |
| 182 | 182 | \ No newline at end of file |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | $timeSlots = array_keys($meetingsAvailabilityS); |
| 245 | 245 | if (count($timeSlots) != $this->timeSlots) |
| 246 | 246 | throw new OptimiseException('timeSlots different from timeSlots set'); |
| 247 | - $meetingsAvailability[$key] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0); |
|
| 247 | + $meetingsAvailability[ $key ] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0); |
|
| 248 | 248 | } |
| 249 | 249 | |
| 250 | 250 | $this->meetingsAvailability = $meetingsAvailability; |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | { |
| 262 | 262 | $len = $len - count($array); |
| 263 | 263 | for ($i = 0; $i < $len; $i++) |
| 264 | - $array[] = $pad; |
|
| 264 | + $array[ ] = $pad; |
|
| 265 | 265 | return $array; |
| 266 | 266 | } |
| 267 | 267 | |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | throw new OptimiseException('meetings different from meetings set'); |
| 287 | 287 | } |
| 288 | 288 | foreach ($meetingsDuration as $duration) { |
| 289 | - $duration = (int)$duration; //TODO fix this (fix for optimise) |
|
| 289 | + $duration = (int) $duration; //TODO fix this (fix for optimise) |
|
| 290 | 290 | if (!is_int($duration) || $duration <= 0) |
| 291 | 291 | throw new OptimiseException('duration is not integer or it is not >0'); |
| 292 | 292 | } |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | if (count($timeSlots) != $this->timeSlots) |
| 319 | 319 | throw new OptimiseException('timeSlots different from timeSlots set'); |
| 320 | 320 | |
| 321 | - $usersAvailability[$key] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0); |
|
| 321 | + $usersAvailability[ $key ] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0); |
|
| 322 | 322 | } |
| 323 | 323 | |
| 324 | 324 | $this->usersAvailability = $usersAvailability; |
@@ -361,7 +361,7 @@ discard block |
||
| 361 | 361 | { |
| 362 | 362 | $this->writeData(); |
| 363 | 363 | $this->writeModelFile(); |
| 364 | - $event = $this->schedule->exec('glpsol --math ' . $this->path->getModelPath())->sendOutputTo($this->path->getOutputPath())->after(function () { |
|
| 364 | + $event = $this->schedule->exec('glpsol --math '.$this->path->getModelPath())->sendOutputTo($this->path->getOutputPath())->after(function() { |
|
| 365 | 365 | }); //this just to execute in foreground |
| 366 | 366 | if ($event->isDue($this->laravel)) |
| 367 | 367 | $event->run($this->laravel); |
@@ -388,8 +388,8 @@ discard block |
||
| 388 | 388 | */ |
| 389 | 389 | private function checkData() |
| 390 | 390 | { |
| 391 | - $this->checkArrayProprieties(['users', 'meetings', 'meetingsAvailability', 'meetingsDuration', 'usersAvailability', 'usersMeetings']); |
|
| 392 | - $this->checkIntProprieties(['timeSlots', 'maxTimeSlots']); |
|
| 391 | + $this->checkArrayProprieties([ 'users', 'meetings', 'meetingsAvailability', 'meetingsDuration', 'usersAvailability', 'usersMeetings' ]); |
|
| 392 | + $this->checkIntProprieties([ 'timeSlots', 'maxTimeSlots' ]); |
|
| 393 | 393 | } |
| 394 | 394 | |
| 395 | 395 | /** |
@@ -400,7 +400,7 @@ discard block |
||
| 400 | 400 | { |
| 401 | 401 | foreach ($proprieties as $propriety) |
| 402 | 402 | if (count($this->$propriety) == 0) |
| 403 | - throw new OptimiseException($propriety . ' is not set correctly'); |
|
| 403 | + throw new OptimiseException($propriety.' is not set correctly'); |
|
| 404 | 404 | } |
| 405 | 405 | |
| 406 | 406 | /** |
@@ -411,7 +411,7 @@ discard block |
||
| 411 | 411 | { |
| 412 | 412 | foreach ($proprieties as $propriety) |
| 413 | 413 | if (!is_int($this->$propriety) || $this->$propriety <= 0) |
| 414 | - throw new OptimiseException($propriety . ' is not set correctly'); |
|
| 414 | + throw new OptimiseException($propriety.' is not set correctly'); |
|
| 415 | 415 | } |
| 416 | 416 | |
| 417 | 417 | /** |
@@ -429,13 +429,13 @@ discard block |
||
| 429 | 429 | */ |
| 430 | 430 | static private function writeCSVArrayNoKey($file, $data) |
| 431 | 431 | { |
| 432 | - $f = function ($fp, $data) { |
|
| 432 | + $f = function($fp, $data) { |
|
| 433 | 433 | foreach ($data as $field) { |
| 434 | - fputcsv($fp, [$field]); |
|
| 434 | + fputcsv($fp, [ $field ]); |
|
| 435 | 435 | } |
| 436 | 436 | }; |
| 437 | 437 | |
| 438 | - self::writeCSV($file, $data, ['i'], $f); |
|
| 438 | + self::writeCSV($file, $data, [ 'i' ], $f); |
|
| 439 | 439 | } |
| 440 | 440 | |
| 441 | 441 | /** |
@@ -484,13 +484,13 @@ discard block |
||
| 484 | 484 | */ |
| 485 | 485 | static private function writeCSVArray($file, $data, $name) |
| 486 | 486 | { |
| 487 | - $f = function ($fp, $data) { |
|
| 487 | + $f = function($fp, $data) { |
|
| 488 | 488 | foreach ($data as $key => $field) { |
| 489 | - fputcsv($fp, [$key, $field]); |
|
| 489 | + fputcsv($fp, [ $key, $field ]); |
|
| 490 | 490 | } |
| 491 | 491 | }; |
| 492 | 492 | |
| 493 | - self::writeCSV($file, $data, ['i', $name], $f); |
|
| 493 | + self::writeCSV($file, $data, [ 'i', $name ], $f); |
|
| 494 | 494 | } |
| 495 | 495 | |
| 496 | 496 | /** |
@@ -509,14 +509,14 @@ discard block |
||
| 509 | 509 | */ |
| 510 | 510 | static private function writeCSVMatrix($file, $data, $name) |
| 511 | 511 | { |
| 512 | - $f = function ($fp, $data) { |
|
| 512 | + $f = function($fp, $data) { |
|
| 513 | 513 | foreach ($data as $key => $field) { |
| 514 | 514 | foreach ($field as $key2 => $field2) |
| 515 | - fputcsv($fp, [$key, $key2, $field2]); |
|
| 515 | + fputcsv($fp, [ $key, $key2, $field2 ]); |
|
| 516 | 516 | } |
| 517 | 517 | }; |
| 518 | 518 | |
| 519 | - self::writeCSV($file, $data, ['i', 'j', $name], $f); |
|
| 519 | + self::writeCSV($file, $data, [ 'i', 'j', $name ], $f); |
|
| 520 | 520 | } |
| 521 | 521 | |
| 522 | 522 | /** |
@@ -545,7 +545,7 @@ discard block |
||
| 545 | 545 | $f = @fopen($this->path->getModelPath(), "w"); |
| 546 | 546 | if (!$f) |
| 547 | 547 | throw new OptimiseException('problem during creation of a file'); |
| 548 | - fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__ . "/model.stub"))); |
|
| 548 | + fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__."/model.stub"))); |
|
| 549 | 549 | fclose($f); |
| 550 | 550 | } |
| 551 | 551 | |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | if (!$handle) |
| 573 | 573 | throw new OptimiseException('problems during reading the file'); |
| 574 | 574 | |
| 575 | - $ret = []; |
|
| 575 | + $ret = [ ]; |
|
| 576 | 576 | fgetcsv($handle); //skip head |
| 577 | 577 | while (($data = fgetcsv($handle)) !== FALSE) { |
| 578 | 578 | if (count($data) != 3) { |
@@ -580,7 +580,7 @@ discard block |
||
| 580 | 580 | throw new OptimiseException('problems during parsing the file'); |
| 581 | 581 | } |
| 582 | 582 | |
| 583 | - $ret[$data[0]][$data[1]] = $data[2]; |
|
| 583 | + $ret[ $data[ 0 ] ][ $data[ 1 ] ] = $data[ 2 ]; |
|
| 584 | 584 | } |
| 585 | 585 | |
| 586 | 586 | fclose($handle); |
@@ -108,7 +108,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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; |
@@ -71,9 +71,9 @@ discard block |
||
| 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 |
||
| 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 | } |
@@ -43,19 +43,19 @@ discard block |
||
| 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 |
||
| 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 | /** |