dsd-meetme / backend

app/Console/Commands/Optimise/OptimiseCommand.php

Spacing +6 added lines, -6 removed lines

@@ -70,17 +70,17 @@ 
      */
     private function makeForeground(Company $company)
     {
-        $this->info('Optimisation company ' . $company->id . ' started');
+        $this->info('Optimisation company '.$company->id.' started');
         try {
             (new Optimise($company, $this->schedule, $this->laravel))->optimise()->save();
-            $this->info('Optimisation ' . $company->id . ' completed');
-        }catch(OptimiseException $e) {
+            $this->info('Optimisation '.$company->id.' completed');
+        } catch (OptimiseException $e) {
             if ($e->isEmpty()) {
-                $mex = 'Company ' . $company->id . ' doesn\'t have sufficient data';
+                $mex = 'Company '.$company->id.' doesn\'t have sufficient data';
                 $this->warn($mex);
                 \Log::info($mex);
             } else {
-                $mex = 'Error during optimisation of company ' . $company->id . ': ' . $e->getMessage();
+                $mex = 'Error during optimisation of company '.$company->id.': '.$e->getMessage();
                 $this->error($mex);
                 //TODO log cause, but don't send it to the user
                 //\Log::error($mex); //already logged in listener
@@ -109,7 +109,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);
     }

app/Console/Commands/SyncCaldav/Sync.php

Spacing +12 added lines, -12 removed lines

@@ -110,9 +110,9 @@ 
         $caldavClient = new SimpleCaldavAdapter();
         $caldavClient->connect($this->calendar->url, $this->calendar->username, \Crypt::decrypt($this->calendar->password));
         $calendars = $caldavClient->findCalendars();
-        if(!isset($calendars[$this->calendar->calendar_name]))
+        if (!isset($calendars[ $this->calendar->calendar_name ]))
             throw new CaldavException("calendar inserted doesn't exist");
-        $caldavClient->setCalendar($calendars[$this->calendar->calendar_name]);
+        $caldavClient->setCalendar($calendars[ $this->calendar->calendar_name ]);
         /**
          * 26 hours before to avoid tiemezone problems and dst problems
          * 30 days after
@@ -128,15 +128,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;
@@ -152,10 +152,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;

app/Listeners/Caldav/OkListener.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     {
         //
         $calendar = $event->getCalendar();
-        \Log::info('caldav (calendar id = ' . $calendar->calendar_id . ') correctly synchronized');
+        \Log::info('caldav (calendar id = '.$calendar->calendar_id.') correctly synchronized');
         //$calendar = $event->getCalendar()->fresh();
         $calendar->sync_errors = '';
         $calendar->save();

app/Listeners/Optimise/ErrorListener.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
     public function handle(ErrorEvent $event)
     {
         //
-        \Log::error('problems during optimise (company id = ' . $event->getCompany()->id . '): ' . $event->getError());
+        \Log::error('problems during optimise (company id = '.$event->getCompany()->id.'): '.$event->getError());
         $company = $event->getCompany();
         //$company = $event->getCompany()->fresh();
         self::sendEmail($company->email, $event->getError());
@@ -37,7 +37,7 @@ 
      */
     static private function sendEmail($email, $error)
     {
-        \Mail::queue('emails.optimise.error', ['error' => $error], function ($message) use ($email) {
+        \Mail::queue('emails.optimise.error', [ 'error' => $error ], function($message) use ($email) {
             $message->from(config('mail.from.address'), config('mail.from.name'));
             $message->to($email)->subject('Problems during optimisation');
         });

app/Listeners/Optimise/OkListener.php

Spacing +5 added lines, -5 removed lines

@@ -25,14 +25,14 @@ 
     public function handle(OkEvent $event)
     {
         //
-        \Log::info('Meeting correctly optimised (company id = ' . $event->getCompany()->id . ')');
+        \Log::info('Meeting correctly optimised (company id = '.$event->getCompany()->id.')');
         $company = $event->getCompany()->fresh();
         //send email to company
         self::sendCompanyEmail($company->email);
         //send emails to employees
-        $employees = $company->employees()->with(['meetings'=>function($query){
+        $employees = $company->employees()->with([ 'meetings'=>function($query) {
             $query->where('start_time', '>=', new \DateTime());
-        }])->get();
+        } ])->get();
         foreach ($employees as $employee)
             self::sendEmployeeEmail($employee->email, $employee->meetings);
     }
@@ -42,7 +42,7 @@ 
      */
     static private function sendCompanyEmail($email)
     {
-        \Mail::queue('emails.optimise.ok.company', [], function ($message) use ($email) {
+        \Mail::queue('emails.optimise.ok.company', [ ], function($message) use ($email) {
             $message->from(config('mail.from.address'), config('mail.from.name'));
             $message->to($email)->subject('Meetings optimised');
         });
@@ -54,7 +54,7 @@ 
      */
     static private function sendEmployeeEmail($email, $meetings)
     {
-        \Mail::queue('emails.optimise.ok.employee', ['meetings' => $meetings], function ($message) use ($email) {
+        \Mail::queue('emails.optimise.ok.employee', [ 'meetings' => $meetings ], function($message) use ($email) {
             $message->from(config('mail.from.address'), config('mail.from.name'));
             $message->to($email)->subject('Meetings of next week');
         });

app/Timeslot.php

Spacing +3 added lines, -3 removed lines

@@ -26,19 +26,19 @@
      *
      * @var array
      */
-    protected $fillable = ['time_start', 'time_end'];
+    protected $fillable = [ 'time_start', 'time_end' ];
 
     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
-    protected $hidden = ['pivot', 'calendar'];
+    protected $hidden = [ 'pivot', 'calendar' ];
 
     /**
      * @var array
      */
-    protected $touches = ['calendar'];
+    protected $touches = [ 'calendar' ];
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo

app/Http/Middleware/GetUserAndRefresh.php

Spacing +2 added lines, -2 removed lines

@@ -34,12 +34,12 @@
                 \JWTFactory::setTTL(43200);
                 //config(['jwt.ttl' =>'43200']); //30 days
             }
-        }catch(JWTException $e)
+        } catch (JWTException $e)
         {}
 
         //this to add the remember me mode field in the new token, but we have the custom check that is an useless
         //overhead
-        $custom = $custom . ';remember-' . $remember == 'true' ? 'true' : 'false';
+        $custom = $custom.';remember-'.$remember == 'true' ? 'true' : 'false';
         return parent::handle($request, $next, $custom);
     }
 

app/Console/Commands/Optimise/Solver.php

Spacing +23 added lines, -23 removed lines

@@ -241,10 +241,10 @@ 
         if (array_diff($meetings, $this->meetings))
             throw new OptimiseException('meetings different from meetings set');
         foreach ($meetingsAvailability as $key => $meetingsAvailabilityS) {
-            $timeSlots = array_keys($meetingsAvailabilityS);//TODO this is useless, we can use directly $usersAvailabilityS
+            $timeSlots = array_keys($meetingsAvailabilityS); //TODO this is useless, we can use directly $usersAvailabilityS
             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');
         }
@@ -314,11 +314,11 @@ 
         if (array_diff($users, $this->users))
             throw new OptimiseException('users different from users set');
         foreach ($usersAvailability as $key => $usersAvailabilityS) {
-            $timeSlots = array_keys($usersAvailabilityS);//TODO this is useless, we can use directly $usersAvailabilityS
+            $timeSlots = array_keys($usersAvailabilityS); //TODO this is useless, we can use directly $usersAvailabilityS
             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 . ' property is not set correctly');
+                throw new OptimiseException($propriety.' property is not set correctly');
     }
 
     /**
@@ -411,7 +411,7 @@ 
     {
         foreach ($proprieties as $propriety)
             if (!is_int($this->$propriety) || $this->$propriety <= 0)
-                throw new OptimiseException($propriety . ' property is not set correctly');
+                throw new OptimiseException($propriety.' property 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);