dsd-meetme / backend

app/Company.php

Spacing +2 added lines, -2 removed lines

@@ -51,14 +51,14 @@
      *
      * @var array
      */
-    protected $fillable = ['name', 'email', 'password'];
+    protected $fillable = [ 'name', 'email', 'password' ];
 
     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
-    protected $hidden = ['password', 'remember_token'];
+    protected $hidden = [ 'password', 'remember_token' ];
 
     public function company()
     {

app/Console/Commands/Inspire.php

Spacing +1 added lines, -1 removed lines

@@ -28,6 +28,6 @@
      */
     public function handle()
     {
-        $this->comment(PHP_EOL . Inspiring::quote() . PHP_EOL);
+        $this->comment(PHP_EOL.Inspiring::quote().PHP_EOL);
     }
 }

app/Console/Commands/Optimise/Optimise.php

Spacing +23 added lines, -23 removed lines

@@ -25,7 +25,7 @@ 
     //TODo max timeslots can be an environment var
     const TIME_SLOT_DURATION = 900; //seconds -> 15 minutes
     const DEFAULT_MAX_TIME_SLOTS = 20; //max duration of a meeting in term of timeslots //20
-    const DEFAULT_TIME_SLOTS = 672;  //total amount of timeslots that must be optimised -> one week 4*24*7 = 672
+    const DEFAULT_TIME_SLOTS = 672; //total amount of timeslots that must be optimised -> one week 4*24*7 = 672
 
     private $max_time_slots = self::DEFAULT_MAX_TIME_SLOTS;
     private $time_slots = self::DEFAULT_TIME_SLOTS;
@@ -86,7 +86,7 @@ 
     {
         $this->startTime = clone $startTime;
         $this->endTime = clone $this->startTime;
-        $this->endTime->add(new \DateInterval('PT' . (($this->max_time_slots + $this->time_slots) * self::TIME_SLOT_DURATION) . 'S'));
+        $this->endTime->add(new \DateInterval('PT'.(($this->max_time_slots + $this->time_slots) * self::TIME_SLOT_DURATION).'S'));
     }
 
     /**
@@ -213,7 +213,7 @@ 
          * @var $meetings \Illuminate\Support\Collection
          */
         $meetings = collect($this->company->getMeetingsTimeSlots($this->startTime, $this->endTime));
-        $timeslots = $meetings->groupBy('id')->map(function ($item) { //convert timeslots
+        $timeslots = $meetings->groupBy('id')->map(function($item) { //convert timeslots
             return $this->durationConverter($this->timeSlotsConverter($item));
         });
         return $solver->setMeetings($timeslots->keys()->toArray())
@@ -227,8 +227,8 @@ 
      */
     private function durationConverter($item)
     {
-        return $item->each(function ($item2) {
-            $item2->duration = $this->convertDuration((int)$item2->duration);
+        return $item->each(function($item2) {
+            $item2->duration = $this->convertDuration((int) $item2->duration);
             return $item2;
             //TODO try catch
         });
@@ -240,7 +240,7 @@ 
      */
     static private function convertDuration($duration)
     {
-        return (int)ceil($duration / self::TIME_SLOT_DURATION);
+        return (int) ceil($duration / self::TIME_SLOT_DURATION);
     }
 
     /**
@@ -249,7 +249,7 @@ 
      */
     private function timeSlotsConverter($item)
     {
-        return $item->each(function ($item2) {
+        return $item->each(function($item2) {
             $item2->time_start = $this->toTimeSlot($item2->time_start);
             $item2->time_end = $this->toTimeSlot($item2->time_end);
             return $item2;
@@ -267,13 +267,13 @@ 
         $dateTime = new \DateTime($time);
         $diff = $dateTime->diff($this->startTime);
         $diff = explode(':', $diff->format('%R:%d:%h:%i:%s'));
-        $diff = $diff[1] * 86400 + $diff[2] * 3600 + $diff[3] * 60 + $diff[4];
+        $diff = $diff[ 1 ] * 86400 + $diff[ 2 ] * 3600 + $diff[ 3 ] * 60 + $diff[ 4 ];
         //if($diff[0] != '-' && $diff != 0)
         //  throw new OptimiseException('timeslot time <= startTime');
         //TODO fix check
         //TODO check if diff makes sense
         //TODO check upper limit
-        return (int)(round($diff / self::TIME_SLOT_DURATION) + 1); //TODO can round cause overlaps?
+        return (int) (round($diff / self::TIME_SLOT_DURATION) + 1); //TODO can round cause overlaps?
     }
 
     /**
@@ -283,7 +283,7 @@ 
      */
     static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeslotsN, $free = true)
     {
-        $ret = [];
+        $ret = [ ];
         foreach ($timeSlots as $id => $timeSlots2) {
             $ret = self::fillTimeSlots($ret, $id, $timeSlots2, $free ? '1' : '0');
             $ret = self::fillRow($ret, $id, $timeslotsN, $free ? '0' : '1');
@@ -302,9 +302,9 @@ 
     static private function fillTimeSlots(array $array, $id, \Illuminate\Support\Collection $timeSlots, $fill = '0')
     {
         foreach ($timeSlots as $timeSlot) {
-            if (!isset($array[$id]))
-                $array[$id] = [];
-            $array[$id] = self::arrayPadInterval($array[$id], $timeSlot->time_start, $timeSlot->time_end, $fill);
+            if (!isset($array[ $id ]))
+                $array[ $id ] = [ ];
+            $array[ $id ] = self::arrayPadInterval($array[ $id ], $timeSlot->time_start, $timeSlot->time_end, $fill);
         }
         return $array;
     }
@@ -319,7 +319,7 @@ 
     static private function arrayPadInterval(array $array, $from, $to, $pad = '0')
     {
         for ($i = $from; $i < $to; $i++)
-            $array[$i] = $pad;
+            $array[ $i ] = $pad;
         return $array;
     }
 
@@ -332,8 +332,8 @@ 
     static private function fillRow(array $array, $id, $until, $fill = '0')
     {
         for ($i = 1; $i <= $until; $i++) {
-            if (!isset($array[$id][$i]))
-                $array[$id][$i] = $fill;
+            if (!isset($array[ $id ][ $i ]))
+                $array[ $id ][ $i ] = $fill;
         }
 
         return $array;
@@ -350,7 +350,7 @@ 
          * @var $users \Illuminate\Support\Collection
          */
         $users = collect($this->company->getEmployeesTimeSlots($this->startTime, $this->endTime));
-        $timeslots = $users->groupBy('id')->map(function ($item) { //convert timeslots
+        $timeslots = $users->groupBy('id')->map(function($item) { //convert timeslots
             return $this->timeSlotsConverter($item);
         });
         return $solver->setUsersAvailability(self::getAvailabilityArray($timeslots, $this->time_slots, false));
@@ -381,14 +381,14 @@ 
      */
     static private function getUsersMeetingsArray($users, $meetings, \Illuminate\Support\Collection $usersMeetings)
     {
-        $ret = [];
+        $ret = [ ];
         foreach ($users as $user) {
             $usersMeetingsTmp = $usersMeetings->get($user);
             foreach ($meetings as $meeting) {
                 if ($usersMeetingsTmp->contains('meeting_id', $meeting)) {
-                    $ret[$user][$meeting] = 1;
+                    $ret[ $user ][ $meeting ] = 1;
                 } else {
-                    $ret[$user][$meeting] = 0;
+                    $ret[ $user ][ $meeting ] = 0;
                 }
             }
         }
@@ -428,7 +428,7 @@ 
     {
         $meetings = $solver->getYResults();
         foreach ($meetings as $id => $meeting) {
-            $meetingO = \plunner\Meeting::findOrFail($id);//TODO catch error
+            $meetingO = \plunner\Meeting::findOrFail($id); //TODO catch error
             $meetingO->start_time = $this->toDateTime(array_search('1', $meeting));
             $meetingO->save();
         }
@@ -441,7 +441,7 @@ 
     private function toDateTime($timeslot)
     {
         $ret = clone $this->startTime;
-        return $ret->add(new \DateInterval('PT' . (($timeslot - 1) * self::TIME_SLOT_DURATION) . 'S'));
+        return $ret->add(new \DateInterval('PT'.(($timeslot - 1) * self::TIME_SLOT_DURATION).'S'));
     }
 
     /**
@@ -453,7 +453,7 @@ 
         foreach ($employeesMeetings as $eId => $employeeMeetings) {
             $employee = \plunner\Employee::findOrFail($eId);
             $employeeMeetings = collect($employeeMeetings);
-            $employeeMeetings = $employeeMeetings->filter(function ($item) {
+            $employeeMeetings = $employeeMeetings->filter(function($item) {
                 return $item == 1;
             });
             $employee->meetings()->attach($employeeMeetings->keys()->toArray());

Braces +9 added lines, -6 removed lines

@@ -302,8 +302,9 @@ 
     static private function fillTimeSlots(array $array, $id, \Illuminate\Support\Collection $timeSlots, $fill = '0')
     {
         foreach ($timeSlots as $timeSlot) {
-            if (!isset($array[$id]))
-                $array[$id] = [];
+            if (!isset($array[$id])) {
+                            $array[$id] = [];
+            }
             $array[$id] = self::arrayPadInterval($array[$id], $timeSlot->time_start, $timeSlot->time_end, $fill);
         }
         return $array;
@@ -318,8 +319,9 @@ 
      */
     static private function arrayPadInterval(array $array, $from, $to, $pad = '0')
     {
-        for ($i = $from; $i < $to; $i++)
-            $array[$i] = $pad;
+        for ($i = $from; $i < $to; $i++) {
+                    $array[$i] = $pad;
+        }
         return $array;
     }
 
@@ -332,8 +334,9 @@ 
     static private function fillRow(array $array, $id, $until, $fill = '0')
     {
         for ($i = 1; $i <= $until; $i++) {
-            if (!isset($array[$id][$i]))
-                $array[$id][$i] = $fill;
+            if (!isset($array[$id][$i])) {
+                            $array[$id][$i] = $fill;
+            }
         }
 
         return $array;

app/Console/Commands/Optimise/OptimiseCommand.php

Spacing +3 added lines, -3 removed lines

@@ -70,9 +70,9 @@ 
      */
     private function makeForeground(Company $company)
     {
-        $this->info('Optimisation company ' . $company->id . ' started');
+        $this->info('Optimisation company '.$company->id.' started');
         (new Optimise($company, $this->schedule, $this->laravel))->optimise()->save();
-        $this->info('Optimisation ' . $company->id . ' completed');
+        $this->info('Optimisation '.$company->id.' completed');
     }
 
     private function syncAll()
@@ -96,7 +96,7 @@ 
      */
     private function makeBackground(Company $company)
     {
-        $event = $this->schedule->command('optimise:meetings ' . $company->id)->withoutOverlapping();
+        $event = $this->schedule->command('optimise:meetings '.$company->id)->withoutOverlapping();
         if ($event->isDue($this->laravel))
             $event->run($this->laravel);
     }

Braces +14 added lines, -10 removed lines

@@ -58,10 +58,11 @@ 
         //TODO insert a timeout
         //TODO try...catch with destruct
         $companyId = $this->argument('companyId');
-        if (is_numeric($companyId))
-            $this->makeForeground(Company::findOrFail($companyId));
-        else
-            $this->syncAll();
+        if (is_numeric($companyId)) {
+                    $this->makeForeground(Company::findOrFail($companyId));
+        } else {
+                    $this->syncAll();
+        }
     }
 
     /**
@@ -81,13 +82,15 @@ 
         if ($this->option('background')) {
             \Log::debug(self::BACKGROUND_MOD_MEX);
             $this->info(self::BACKGROUND_MOD_MEX);
-            foreach ($calendars as $calendar)
-                $this->makeBackground($calendar);
+            foreach ($calendars as $calendar) {
+                            $this->makeBackground($calendar);
+            }
             \Log::debug(self::BACKGROUND_COMPLETED_MEX);
             $this->info(self::BACKGROUND_COMPLETED_MEX);
-        } else
-            foreach ($calendars as $calendar)
+        } else {
+                    foreach ($calendars as $calendar)
                 $this->makeForeground($calendar);
+        }
     }
 
     /**
@@ -97,7 +100,8 @@ 
     private function makeBackground(Company $company)
     {
         $event = $this->schedule->command('optimise:meetings ' . $company->id)->withoutOverlapping();
-        if ($event->isDue($this->laravel))
-            $event->run($this->laravel);
+        if ($event->isDue($this->laravel)) {
+                    $event->run($this->laravel);
+        }
     }
 }

app/Console/Commands/Optimise/Path.php

Spacing +11 added lines, -11 removed lines

@@ -53,7 +53,7 @@ 
         if (file_exists($path->getPath()))
             throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
         if (!@mkdir($path->getPath()))
-            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');;
+            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)'); ;
         if (!is_dir($path->getPath()))
             throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
         return $path;
@@ -104,7 +104,7 @@ 
      */
     public function getModelPath()
     {
-        return $this->path . '/model.mod';
+        return $this->path.'/model.mod';
     }
 
     /**
@@ -112,7 +112,7 @@ 
      */
     public function getUsersPath()
     {
-        return $this->path . '/Users.csv';
+        return $this->path.'/Users.csv';
     }
 
     /**
@@ -120,7 +120,7 @@ 
      */
     public function getMeetingsPath()
     {
-        return $this->path . '/Meeting.csv';
+        return $this->path.'/Meeting.csv';
     }
 
     /**
@@ -128,7 +128,7 @@ 
      */
     public function getMeetingsDurationPath()
     {
-        return $this->path . '/MeetingsDuration.csv';
+        return $this->path.'/MeetingsDuration.csv';
     }
 
     /**
@@ -136,7 +136,7 @@ 
      */
     public function getMeetingsAvailabilityPath()
     {
-        return $this->path . '/MeetingsAvailability.csv';
+        return $this->path.'/MeetingsAvailability.csv';
     }
 
     /**
@@ -144,7 +144,7 @@ 
      */
     public function getUsersAvailabilityPath()
     {
-        return $this->path . '/UsersAvailability.csv';
+        return $this->path.'/UsersAvailability.csv';
     }
 
     /**
@@ -152,7 +152,7 @@ 
      */
     public function getUsersMeetingsPath()
     {
-        return $this->path . '/UsersMeetings.csv';
+        return $this->path.'/UsersMeetings.csv';
     }
 
     /**
@@ -160,7 +160,7 @@ 
      */
     public function getXPath()
     {
-        return $this->path . '/x.csv';
+        return $this->path.'/x.csv';
     }
 
     /**
@@ -168,7 +168,7 @@ 
      */
     public function getYPath()
     {
-        return $this->path . '/y.csv';
+        return $this->path.'/y.csv';
     }
 
     /**
@@ -176,6 +176,6 @@ 
      */
     public function getOutputPath()
     {
-        return $this->path . '/out.txt';
+        return $this->path.'/out.txt';
     }
 }
\ No newline at end of file

Braces +13 added lines, -8 removed lines

@@ -50,12 +50,16 @@ 
     {
         $path = new Path(tempnam(sys_get_temp_dir(), 'OPT')); //TODO check the return in case of errors this return false on failure
         unlink($path->getPath()); //remove file to create a dir
-        if (file_exists($path->getPath()))
-            throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
-        if (!@mkdir($path->getPath()))
-            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');;
-        if (!is_dir($path->getPath()))
-            throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
+        if (file_exists($path->getPath())) {
+                    throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
+        }
+        if (!@mkdir($path->getPath())) {
+                    throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');
+        }
+        ;
+        if (!is_dir($path->getPath())) {
+                    throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
+        }
         return $path;
     }
 
@@ -80,8 +84,9 @@ 
      */
     public function __destruct()
     {
-        if ($this->path && is_dir($this->path) && !self::delTree($this->path))
-            throw new OptimiseException('problems during removing of path directory');
+        if ($this->path && is_dir($this->path) && !self::delTree($this->path)) {
+                    throw new OptimiseException('problems during removing of path directory');
+        }
     }
 
     /**

app/Console/Commands/Optimise/Solver.php

Spacing +21 added lines, -21 removed lines

@@ -244,7 +244,7 @@ 
             $timeSlots = array_keys($meetingsAvailabilityS);
             if (count($timeSlots) != $this->timeSlots)
                 throw new OptimiseException('timeSlots different from timeSlots set');
-            $meetingsAvailability[$key] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
+            $meetingsAvailability[ $key ] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
         }
 
         $this->meetingsAvailability = $meetingsAvailability;
@@ -261,7 +261,7 @@ 
     {
         $len = $len - count($array);
         for ($i = 0; $i < $len; $i++)
-            $array[] = $pad;
+            $array[ ] = $pad;
         return $array;
     }
 
@@ -286,7 +286,7 @@ 
             throw new OptimiseException('meetings different from meetings set');
         }
         foreach ($meetingsDuration as $duration) {
-            $duration = (int)$duration; //TODO fix this (fix for optimise)
+            $duration = (int) $duration; //TODO fix this (fix for optimise)
             if (!is_int($duration) || $duration <= 0)
                 throw new OptimiseException('duration is not integer or it is not >0');
         }
@@ -318,7 +318,7 @@ 
             if (count($timeSlots) != $this->timeSlots)
                 throw new OptimiseException('timeSlots different from timeSlots set');
 
-            $usersAvailability[$key] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
+            $usersAvailability[ $key ] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
         }
 
         $this->usersAvailability = $usersAvailability;
@@ -361,7 +361,7 @@ 
     {
         $this->writeData();
         $this->writeModelFile();
-        $event = $this->schedule->exec('glpsol --math ' . $this->path->getModelPath())->sendOutputTo($this->path->getOutputPath())->after(function () {
+        $event = $this->schedule->exec('glpsol --math '.$this->path->getModelPath())->sendOutputTo($this->path->getOutputPath())->after(function() {
         }); //this just to execute in foreground
         if ($event->isDue($this->laravel))
             $event->run($this->laravel);
@@ -388,8 +388,8 @@ 
      */
     private function checkData()
     {
-        $this->checkArrayProprieties(['users', 'meetings', 'meetingsAvailability', 'meetingsDuration', 'usersAvailability', 'usersMeetings']);
-        $this->checkIntProprieties(['timeSlots', 'maxTimeSlots']);
+        $this->checkArrayProprieties([ 'users', 'meetings', 'meetingsAvailability', 'meetingsDuration', 'usersAvailability', 'usersMeetings' ]);
+        $this->checkIntProprieties([ 'timeSlots', 'maxTimeSlots' ]);
     }
 
     /**
@@ -400,7 +400,7 @@ 
     {
         foreach ($proprieties as $propriety)
             if (count($this->$propriety) == 0)
-                throw new OptimiseException($propriety . ' is not set correctly');
+                throw new OptimiseException($propriety.' is not set correctly');
     }
 
     /**
@@ -411,7 +411,7 @@ 
     {
         foreach ($proprieties as $propriety)
             if (!is_int($this->$propriety) || $this->$propriety <= 0)
-                throw new OptimiseException($propriety . ' is not set correctly');
+                throw new OptimiseException($propriety.' is not set correctly');
     }
 
     /**
@@ -429,13 +429,13 @@ 
      */
     static private function writeCSVArrayNoKey($file, $data)
     {
-        $f = function ($fp, $data) {
+        $f = function($fp, $data) {
             foreach ($data as $field) {
-                fputcsv($fp, [$field]);
+                fputcsv($fp, [ $field ]);
             }
         };
 
-        self::writeCSV($file, $data, ['i'], $f);
+        self::writeCSV($file, $data, [ 'i' ], $f);
     }
 
     /**
@@ -484,13 +484,13 @@ 
      */
     static private function writeCSVArray($file, $data, $name)
     {
-        $f = function ($fp, $data) {
+        $f = function($fp, $data) {
             foreach ($data as $key => $field) {
-                fputcsv($fp, [$key, $field]);
+                fputcsv($fp, [ $key, $field ]);
             }
         };
 
-        self::writeCSV($file, $data, ['i', $name], $f);
+        self::writeCSV($file, $data, [ 'i', $name ], $f);
     }
 
     /**
@@ -509,14 +509,14 @@ 
      */
     static private function writeCSVMatrix($file, $data, $name)
     {
-        $f = function ($fp, $data) {
+        $f = function($fp, $data) {
             foreach ($data as $key => $field) {
                 foreach ($field as $key2 => $field2)
-                    fputcsv($fp, [$key, $key2, $field2]);
+                    fputcsv($fp, [ $key, $key2, $field2 ]);
             }
         };
 
-        self::writeCSV($file, $data, ['i', 'j', $name], $f);
+        self::writeCSV($file, $data, [ 'i', 'j', $name ], $f);
     }
 
     /**
@@ -545,7 +545,7 @@ 
         $f = @fopen($this->path->getModelPath(), "w");
         if (!$f)
             throw new OptimiseException('problem during creation of a file');
-        fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__ . "/model.stub")));
+        fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__."/model.stub")));
         fclose($f);
     }
 
@@ -572,7 +572,7 @@ 
         if (!$handle)
             throw new OptimiseException('problems during reading the file');
 
-        $ret = [];
+        $ret = [ ];
         fgetcsv($handle); //skip head
         while (($data = fgetcsv($handle)) !== FALSE) {
             if (count($data) != 3) {
@@ -580,7 +580,7 @@ 
                 throw new OptimiseException('problems during parsing the file');
             }
 
-            $ret[$data[0]][$data[1]] = $data[2];
+            $ret[ $data[ 0 ] ][ $data[ 1 ] ] = $data[ 2 ];
         }
 
         fclose($handle);

Braces +60 added lines, -40 removed lines

@@ -104,8 +104,9 @@ 
      */
     static private function checkGlpsol()
     {
-        if (!(`which glpsol`))
-            throw new OptimiseException('glpsol is not installed');
+        if (!(`which glpsol`)) {
+                    throw new OptimiseException('glpsol is not installed');
+        }
     }
 
     /**
@@ -193,8 +194,9 @@ 
      */
     public function setTimeSlots($timeSlots)
     {
-        if (!is_int($timeSlots) || $timeSlots <= 0)
-            throw new OptimiseException('$timeSlots is not integer or it is not >0');
+        if (!is_int($timeSlots) || $timeSlots <= 0) {
+                    throw new OptimiseException('$timeSlots is not integer or it is not >0');
+        }
 
         $this->timeSlots = $timeSlots;
         return $this;
@@ -215,8 +217,9 @@ 
      */
     public function setMaxTimeSlots($maxTimeSlots)
     {
-        if (!is_int($maxTimeSlots) || $maxTimeSlots <= 0)
-            throw new OptimiseException('$maxTimeSlots is not integer or it is not >0');
+        if (!is_int($maxTimeSlots) || $maxTimeSlots <= 0) {
+                    throw new OptimiseException('$maxTimeSlots is not integer or it is not >0');
+        }
 
         $this->maxTimeSlots = $maxTimeSlots;
         return $this;
@@ -238,12 +241,14 @@ 
     public function setMeetingsAvailability($meetingsAvailability)
     {
         $meetings = array_keys($meetingsAvailability);
-        if (array_diff($meetings, $this->meetings))
-            throw new OptimiseException('meetings different from meetings set');
+        if (array_diff($meetings, $this->meetings)) {
+                    throw new OptimiseException('meetings different from meetings set');
+        }
         foreach ($meetingsAvailability as $key => $meetingsAvailabilityS) {
             $timeSlots = array_keys($meetingsAvailabilityS);
-            if (count($timeSlots) != $this->timeSlots)
-                throw new OptimiseException('timeSlots different from timeSlots set');
+            if (count($timeSlots) != $this->timeSlots) {
+                            throw new OptimiseException('timeSlots different from timeSlots set');
+            }
             $meetingsAvailability[$key] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
         }
 
@@ -260,8 +265,9 @@ 
     static private function arrayPad(array $array, $len, $pad)
     {
         $len = $len - count($array);
-        for ($i = 0; $i < $len; $i++)
-            $array[] = $pad;
+        for ($i = 0; $i < $len; $i++) {
+                    $array[] = $pad;
+        }
         return $array;
     }
 
@@ -287,8 +293,9 @@ 
         }
         foreach ($meetingsDuration as $duration) {
             $duration = (int)$duration; //TODO fix this (fix for optimise)
-            if (!is_int($duration) || $duration <= 0)
-                throw new OptimiseException('duration is not integer or it is not >0');
+            if (!is_int($duration) || $duration <= 0) {
+                            throw new OptimiseException('duration is not integer or it is not >0');
+            }
         }
 
         $this->meetingsDuration = $meetingsDuration;
@@ -311,12 +318,14 @@ 
     public function setUsersAvailability($usersAvailability)
     {
         $users = array_keys($usersAvailability);
-        if (array_diff($users, $this->users))
-            throw new OptimiseException('users different from users set');
+        if (array_diff($users, $this->users)) {
+                    throw new OptimiseException('users different from users set');
+        }
         foreach ($usersAvailability as $key => $usersAvailabilityS) {
             $timeSlots = array_keys($usersAvailabilityS);
-            if (count($timeSlots) != $this->timeSlots)
-                throw new OptimiseException('timeSlots different from timeSlots set');
+            if (count($timeSlots) != $this->timeSlots) {
+                            throw new OptimiseException('timeSlots different from timeSlots set');
+            }
 
             $usersAvailability[$key] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
         }
@@ -341,12 +350,14 @@ 
     public function setUsersMeetings($usersMeetings)
     {
         $users = array_keys($usersMeetings);
-        if (array_diff($users, $this->users))
-            throw new OptimiseException('users different from users set');
+        if (array_diff($users, $this->users)) {
+                    throw new OptimiseException('users different from users set');
+        }
         foreach ($usersMeetings as $usersMeetingsS) {
             $meetings = array_keys($usersMeetingsS);
-            if (array_diff($meetings, $this->meetings))
-                throw new OptimiseException('meetings different from meetings set');
+            if (array_diff($meetings, $this->meetings)) {
+                            throw new OptimiseException('meetings different from meetings set');
+            }
         }
 
         $this->usersMeetings = $usersMeetings;
@@ -363,8 +374,9 @@ 
         $this->writeModelFile();
         $event = $this->schedule->exec('glpsol --math ' . $this->path->getModelPath())->sendOutputTo($this->path->getOutputPath())->after(function () {
         }); //this just to execute in foreground
-        if ($event->isDue($this->laravel))
-            $event->run($this->laravel);
+        if ($event->isDue($this->laravel)) {
+                    $event->run($this->laravel);
+        }
         //TODO catch glpsol errors
         return $this;
     }
@@ -398,9 +410,10 @@ 
      */
     private function checkArrayProprieties($proprieties)
     {
-        foreach ($proprieties as $propriety)
-            if (count($this->$propriety) == 0)
+        foreach ($proprieties as $propriety) {
+                    if (count($this->$propriety) == 0)
                 throw new OptimiseException($propriety . ' is not set correctly');
+        }
     }
 
     /**
@@ -409,9 +422,10 @@ 
      */
     private function checkIntProprieties($proprieties)
     {
-        foreach ($proprieties as $propriety)
-            if (!is_int($this->$propriety) || $this->$propriety <= 0)
+        foreach ($proprieties as $propriety) {
+                    if (!is_int($this->$propriety) || $this->$propriety <= 0)
                 throw new OptimiseException($propriety . ' is not set correctly');
+        }
     }
 
     /**
@@ -448,8 +462,9 @@ 
     static private function writeCSV($file, $data, $heading, \Closure $writer)
     {
         $fp = @fopen($file, 'w');
-        if (!$fp)
-            throw new OptimiseException('problem during creation of a file');
+        if (!$fp) {
+                    throw new OptimiseException('problem during creation of a file');
+        }
 
         fputcsv($fp, $heading);
 
@@ -511,8 +526,9 @@ 
     {
         $f = function ($fp, $data) {
             foreach ($data as $key => $field) {
-                foreach ($field as $key2 => $field2)
-                    fputcsv($fp, [$key, $key2, $field2]);
+                foreach ($field as $key2 => $field2) {
+                                    fputcsv($fp, [$key, $key2, $field2]);
+                }
             }
         };
 
@@ -543,8 +559,9 @@ 
         $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}');
         $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());
         $f = @fopen($this->path->getModelPath(), "w");
-        if (!$f)
-            throw new OptimiseException('problem during creation of a file');
+        if (!$f) {
+                    throw new OptimiseException('problem during creation of a file');
+        }
         fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__ . "/model.stub")));
         fclose($f);
     }
@@ -565,12 +582,14 @@ 
      */
     static private function readCSVFile($file)
     {
-        if (!file_exists($file) || !filesize($file))
-            throw new OptimiseException('no results file');
+        if (!file_exists($file) || !filesize($file)) {
+                    throw new OptimiseException('no results file');
+        }
 
         $handle = @fopen($file, "r");
-        if (!$handle)
-            throw new OptimiseException('problems during reading the file');
+        if (!$handle) {
+                    throw new OptimiseException('problems during reading the file');
+        }
 
         $ret = [];
         fgetcsv($handle); //skip head
@@ -603,8 +622,9 @@ 
      */
     public function getOutput()
     {
-        if (!($data = file_get_contents($this->path->getOutputPath())))
-            throw new OptimiseException('problems during reading the file');
+        if (!($data = file_get_contents($this->path->getOutputPath()))) {
+                    throw new OptimiseException('problems during reading the file');
+        }
         return $data;
     }
 }
\ No newline at end of file

app/Console/Commands/SyncCaldav/Sync.php

Spacing +11 added lines, -11 removed lines

@@ -108,7 +108,7 @@ 
         $caldavClient = new SimpleCaldavAdapter();
         $caldavClient->connect($this->calendar->url, $this->calendar->username, \Crypt::decrypt($this->calendar->password));
         $calendars = $caldavClient->findCalendars();
-        $caldavClient->setCalendar($calendars[$this->calendar->calendar_name]);//TODO error if the calendar name is wrong
+        $caldavClient->setCalendar($calendars[ $this->calendar->calendar_name ]); //TODO error if the calendar name is wrong
         /**
          * 26 hours before to avoid tiemezone problems and dst problems
          * 30 days after
@@ -124,15 +124,15 @@ 
     {
         $pattern = "/^((DTSTART;)|(DTEND;))(.*)\$/m";
         if (preg_match_all($pattern, $event->getData(), $matches)) {
-            if (!isset($matches[4]) || count($matches[4]) != 2)
+            if (!isset($matches[ 4 ]) || count($matches[ 4 ]) != 2)
                 return null;
-            $ret = [];
-            if ($tmp = $this->parseDate($matches[4][0]))
-                $ret['time_start'] = $tmp;
+            $ret = [ ];
+            if ($tmp = $this->parseDate($matches[ 4 ][ 0 ]))
+                $ret[ 'time_start' ] = $tmp;
             else
                 return null;
-            if ($tmp = $this->parseDate($matches[4][1]))
-                $ret['time_end'] = $tmp;
+            if ($tmp = $this->parseDate($matches[ 4 ][ 1 ]))
+                $ret[ 'time_end' ] = $tmp;
             else
                 return null;
             return $ret;
@@ -148,10 +148,10 @@ 
     {
         $pattern = "/^((TZID=)|(VALUE=))(.*):(.*)\$/m";
         if (preg_match_all($pattern, $date, $matches)) {
-            if ($matches[1][0] == 'TZID=') {
-                return \DateTime::createFromFormat('Ymd\THis', $matches[5][0], new \DateTimeZone($matches[4][0]));
-            } else if ($matches[1][0] == 'VALUE=' && $matches[4][0] == 'DATE') {
-                return \DateTime::createFromFormat('Ymd\THis', $matches[5][0] . 'T000000');
+            if ($matches[ 1 ][ 0 ] == 'TZID=') {
+                return \DateTime::createFromFormat('Ymd\THis', $matches[ 5 ][ 0 ], new \DateTimeZone($matches[ 4 ][ 0 ]));
+            } else if ($matches[ 1 ][ 0 ] == 'VALUE=' && $matches[ 4 ][ 0 ] == 'DATE') {
+                return \DateTime::createFromFormat('Ymd\THis', $matches[ 5 ][ 0 ].'T000000');
             }
         }
         return null;

Braces +18 added lines, -14 removed lines

@@ -89,10 +89,11 @@ 
 
         //insert new timeslots
         foreach ($events as $event) {
-            if (!($event = $this->parseEvent($event)))
-                \Event::fire(new ErrorEvent($this->calendar, 'problem during the parsing an event'));
-            else
-                $calendarMain->timeslots()->create($event);
+            if (!($event = $this->parseEvent($event))) {
+                            \Event::fire(new ErrorEvent($this->calendar, 'problem during the parsing an event'));
+            } else {
+                            $calendarMain->timeslots()->create($event);
+            }
         }
         \Event::fire(new OkEvent($this->calendar));
     }
@@ -124,17 +125,20 @@ 
     {
         $pattern = "/^((DTSTART;)|(DTEND;))(.*)\$/m";
         if (preg_match_all($pattern, $event->getData(), $matches)) {
-            if (!isset($matches[4]) || count($matches[4]) != 2)
-                return null;
+            if (!isset($matches[4]) || count($matches[4]) != 2) {
+                            return null;
+            }
             $ret = [];
-            if ($tmp = $this->parseDate($matches[4][0]))
-                $ret['time_start'] = $tmp;
-            else
-                return null;
-            if ($tmp = $this->parseDate($matches[4][1]))
-                $ret['time_end'] = $tmp;
-            else
-                return null;
+            if ($tmp = $this->parseDate($matches[4][0])) {
+                            $ret['time_start'] = $tmp;
+            } else {
+                            return null;
+            }
+            if ($tmp = $this->parseDate($matches[4][1])) {
+                            $ret['time_end'] = $tmp;
+            } else {
+                            return null;
+            }
             return $ret;
         }
         return null;

app/Console/Commands/SyncCaldav/SyncCaldav.php

Spacing +3 added lines, -3 removed lines

@@ -71,9 +71,9 @@ 
      */
     private function makeForeground(Caldav $calendar)
     {
-        $this->info('Sync calendar ' . $calendar->calendar_id . ' started');
+        $this->info('Sync calendar '.$calendar->calendar_id.' started');
         (new Sync($calendar))->sync();
-        $this->info('Sync calendar ' . $calendar->calendar_id . ' completed');
+        $this->info('Sync calendar '.$calendar->calendar_id.' completed');
     }
 
     private function syncAll()
@@ -97,7 +97,7 @@ 
      */
     private function makeBackground(Caldav $calendar)
     {
-        $event = $this->schedule->command('sync:caldav ' . $calendar->calendar_id)->withoutOverlapping();
+        $event = $this->schedule->command('sync:caldav '.$calendar->calendar_id)->withoutOverlapping();
         if ($event->isDue($this->laravel))
             $event->run($this->laravel);
     }

Braces +14 added lines, -10 removed lines

@@ -59,10 +59,11 @@ 
     {
         //
         $calendarId = $this->argument('calendarId');
-        if (is_numeric($calendarId))
-            $this->makeForeground(Caldav::findOrFail($calendarId));
-        else
-            $this->syncAll();
+        if (is_numeric($calendarId)) {
+                    $this->makeForeground(Caldav::findOrFail($calendarId));
+        } else {
+                    $this->syncAll();
+        }
     }
 
     /**
@@ -82,13 +83,15 @@ 
         if ($this->option('background')) {
             \Log::debug(self::BACKGROUND_MOD_MEX);
             $this->info(self::BACKGROUND_MOD_MEX);
-            foreach ($calendars as $calendar)
-                $this->makeBackground($calendar);
+            foreach ($calendars as $calendar) {
+                            $this->makeBackground($calendar);
+            }
             \Log::debug(self::BACKGROUND_COMPLETED_MEX);
             $this->info(self::BACKGROUND_COMPLETED_MEX);
-        } else
-            foreach ($calendars as $calendar)
+        } else {
+                    foreach ($calendars as $calendar)
                 $this->makeForeground($calendar);
+        }
     }
 
     /**
@@ -98,7 +101,8 @@ 
     private function makeBackground(Caldav $calendar)
     {
         $event = $this->schedule->command('sync:caldav ' . $calendar->calendar_id)->withoutOverlapping();
-        if ($event->isDue($this->laravel))
-            $event->run($this->laravel);
+        if ($event->isDue($this->laravel)) {
+                    $event->run($this->laravel);
+        }
     }
 }

app/Employee.php

Spacing +7 added lines, -7 removed lines

@@ -43,19 +43,19 @@ 
      *
      * @var array
      */
-    protected $fillable = ['name', 'email', 'password'];
+    protected $fillable = [ 'name', 'email', 'password' ];
 
     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
-    protected $hidden = ['password', 'remember_token', 'pivot'];
+    protected $hidden = [ 'password', 'remember_token', 'pivot' ];
 
     /**
      * @var array
      */
-    protected $appends = ['is_planner'];
+    protected $appends = [ 'is_planner' ];
 
     public function getIsPlannerAttribute()
     {
@@ -97,16 +97,16 @@ 
     public function getEmailForPasswordReset()
     {
         list(, $caller) = debug_backtrace(false);
-        if (isset($caller['class']))
-            $caller = explode('\\', $caller['class']);
+        if (isset($caller[ 'class' ]))
+            $caller = explode('\\', $caller[ 'class' ]);
         else
             $caller = '';
 
         //check if this function is called by email sender
-        if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == ''))
+        if ((count($caller) && $caller[ count($caller) - 1 ] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == ''))
             return $this->email;
         //return unique identify for token repository
-        return $this->email . $this->company->id;
+        return $this->email.$this->company->id;
     }
 
     /**

Braces +8 added lines, -6 removed lines

@@ -97,14 +97,16 @@
     public function getEmailForPasswordReset()
     {
         list(, $caller) = debug_backtrace(false);
-        if (isset($caller['class']))
-            $caller = explode('\\', $caller['class']);
-        else
-            $caller = '';
+        if (isset($caller['class'])) {
+                    $caller = explode('\\', $caller['class']);
+        } else {
+                    $caller = '';
+        }
 
         //check if this function is called by email sender
-        if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == ''))
-            return $this->email;
+        if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == '')) {
+                    return $this->email;
+        }
         //return unique identify for token repository
         return $this->email . $this->company->id;
     }