| @@ -1,21 +1,21 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | /** | 
| 3 | - * Created by PhpStorm. | |
| 4 | - * User: Claudio Cardinale <[email protected]> | |
| 5 | - * Date: 24/11/15 | |
| 6 | - * Time: 21.58 | |
| 7 | - * This program is free software; you can redistribute it and/or | |
| 8 | - * modify it under the terms of the GNU General Public License | |
| 9 | - * as published by the Free Software Foundation; either version 2 | |
| 10 | - * of the License, or (at your option) any later version. | |
| 11 | - * This program is distributed in the hope that it will be useful, | |
| 12 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 | - * GNU General Public License for more details. | |
| 15 | - * You should have received a copy of the GNU General Public License | |
| 16 | - * along with this program; if not, write to the Free Software | |
| 17 | - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
| 18 | - */ | |
| 3 | + * Created by PhpStorm. | |
| 4 | + * User: Claudio Cardinale <[email protected]> | |
| 5 | + * Date: 24/11/15 | |
| 6 | + * Time: 21.58 | |
| 7 | + * This program is free software; you can redistribute it and/or | |
| 8 | + * modify it under the terms of the GNU General Public License | |
| 9 | + * as published by the Free Software Foundation; either version 2 | |
| 10 | + * of the License, or (at your option) any later version. | |
| 11 | + * This program is distributed in the hope that it will be useful, | |
| 12 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 | + * GNU General Public License for more details. | |
| 15 | + * You should have received a copy of the GNU General Public License | |
| 16 | + * along with this program; if not, write to the Free Software | |
| 17 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
| 18 | + */ | |
| 19 | 19 | |
| 20 | 20 | namespace plunner; | 
| 21 | 21 | |
| @@ -1,21 +1,21 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | /** | 
| 3 | - * Created by PhpStorm. | |
| 4 | - * User: Claudio Cardinale <[email protected]> | |
| 5 | - * Date: 03/12/15 | |
| 6 | - * Time: 2.33 | |
| 7 | - * This program is free software; you can redistribute it and/or | |
| 8 | - * modify it under the terms of the GNU General Public License | |
| 9 | - * as published by the Free Software Foundation; either version 2 | |
| 10 | - * of the License, or (at your option) any later version. | |
| 11 | - * This program is distributed in the hope that it will be useful, | |
| 12 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 | - * GNU General Public License for more details. | |
| 15 | - * You should have received a copy of the GNU General Public License | |
| 16 | - * along with this program; if not, write to the Free Software | |
| 17 | - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
| 18 | - */ | |
| 3 | + * Created by PhpStorm. | |
| 4 | + * User: Claudio Cardinale <[email protected]> | |
| 5 | + * Date: 03/12/15 | |
| 6 | + * Time: 2.33 | |
| 7 | + * This program is free software; you can redistribute it and/or | |
| 8 | + * modify it under the terms of the GNU General Public License | |
| 9 | + * as published by the Free Software Foundation; either version 2 | |
| 10 | + * of the License, or (at your option) any later version. | |
| 11 | + * This program is distributed in the hope that it will be useful, | |
| 12 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 | + * GNU General Public License for more details. | |
| 15 | + * You should have received a copy of the GNU General Public License | |
| 16 | + * along with this program; if not, write to the Free Software | |
| 17 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
| 18 | + */ | |
| 19 | 19 | |
| 20 | 20 | namespace plunner\Console\Commands\SyncCaldav; | 
| 21 | 21 | |
| @@ -89,10 +89,11 @@ discard block | ||
| 89 | 89 | |
| 90 | 90 | //insert new timeslots | 
| 91 | 91 |          foreach ($events as $event) { | 
| 92 | - if (!($event = $this->parseEvent($event))) | |
| 93 | - \Event::fire(new ErrorEvent($this->calendar, 'problem during the parsing an event')); | |
| 94 | - else | |
| 95 | - $calendarMain->timeslots()->create($event); | |
| 92 | +            if (!($event = $this->parseEvent($event))) { | |
| 93 | + \Event::fire(new ErrorEvent($this->calendar, 'problem during the parsing an event')); | |
| 94 | +            } else { | |
| 95 | + $calendarMain->timeslots()->create($event); | |
| 96 | + } | |
| 96 | 97 | } | 
| 97 | 98 | \Event::fire(new OkEvent($this->calendar)); | 
| 98 | 99 | } | 
| @@ -124,17 +125,20 @@ discard block | ||
| 124 | 125 |      { | 
| 125 | 126 | $pattern = "/^((DTSTART;)|(DTEND;))(.*)\$/m"; | 
| 126 | 127 |          if (preg_match_all($pattern, $event->getData(), $matches)) { | 
| 127 | - if (!isset($matches[4]) || count($matches[4]) != 2) | |
| 128 | - return null; | |
| 128 | +            if (!isset($matches[4]) || count($matches[4]) != 2) { | |
| 129 | + return null; | |
| 130 | + } | |
| 129 | 131 | $ret = []; | 
| 130 | - if ($tmp = $this->parseDate($matches[4][0])) | |
| 131 | - $ret['time_start'] = $tmp; | |
| 132 | - else | |
| 133 | - return null; | |
| 134 | - if ($tmp = $this->parseDate($matches[4][1])) | |
| 135 | - $ret['time_end'] = $tmp; | |
| 136 | - else | |
| 137 | - return null; | |
| 132 | +            if ($tmp = $this->parseDate($matches[4][0])) { | |
| 133 | + $ret['time_start'] = $tmp; | |
| 134 | +            } else { | |
| 135 | + return null; | |
| 136 | + } | |
| 137 | +            if ($tmp = $this->parseDate($matches[4][1])) { | |
| 138 | + $ret['time_end'] = $tmp; | |
| 139 | +            } else { | |
| 140 | + return null; | |
| 141 | + } | |
| 138 | 142 | return $ret; | 
| 139 | 143 | } | 
| 140 | 144 | return null; | 
| @@ -1,21 +1,21 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | /** | 
| 3 | - * Created by PhpStorm. | |
| 4 | - * User: Claudio Cardinale <[email protected]> | |
| 5 | - * Date: 07/12/15 | |
| 6 | - * Time: 21.24 | |
| 7 | - * This program is free software; you can redistribute it and/or | |
| 8 | - * modify it under the terms of the GNU General Public License | |
| 9 | - * as published by the Free Software Foundation; either version 2 | |
| 10 | - * of the License, or (at your option) any later version. | |
| 11 | - * This program is distributed in the hope that it will be useful, | |
| 12 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 | - * GNU General Public License for more details. | |
| 15 | - * You should have received a copy of the GNU General Public License | |
| 16 | - * along with this program; if not, write to the Free Software | |
| 17 | - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
| 18 | - */ | |
| 3 | + * Created by PhpStorm. | |
| 4 | + * User: Claudio Cardinale <[email protected]> | |
| 5 | + * Date: 07/12/15 | |
| 6 | + * Time: 21.24 | |
| 7 | + * This program is free software; you can redistribute it and/or | |
| 8 | + * modify it under the terms of the GNU General Public License | |
| 9 | + * as published by the Free Software Foundation; either version 2 | |
| 10 | + * of the License, or (at your option) any later version. | |
| 11 | + * This program is distributed in the hope that it will be useful, | |
| 12 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 | + * GNU General Public License for more details. | |
| 15 | + * You should have received a copy of the GNU General Public License | |
| 16 | + * along with this program; if not, write to the Free Software | |
| 17 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
| 18 | + */ | |
| 19 | 19 | |
| 20 | 20 | namespace plunner\Console\Commands\Optimise; | 
| 21 | 21 | |
| @@ -1,21 +1,21 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | /** | 
| 3 | - * Created by PhpStorm. | |
| 4 | - * User: Claudio Cardinale <[email protected]> | |
| 5 | - * Date: 18/12/15 | |
| 6 | - * Time: 15.20 | |
| 7 | - * This program is free software; you can redistribute it and/or | |
| 8 | - * modify it under the terms of the GNU General Public License | |
| 9 | - * as published by the Free Software Foundation; either version 2 | |
| 10 | - * of the License, or (at your option) any later version. | |
| 11 | - * This program is distributed in the hope that it will be useful, | |
| 12 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 | - * GNU General Public License for more details. | |
| 15 | - * You should have received a copy of the GNU General Public License | |
| 16 | - * along with this program; if not, write to the Free Software | |
| 17 | - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
| 18 | - */ | |
| 3 | + * Created by PhpStorm. | |
| 4 | + * User: Claudio Cardinale <[email protected]> | |
| 5 | + * Date: 18/12/15 | |
| 6 | + * Time: 15.20 | |
| 7 | + * This program is free software; you can redistribute it and/or | |
| 8 | + * modify it under the terms of the GNU General Public License | |
| 9 | + * as published by the Free Software Foundation; either version 2 | |
| 10 | + * of the License, or (at your option) any later version. | |
| 11 | + * This program is distributed in the hope that it will be useful, | |
| 12 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 | + * GNU General Public License for more details. | |
| 15 | + * You should have received a copy of the GNU General Public License | |
| 16 | + * along with this program; if not, write to the Free Software | |
| 17 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
| 18 | + */ | |
| 19 | 19 | |
| 20 | 20 | namespace plunner\Console\Commands\Optimise; | 
| 21 | 21 | |
| @@ -50,12 +50,16 @@ discard block | ||
| 50 | 50 |      { | 
| 51 | 51 | $path = new Path(tempnam(sys_get_temp_dir(), 'OPT')); //TODO check the return in case of errors this return false on failure | 
| 52 | 52 | unlink($path->getPath()); //remove file to create a dir | 
| 53 | - if (file_exists($path->getPath())) | |
| 54 | -            throw new OptimiseException('problem during creation of tmp dir (the directory already exists)'); | |
| 55 | - if (!@mkdir($path->getPath())) | |
| 56 | -            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');; | |
| 57 | - if (!is_dir($path->getPath())) | |
| 58 | -            throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)'); | |
| 53 | +        if (file_exists($path->getPath())) { | |
| 54 | +                    throw new OptimiseException('problem during creation of tmp dir (the directory already exists)'); | |
| 55 | + } | |
| 56 | +        if (!@mkdir($path->getPath())) { | |
| 57 | +                    throw new OptimiseException('problem during creation of tmp dir (mkdir problem)'); | |
| 58 | + } | |
| 59 | + ; | |
| 60 | +        if (!is_dir($path->getPath())) { | |
| 61 | +                    throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)'); | |
| 62 | + } | |
| 59 | 63 | return $path; | 
| 60 | 64 | } | 
| 61 | 65 | |
| @@ -80,8 +84,9 @@ discard block | ||
| 80 | 84 | */ | 
| 81 | 85 | public function __destruct() | 
| 82 | 86 |      { | 
| 83 | - if ($this->path && is_dir($this->path) && !self::delTree($this->path)) | |
| 84 | -            throw new OptimiseException('problems during removing of path directory'); | |
| 87 | +        if ($this->path && is_dir($this->path) && !self::delTree($this->path)) { | |
| 88 | +                    throw new OptimiseException('problems during removing of path directory'); | |
| 89 | + } | |
| 85 | 90 | } | 
| 86 | 91 | |
| 87 | 92 | /** | 
| @@ -1,21 +1,21 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | /** | 
| 3 | - * Created by PhpStorm. | |
| 4 | - * User: Claudio Cardinale <[email protected]> | |
| 5 | - * Date: 24/12/15 | |
| 6 | - * Time: 22.53 | |
| 7 | - * This program is free software; you can redistribute it and/or | |
| 8 | - * modify it under the terms of the GNU General Public License | |
| 9 | - * as published by the Free Software Foundation; either version 2 | |
| 10 | - * of the License, or (at your option) any later version. | |
| 11 | - * This program is distributed in the hope that it will be useful, | |
| 12 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 | - * GNU General Public License for more details. | |
| 15 | - * You should have received a copy of the GNU General Public License | |
| 16 | - * along with this program; if not, write to the Free Software | |
| 17 | - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
| 18 | - */ | |
| 3 | + * Created by PhpStorm. | |
| 4 | + * User: Claudio Cardinale <[email protected]> | |
| 5 | + * Date: 24/12/15 | |
| 6 | + * Time: 22.53 | |
| 7 | + * This program is free software; you can redistribute it and/or | |
| 8 | + * modify it under the terms of the GNU General Public License | |
| 9 | + * as published by the Free Software Foundation; either version 2 | |
| 10 | + * of the License, or (at your option) any later version. | |
| 11 | + * This program is distributed in the hope that it will be useful, | |
| 12 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 | + * GNU General Public License for more details. | |
| 15 | + * You should have received a copy of the GNU General Public License | |
| 16 | + * along with this program; if not, write to the Free Software | |
| 17 | + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
| 18 | + */ | |
| 19 | 19 | |
| 20 | 20 | namespace plunner\Http\Middleware; | 
| 21 | 21 | |
| @@ -37,8 +37,9 @@ discard block | ||
| 37 | 37 | $meeting = Meeting::findOrFail($meetingId); | 
| 38 | 38 | $this->authorize($meeting); | 
| 39 | 39 | |
| 40 | - if ($meeting->group_id == $groupId) | |
| 41 | - return $meeting->timeslots; | |
| 40 | +        if ($meeting->group_id == $groupId) { | |
| 41 | + return $meeting->timeslots; | |
| 42 | + } | |
| 42 | 43 | return Response::json(['error' => 'meeting->group_id <> groupId'], 403); | 
| 43 | 44 | } | 
| 44 | 45 | |
| @@ -59,8 +60,9 @@ discard block | ||
| 59 | 60 | $timeslot = MeetingTimeslot::findOrFail($timeslotId); | 
| 60 | 61 | $this->authorize($timeslot); | 
| 61 | 62 | |
| 62 | - if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId) | |
| 63 | - return $timeslot; | |
| 63 | +        if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId) { | |
| 64 | + return $timeslot; | |
| 65 | + } | |
| 64 | 66 | return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403); | 
| 65 | 67 | } | 
| 66 | 68 | |
| @@ -1,10 +1,10 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | /** | 
| 3 | - * Created by PhpStorm. | |
| 4 | - * User: claudio | |
| 5 | - * Date: 12/12/15 | |
| 6 | - * Time: 15.41 | |
| 7 | - */ | |
| 3 | + * Created by PhpStorm. | |
| 4 | + * User: claudio | |
| 5 | + * Date: 12/12/15 | |
| 6 | + * Time: 15.41 | |
| 7 | + */ | |
| 8 | 8 | |
| 9 | 9 | namespace plunner\Console\Commands\Optimise; | 
| 10 | 10 | |
| @@ -302,8 +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] = []; | |
| 305 | +            if (!isset($array[$id])) { | |
| 306 | + $array[$id] = []; | |
| 307 | + } | |
| 307 | 308 | $array[$id] = self::arrayPadInterval($array[$id], $timeSlot->time_start, $timeSlot->time_end, $fill); | 
| 308 | 309 | } | 
| 309 | 310 | return $array; | 
| @@ -318,8 +319,9 @@ discard block | ||
| 318 | 319 | */ | 
| 319 | 320 | static private function arrayPadInterval(array $array, $from, $to, $pad = '0') | 
| 320 | 321 |      { | 
| 321 | - for ($i = $from; $i < $to; $i++) | |
| 322 | - $array[$i] = $pad; | |
| 322 | +        for ($i = $from; $i < $to; $i++) { | |
| 323 | + $array[$i] = $pad; | |
| 324 | + } | |
| 323 | 325 | return $array; | 
| 324 | 326 | } | 
| 325 | 327 | |
| @@ -332,8 +334,9 @@ discard block | ||
| 332 | 334 | static private function fillRow(array $array, $id, $until, $fill = '0') | 
| 333 | 335 |      { | 
| 334 | 336 |          for ($i = 1; $i <= $until; $i++) { | 
| 335 | - if (!isset($array[$id][$i])) | |
| 336 | - $array[$id][$i] = $fill; | |
| 337 | +            if (!isset($array[$id][$i])) { | |
| 338 | + $array[$id][$i] = $fill; | |
| 339 | + } | |
| 337 | 340 | } | 
| 338 | 341 | |
| 339 | 342 | return $array; | 
| @@ -58,10 +58,11 @@ discard block | ||
| 58 | 58 | //TODO insert a timeout | 
| 59 | 59 | //TODO try...catch with destruct | 
| 60 | 60 |          $companyId = $this->argument('companyId'); | 
| 61 | - if (is_numeric($companyId)) | |
| 62 | - $this->makeForeground(Company::findOrFail($companyId)); | |
| 63 | - else | |
| 64 | - $this->syncAll(); | |
| 61 | +        if (is_numeric($companyId)) { | |
| 62 | + $this->makeForeground(Company::findOrFail($companyId)); | |
| 63 | +        } else { | |
| 64 | + $this->syncAll(); | |
| 65 | + } | |
| 65 | 66 | } | 
| 66 | 67 | |
| 67 | 68 | /** | 
| @@ -81,13 +82,15 @@ discard block | ||
| 81 | 82 |          if ($this->option('background')) { | 
| 82 | 83 | \Log::debug(self::BACKGROUND_MOD_MEX); | 
| 83 | 84 | $this->info(self::BACKGROUND_MOD_MEX); | 
| 84 | - foreach ($calendars as $calendar) | |
| 85 | - $this->makeBackground($calendar); | |
| 85 | +            foreach ($calendars as $calendar) { | |
| 86 | + $this->makeBackground($calendar); | |
| 87 | + } | |
| 86 | 88 | \Log::debug(self::BACKGROUND_COMPLETED_MEX); | 
| 87 | 89 | $this->info(self::BACKGROUND_COMPLETED_MEX); | 
| 88 | - } else | |
| 89 | - foreach ($calendars as $calendar) | |
| 90 | +        } else { | |
| 91 | + foreach ($calendars as $calendar) | |
| 90 | 92 | $this->makeForeground($calendar); | 
| 93 | + } | |
| 91 | 94 | } | 
| 92 | 95 | |
| 93 | 96 | /** | 
| @@ -97,7 +100,8 @@ discard block | ||
| 97 | 100 | private function makeBackground(Company $company) | 
| 98 | 101 |      { | 
| 99 | 102 |          $event = $this->schedule->command('optimise:meetings ' . $company->id)->withoutOverlapping(); | 
| 100 | - if ($event->isDue($this->laravel)) | |
| 101 | - $event->run($this->laravel); | |
| 103 | +        if ($event->isDue($this->laravel)) { | |
| 104 | + $event->run($this->laravel); | |
| 105 | + } | |
| 102 | 106 | } | 
| 103 | 107 | } | 
| @@ -104,8 +104,9 @@ discard block | ||
| 104 | 104 | */ | 
| 105 | 105 | static private function checkGlpsol() | 
| 106 | 106 |      { | 
| 107 | - if (!(`which glpsol`)) | |
| 108 | -            throw new OptimiseException('glpsol is not installed'); | |
| 107 | +        if (!(`which glpsol`)) { | |
| 108 | +                    throw new OptimiseException('glpsol is not installed'); | |
| 109 | + } | |
| 109 | 110 | } | 
| 110 | 111 | |
| 111 | 112 | /** | 
| @@ -193,8 +194,9 @@ discard block | ||
| 193 | 194 | */ | 
| 194 | 195 | public function setTimeSlots($timeSlots) | 
| 195 | 196 |      { | 
| 196 | - if (!is_int($timeSlots) || $timeSlots <= 0) | |
| 197 | -            throw new OptimiseException('$timeSlots is not integer or it is not >0'); | |
| 197 | +        if (!is_int($timeSlots) || $timeSlots <= 0) { | |
| 198 | +                    throw new OptimiseException('$timeSlots is not integer or it is not >0'); | |
| 199 | + } | |
| 198 | 200 | |
| 199 | 201 | $this->timeSlots = $timeSlots; | 
| 200 | 202 | return $this; | 
| @@ -215,8 +217,9 @@ discard block | ||
| 215 | 217 | */ | 
| 216 | 218 | public function setMaxTimeSlots($maxTimeSlots) | 
| 217 | 219 |      { | 
| 218 | - if (!is_int($maxTimeSlots) || $maxTimeSlots <= 0) | |
| 219 | -            throw new OptimiseException('$maxTimeSlots is not integer or it is not >0'); | |
| 220 | +        if (!is_int($maxTimeSlots) || $maxTimeSlots <= 0) { | |
| 221 | +                    throw new OptimiseException('$maxTimeSlots is not integer or it is not >0'); | |
| 222 | + } | |
| 220 | 223 | |
| 221 | 224 | $this->maxTimeSlots = $maxTimeSlots; | 
| 222 | 225 | return $this; | 
| @@ -238,12 +241,14 @@ discard block | ||
| 238 | 241 | public function setMeetingsAvailability($meetingsAvailability) | 
| 239 | 242 |      { | 
| 240 | 243 | $meetings = array_keys($meetingsAvailability); | 
| 241 | - if (array_diff($meetings, $this->meetings)) | |
| 242 | -            throw new OptimiseException('meetings different from meetings set'); | |
| 244 | +        if (array_diff($meetings, $this->meetings)) { | |
| 245 | +                    throw new OptimiseException('meetings different from meetings set'); | |
| 246 | + } | |
| 243 | 247 |          foreach ($meetingsAvailability as $key => $meetingsAvailabilityS) { | 
| 244 | 248 | $timeSlots = array_keys($meetingsAvailabilityS); | 
| 245 | - if (count($timeSlots) != $this->timeSlots) | |
| 246 | -                throw new OptimiseException('timeSlots different from timeSlots set'); | |
| 249 | +            if (count($timeSlots) != $this->timeSlots) { | |
| 250 | +                            throw new OptimiseException('timeSlots different from timeSlots set'); | |
| 251 | + } | |
| 247 | 252 | $meetingsAvailability[$key] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0); | 
| 248 | 253 | } | 
| 249 | 254 | |
| @@ -260,8 +265,9 @@ discard block | ||
| 260 | 265 | static private function arrayPad(array $array, $len, $pad) | 
| 261 | 266 |      { | 
| 262 | 267 | $len = $len - count($array); | 
| 263 | - for ($i = 0; $i < $len; $i++) | |
| 264 | - $array[] = $pad; | |
| 268 | +        for ($i = 0; $i < $len; $i++) { | |
| 269 | + $array[] = $pad; | |
| 270 | + } | |
| 265 | 271 | return $array; | 
| 266 | 272 | } | 
| 267 | 273 | |
| @@ -287,8 +293,9 @@ discard block | ||
| 287 | 293 | } | 
| 288 | 294 |          foreach ($meetingsDuration as $duration) { | 
| 289 | 295 | $duration = (int)$duration; //TODO fix this (fix for optimise) | 
| 290 | - if (!is_int($duration) || $duration <= 0) | |
| 291 | -                throw new OptimiseException('duration is not integer or it is not >0'); | |
| 296 | +            if (!is_int($duration) || $duration <= 0) { | |
| 297 | +                            throw new OptimiseException('duration is not integer or it is not >0'); | |
| 298 | + } | |
| 292 | 299 | } | 
| 293 | 300 | |
| 294 | 301 | $this->meetingsDuration = $meetingsDuration; | 
| @@ -311,12 +318,14 @@ discard block | ||
| 311 | 318 | public function setUsersAvailability($usersAvailability) | 
| 312 | 319 |      { | 
| 313 | 320 | $users = array_keys($usersAvailability); | 
| 314 | - if (array_diff($users, $this->users)) | |
| 315 | -            throw new OptimiseException('users different from users set'); | |
| 321 | +        if (array_diff($users, $this->users)) { | |
| 322 | +                    throw new OptimiseException('users different from users set'); | |
| 323 | + } | |
| 316 | 324 |          foreach ($usersAvailability as $key => $usersAvailabilityS) { | 
| 317 | 325 | $timeSlots = array_keys($usersAvailabilityS); | 
| 318 | - if (count($timeSlots) != $this->timeSlots) | |
| 319 | -                throw new OptimiseException('timeSlots different from timeSlots set'); | |
| 326 | +            if (count($timeSlots) != $this->timeSlots) { | |
| 327 | +                            throw new OptimiseException('timeSlots different from timeSlots set'); | |
| 328 | + } | |
| 320 | 329 | |
| 321 | 330 | $usersAvailability[$key] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0); | 
| 322 | 331 | } | 
| @@ -341,12 +350,14 @@ discard block | ||
| 341 | 350 | public function setUsersMeetings($usersMeetings) | 
| 342 | 351 |      { | 
| 343 | 352 | $users = array_keys($usersMeetings); | 
| 344 | - if (array_diff($users, $this->users)) | |
| 345 | -            throw new OptimiseException('users different from users set'); | |
| 353 | +        if (array_diff($users, $this->users)) { | |
| 354 | +                    throw new OptimiseException('users different from users set'); | |
| 355 | + } | |
| 346 | 356 |          foreach ($usersMeetings as $usersMeetingsS) { | 
| 347 | 357 | $meetings = array_keys($usersMeetingsS); | 
| 348 | - if (array_diff($meetings, $this->meetings)) | |
| 349 | -                throw new OptimiseException('meetings different from meetings set'); | |
| 358 | +            if (array_diff($meetings, $this->meetings)) { | |
| 359 | +                            throw new OptimiseException('meetings different from meetings set'); | |
| 360 | + } | |
| 350 | 361 | } | 
| 351 | 362 | |
| 352 | 363 | $this->usersMeetings = $usersMeetings; | 
| @@ -363,8 +374,9 @@ discard block | ||
| 363 | 374 | $this->writeModelFile(); | 
| 364 | 375 |          $event = $this->schedule->exec('glpsol --math ' . $this->path->getModelPath())->sendOutputTo($this->path->getOutputPath())->after(function () { | 
| 365 | 376 | }); //this just to execute in foreground | 
| 366 | - if ($event->isDue($this->laravel)) | |
| 367 | - $event->run($this->laravel); | |
| 377 | +        if ($event->isDue($this->laravel)) { | |
| 378 | + $event->run($this->laravel); | |
| 379 | + } | |
| 368 | 380 | //TODO catch glpsol errors | 
| 369 | 381 | return $this; | 
| 370 | 382 | } | 
| @@ -398,9 +410,10 @@ discard block | ||
| 398 | 410 | */ | 
| 399 | 411 | private function checkArrayProprieties($proprieties) | 
| 400 | 412 |      { | 
| 401 | - foreach ($proprieties as $propriety) | |
| 402 | - if (count($this->$propriety) == 0) | |
| 413 | +        foreach ($proprieties as $propriety) { | |
| 414 | + if (count($this->$propriety) == 0) | |
| 403 | 415 | throw new OptimiseException($propriety . ' is not set correctly'); | 
| 416 | + } | |
| 404 | 417 | } | 
| 405 | 418 | |
| 406 | 419 | /** | 
| @@ -409,9 +422,10 @@ discard block | ||
| 409 | 422 | */ | 
| 410 | 423 | private function checkIntProprieties($proprieties) | 
| 411 | 424 |      { | 
| 412 | - foreach ($proprieties as $propriety) | |
| 413 | - if (!is_int($this->$propriety) || $this->$propriety <= 0) | |
| 425 | +        foreach ($proprieties as $propriety) { | |
| 426 | + if (!is_int($this->$propriety) || $this->$propriety <= 0) | |
| 414 | 427 | throw new OptimiseException($propriety . ' is not set correctly'); | 
| 428 | + } | |
| 415 | 429 | } | 
| 416 | 430 | |
| 417 | 431 | /** | 
| @@ -448,8 +462,9 @@ discard block | ||
| 448 | 462 | static private function writeCSV($file, $data, $heading, \Closure $writer) | 
| 449 | 463 |      { | 
| 450 | 464 | $fp = @fopen($file, 'w'); | 
| 451 | - if (!$fp) | |
| 452 | -            throw new OptimiseException('problem during creation of a file'); | |
| 465 | +        if (!$fp) { | |
| 466 | +                    throw new OptimiseException('problem during creation of a file'); | |
| 467 | + } | |
| 453 | 468 | |
| 454 | 469 | fputcsv($fp, $heading); | 
| 455 | 470 | |
| @@ -511,8 +526,9 @@ discard block | ||
| 511 | 526 |      { | 
| 512 | 527 |          $f = function ($fp, $data) { | 
| 513 | 528 |              foreach ($data as $key => $field) { | 
| 514 | - foreach ($field as $key2 => $field2) | |
| 515 | - fputcsv($fp, [$key, $key2, $field2]); | |
| 529 | +                foreach ($field as $key2 => $field2) { | |
| 530 | + fputcsv($fp, [$key, $key2, $field2]); | |
| 531 | + } | |
| 516 | 532 | } | 
| 517 | 533 | }; | 
| 518 | 534 | |
| @@ -543,8 +559,9 @@ discard block | ||
| 543 | 559 |          $strReplaceS = array('{USERS_PATH}', '{MEETINGS_PATH}', '{USER_AVAILABILITY_PATH}', '{MEETINGS_AVAILABILITY_PATH}', '{USER_MEETINGS_PATH}', '{MEETINGS_DURATION_PATH}', '{TIME_SLOTS}', '{MAX_TIME_SLOTS}', '{X_OUT_PATH}', '{Y_OUT_PATH}'); | 
| 544 | 560 | $strReplaceR = array($this->path->getUsersPath(), $this->path->getMeetingsPath(), $this->path->getUsersAvailabilityPath(), $this->path->getMeetingsAvailabilityPath(), $this->path->getUsersMeetingsPath(), $this->path->getMeetingsDurationPath(), $this->timeSlots, $this->maxTimeSlots, $this->path->getXPath(), $this->path->getYPath()); | 
| 545 | 561 | $f = @fopen($this->path->getModelPath(), "w"); | 
| 546 | - if (!$f) | |
| 547 | -            throw new OptimiseException('problem during creation of a file'); | |
| 562 | +        if (!$f) { | |
| 563 | +                    throw new OptimiseException('problem during creation of a file'); | |
| 564 | + } | |
| 548 | 565 | fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__ . "/model.stub"))); | 
| 549 | 566 | fclose($f); | 
| 550 | 567 | } | 
| @@ -565,12 +582,14 @@ discard block | ||
| 565 | 582 | */ | 
| 566 | 583 | static private function readCSVFile($file) | 
| 567 | 584 |      { | 
| 568 | - if (!file_exists($file) || !filesize($file)) | |
| 569 | -            throw new OptimiseException('no results file'); | |
| 585 | +        if (!file_exists($file) || !filesize($file)) { | |
| 586 | +                    throw new OptimiseException('no results file'); | |
| 587 | + } | |
| 570 | 588 | |
| 571 | 589 | $handle = @fopen($file, "r"); | 
| 572 | - if (!$handle) | |
| 573 | -            throw new OptimiseException('problems during reading the file'); | |
| 590 | +        if (!$handle) { | |
| 591 | +                    throw new OptimiseException('problems during reading the file'); | |
| 592 | + } | |
| 574 | 593 | |
| 575 | 594 | $ret = []; | 
| 576 | 595 | fgetcsv($handle); //skip head | 
| @@ -603,8 +622,9 @@ discard block | ||
| 603 | 622 | */ | 
| 604 | 623 | public function getOutput() | 
| 605 | 624 |      { | 
| 606 | - if (!($data = file_get_contents($this->path->getOutputPath()))) | |
| 607 | -            throw new OptimiseException('problems during reading the file'); | |
| 625 | +        if (!($data = file_get_contents($this->path->getOutputPath()))) { | |
| 626 | +                    throw new OptimiseException('problems during reading the file'); | |
| 627 | + } | |
| 608 | 628 | return $data; | 
| 609 | 629 | } | 
| 610 | 630 | } | 
| 611 | 631 | \ No newline at end of file |