@@ -10,8 +10,8 @@ discard block |
||
| 10 | 10 | { |
| 11 | 11 | public function __construct() |
| 12 | 12 | { |
| 13 | - config(['auth.model' => \plunner\Employee::class]); |
|
| 14 | - config(['jwt.user' => \plunner\Employee::class]); |
|
| 13 | + config([ 'auth.model' => \plunner\Employee::class ]); |
|
| 14 | + config([ 'jwt.user' => \plunner\Employee::class ]); |
|
| 15 | 15 | $this->middleware('jwt.authandrefresh:mode-en'); |
| 16 | 16 | } |
| 17 | 17 | |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | public function update(EmployeeRequest $request) |
| 37 | 37 | { |
| 38 | 38 | $employee = \Auth::user(); |
| 39 | - $input = $request->only(['name', 'password']); |
|
| 39 | + $input = $request->only([ 'name', 'password' ]); |
|
| 40 | 40 | $employee->update($input); |
| 41 | 41 | return $employee; |
| 42 | 42 | } |
@@ -32,14 +32,14 @@ |
||
| 32 | 32 | * |
| 33 | 33 | * @var array |
| 34 | 34 | */ |
| 35 | - protected $fillable = ['time_start', 'time_end']; |
|
| 35 | + protected $fillable = [ 'time_start', 'time_end' ]; |
|
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * The attributes excluded from the model's JSON form. |
| 39 | 39 | * |
| 40 | 40 | * @var array |
| 41 | 41 | */ |
| 42 | - protected $hidden = ['pivot', 'meeting']; |
|
| 42 | + protected $hidden = [ 'pivot', 'meeting' ]; |
|
| 43 | 43 | |
| 44 | 44 | /** |
| 45 | 45 | * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
@@ -21,8 +21,8 @@ |
||
| 21 | 21 | */ |
| 22 | 22 | public function __construct() |
| 23 | 23 | { |
| 24 | - config(['auth.model' => \plunner\Employee::class]); |
|
| 25 | - config(['jwt.user' => \plunner\Employee::class]); |
|
| 24 | + config([ 'auth.model' => \plunner\Employee::class ]); |
|
| 25 | + config([ 'jwt.user' => \plunner\Employee::class ]); |
|
| 26 | 26 | $this->middleware('jwt.authandrefresh:mode-en'); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -33,14 +33,14 @@ |
||
| 33 | 33 | * |
| 34 | 34 | * @var array |
| 35 | 35 | */ |
| 36 | - protected $fillable = ['time_start', 'time_end']; |
|
| 36 | + protected $fillable = [ 'time_start', 'time_end' ]; |
|
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | 39 | * The attributes excluded from the model's JSON form. |
| 40 | 40 | * |
| 41 | 41 | * @var array |
| 42 | 42 | */ |
| 43 | - protected $hidden = ['pivot', 'calendar']; |
|
| 43 | + protected $hidden = [ 'pivot', 'calendar' ]; |
|
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | 46 | * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
@@ -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 | } |
@@ -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; |