dsd-meetme / backend

app/Console/Commands/SyncCaldav/Sync.php

Braces +21 added lines, -16 removed lines

@@ -90,10 +90,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));
     }
@@ -110,8 +111,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]))
-            throw new CaldavException("calendar inserted doesn't exist");
+        if(!isset($calendars[$this->calendar->calendar_name])) {
+                    throw new CaldavException("calendar inserted doesn't exist");
+        }
         $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
@@ -128,17 +130,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;

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/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);
     }

Braces +15 added lines, -11 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();
+        }
     }
 
     /**
@@ -74,7 +75,7 @@ 
         try {
             (new Optimise($company, $this->schedule, $this->laravel))->optimise()->save();
             $this->info('Optimisation ' . $company->id . ' completed');
-        }catch(OptimiseException $e) {
+        } catch(OptimiseException $e) {
             if ($e->isEmpty()) {
                 $mex = 'Company ' . $company->id . ' doesn\'t have sufficient data';
                 $this->warn($mex);
@@ -94,13 +95,15 @@ 
         if ($this->option('background')) {
             \Log::debug(self::BACKGROUND_MOD_MEX);
             $this->info(self::BACKGROUND_MOD_MEX);
-            foreach ($companies as $company)
-                $this->makeBackground($company);
+            foreach ($companies as $company) {
+                            $this->makeBackground($company);
+            }
             \Log::debug(self::BACKGROUND_COMPLETED_MEX);
             $this->info(self::BACKGROUND_COMPLETED_MEX);
-        } else
-            foreach ($companies as $company)
+        } else {
+                    foreach ($companies as $company)
                 $this->makeForeground($company);
+        }
     }
 
     /**
@@ -110,7 +113,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/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/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);
     }
 

Braces +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
                 \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

app/Console/Commands/MeetingsList.php

Spacing +4 added lines, -4 removed lines

@@ -47,12 +47,12 @@
 
     private static function withFilter()
     {
-        return ['groups' => function ($query) {
+        return [ 'groups' => function($query) {
             $query->select('id', 'company_id');
-        }, 'groups.meetings' => function ($query) {
+        }, 'groups.meetings' => function($query) {
             $query->select('id', 'group_id', 'start_time');
-        }, 'groups.meetings.employees' => function ($query) {
+        }, 'groups.meetings.employees' => function($query) {
             $query->select('id');
-        }];
+        } ];
     }
 }

Braces +5 added lines, -4 removed lines

@@ -39,10 +39,11 @@
     {
         //
         $companyId = $this->argument('companyId');
-        if (is_numeric($companyId))
-            print_r(Company::with(self::withFilter())->findOrFail($companyId)->toArray());
-        else
-            print_r(Company::with(self::withFilter())->select('id')->get()->toArray());
+        if (is_numeric($companyId)) {
+                    print_r(Company::with(self::withFilter())->findOrFail($companyId)->toArray());
+        } else {
+                    print_r(Company::with(self::withFilter())->select('id')->get()->toArray());
+        }
     }
 
     private static function withFilter()

app/Http/Controllers/Employees/Planners/MeetingsController.php

Spacing +10 added lines, -10 removed lines

@@ -14,8 +14,8 @@ 
 {
     public function __construct()
     {
-        config(['auth.model' => \plunner\Planner::class]);
-        config(['jwt.user' => \plunner\Planner::class]);
+        config([ 'auth.model' => \plunner\Planner::class ]);
+        config([ 'jwt.user' => \plunner\Planner::class ]);
         $this->middleware('jwt.authandrefresh:mode-en');
     }
 
@@ -33,10 +33,10 @@ 
         $this->authorize($group);
         $meetings = $group->meetings();
         if ($request->query('current'))
-            $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
-                $query->where('start_time', '=', NULL);//to be planned
+            $meetings->where(function($query) { //parenthesis for conditions ...(C1 OR C2)...
+                $query->where('start_time', '=', NULL); //to be planned
                 //datetime to consider timezone, don't use mysql NOW()
-                $query->orWhere('start_time', '>=', new \DateTime());//planned
+                $query->orWhere('start_time', '>=', new \DateTime()); //planned
             });
 
         return $meetings->get();
@@ -86,7 +86,7 @@ 
      */
     public function storeImage(Requests\Request $request, $groupId, $meetingId)
     {
-        $this->validate($request, ['data' => 'required|image']);
+        $this->validate($request, [ 'data' => 'required|image' ]);
         $group = Group::findOrFail($groupId);
         $this->authorize($group);
         $meeting = Group::findOrFail($meetingId);
@@ -98,7 +98,7 @@ 
 
     private static function putImg($file, Meeting $meeting)
     {
-        \Storage::put('meetings/' . $meeting->id, \File::get($file));
+        \Storage::put('meetings/'.$meeting->id, \File::get($file));
     }
 
     /**
@@ -125,7 +125,7 @@ 
 
     private static function getImg(Meeting $meeting)
     {
-        $name = 'meetings/' . $meeting->id;
+        $name = 'meetings/'.$meeting->id;
         if (!\Storage::exists($name))
             return false;
         return \Storage::get($name);
@@ -147,8 +147,8 @@ 
         $this->authorize($meeting);
         $input = $request->all();
         //the planner cannot modify the duration of a planed meeting
-        if ($meeting->start_time != NULL && $meeting->duration != $input['duration'])
-            return Response::json(['error' => 'the meeting is already planned, you cannot change the duration'], 422);
+        if ($meeting->start_time != NULL && $meeting->duration != $input[ 'duration' ])
+            return Response::json([ 'error' => 'the meeting is already planned, you cannot change the duration' ], 422);
         $meeting->update($input);
         return $meeting;
     }

Braces +14 added lines, -9 removed lines

@@ -32,9 +32,11 @@ 
         $group = Group::findOrFail($groupId);
         $this->authorize($group);
         $meetings = $group->meetings();
-        if ($request->query('current'))
-            $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
-                $query->where('start_time', '=', NULL);//to be planned
+        if ($request->query('current')) {
+                    $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
+                $query->where('start_time', '=', NULL);
+        }
+        //to be planned
                 //datetime to consider timezone, don't use mysql NOW()
                 $query->orWhere('start_time', '>=', new \DateTime());//planned
             });
@@ -116,9 +118,10 @@ 
         $this->authorize($meeting);
         $ret = self::getImg($meeting);
         $blank = storage_path('img/meetings.jpg');
-        if ($ret === false)
-            return (new Response(file_get_contents($blank), 200))
+        if ($ret === false) {
+                    return (new Response(file_get_contents($blank), 200))
                 ->header('Content-Type', 'image/jpeg');
+        }
         return (new Response($ret, 200))
             ->header('Content-Type', 'image/jpeg');
     }
@@ -126,8 +129,9 @@ 
     private static function getImg(Meeting $meeting)
     {
         $name = 'meetings/' . $meeting->id;
-        if (!\Storage::exists($name))
-            return false;
+        if (!\Storage::exists($name)) {
+                    return false;
+        }
         return \Storage::get($name);
     }
 
@@ -147,8 +151,9 @@ 
         $this->authorize($meeting);
         $input = $request->all();
         //the planner cannot modify the duration of a planed meeting
-        if ($meeting->start_time != NULL && $meeting->duration != $input['duration'])
-            return Response::json(['error' => 'the meeting is already planned, you cannot change the duration'], 422);
+        if ($meeting->start_time != NULL && $meeting->duration != $input['duration']) {
+                    return Response::json(['error' => 'the meeting is already planned, you cannot change the duration'], 422);
+        }
         $meeting->update($input);
         return $meeting;
     }

app/Http/Controllers/NoAuthController.php

Unused Use Statements -3 removed lines

@@ -2,9 +2,6 @@
 
 namespace plunner\Http\Controllers;
 
-use Illuminate\Http\Request;
-use plunner\Http\Requests;
-
 class NoAuthController extends Controller
 {
     public function __construct()

Braces +3 added lines, -2 removed lines

@@ -26,9 +26,10 @@
         //$this->authorize($meeting);
         $ret = self::getImg($meeting);
         $blank = storage_path('img/meetings.jpg');
-        if ($ret === false)
-            return (new Response(file_get_contents($blank), 200))
+        if ($ret === false) {
+                    return (new Response(file_get_contents($blank), 200))
                 ->header('Content-Type', 'image/jpeg');
+        }
         return (new Response($ret, 200))
             ->header('Content-Type', 'image/jpeg');
     }