dsd-meetme / backend

app/Http/Requests/Companies/Groups/EmployeeRequest.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     public function rules()
     {
         return [
-            'id' => 'required|array|exists:employees,id,company_id,' . $this->user()->id,
+            'id' => 'required|array|exists:employees,id,company_id,'.$this->user()->id,
         ];
     }
 }

app/Http/Requests/Companies/Groups/GroupRequest.php

Spacing +2 added lines, -2 removed lines

@@ -31,9 +31,9 @@
     public function rules()
     {
         return [
-            'name' => 'required|max:255|unique:groups,name,' . $this->route('groups') . ',id,company_id,' . $this->user()->id,
+            'name' => 'required|max:255|unique:groups,name,'.$this->route('groups').',id,company_id,'.$this->user()->id,
             'description' => 'sometimes|required|max:255',
-            'planner_id' => 'required|exists:employees,id,company_id,' . $this->user()->id,
+            'planner_id' => 'required|exists:employees,id,company_id,'.$this->user()->id,
         ];
     }
 }

app/Listeners/Caldav/ErrorListener.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     public function handle(ErrorEvent $event)
     {
         //
-        \Log::info('problems during caldav (calendar id = ' . $event->getCalendar()->calendar_id . ') sync: ' . $event->getError());
+        \Log::info('problems during caldav (calendar id = '.$event->getCalendar()->calendar_id.') sync: '.$event->getError());
         $calendar = $event->getCalendar();
         //$calendar = $event->getCalendar()->fresh();
         $calendar->sync_errors = $event->getError();

app/Listeners/Optimise/OkListener.php

Braces +3 added lines, -2 removed lines

@@ -31,8 +31,9 @@
         self::sendCompanyEmail($company->email);
         //send emails to employees
         $employees = $company->employees()->with('meetings')->get();
-        foreach ($employees as $employee)
-            self::sendEmployeeEmail($employee->email, $employee->meetings);
+        foreach ($employees as $employee) {
+                    self::sendEmployeeEmail($employee->email, $employee->meetings);
+        }
     }
 
     /**

Doc Comments +7 added lines

@@ -49,6 +49,10 @@ 
         });
     }
 
+    /**
+     * @param string $title
+     * @param string $message
+     */
     static private function sendPushs($title, $message, $additionalData = '')
     {
         $clients = explode(';', config('app.gcm_clients'));
@@ -58,6 +62,9 @@ 
         //self::sendPushNotification($clients, $message, $title);
     }
 
+    /**
+     * @param string $additionalData
+     */
     static private function sendPushNotification($to, $message, $title, $additionalData)
     {
         // replace API

Spacing +11 added lines, -14 removed lines

@@ -25,15 +25,15 @@ 
     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();
-        self::sendPushs('New meeting scheduled', $employees->get(0)->meetings->get(0)['title'] . ' - ' . $employees->get(0)->meetings->get(0)['start_time'], $employees->get(0)->meetings->get(0)['id']);
+        } ])->get();
+        self::sendPushs('New meeting scheduled', $employees->get(0)->meetings->get(0)[ 'title' ].' - '.$employees->get(0)->meetings->get(0)[ 'start_time' ], $employees->get(0)->meetings->get(0)[ 'id' ]);
         foreach ($employees as $employee)
             self::sendEmployeeEmail($employee->email, $employee->meetings);
     }
@@ -43,7 +43,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');
         });
@@ -63,8 +63,7 @@ 
         // replace API
         //\Log::info('GCM registration id: ' . $to);
         $registrationIds = array($to);
-        $msg = array
-        (
+        $msg = array(
             'message' => $message,
             'title' => $title,
             'vibrate' => 1,
@@ -73,14 +72,12 @@ 
 
             // you can also add images, additionalData
         );
-        $fields = array
-        (
+        $fields = array(
             'registration_ids' => $registrationIds,
             'data' => $msg
         );
-        $headers = array
-        (
-            'Authorization: key=' . config('app.gcm_key'),
+        $headers = array(
+            'Authorization: key='.config('app.gcm_key'),
             'Content-Type: application/json'
         );
         $ch = curl_init();
@@ -93,7 +90,7 @@ 
         $result = curl_exec($ch);
         curl_close($ch);
         //echo $result;
-        \Log::info('GCM results: ' . $result);
+        \Log::info('GCM results: '.$result);
     }
 
     /**
@@ -102,7 +99,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/Planner.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
      */
     public function verifyEmployee(Employee $employee)
     {
-        $group = $this->groupsManaged()->whereHas('employees', function ($query) use ($employee) {
+        $group = $this->groupsManaged()->whereHas('employees', function($query) use ($employee) {
             $query->where('employees.id', $employee->id);
         })->first();
 

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

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Illuminate\Http\Request;
 
-use plunner\Http\Requests;
 use plunner\Http\Controllers\Controller;
 
 class GroupsController extends Controller

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

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
      * Store a newly created resource in storage.
      *
      * @param int $meetingId
-     * @return static
+     * @return Response
      */
     public function showImage($meetingId)
     {

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(\Illuminate\Http\Request $request, $groupId, $meetingId)
     {
-        $this->validate($request, ['file' => 'required|image']);
+        $this->validate($request, [ 'file' => 'required|image' ]);
         $group = Group::findOrFail($groupId);
         $this->authorize($group);
         $meeting = Meeting::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;
     }

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

Spacing +8 added lines, -8 removed lines

@@ -12,8 +12,8 @@ 
 {
     public function __construct()
     {
-        config(['auth.model' => Planner::class]);
-        config(['jwt.user' => Planner::class]);
+        config([ 'auth.model' => Planner::class ]);
+        config([ 'jwt.user' => Planner::class ]);
         $this->middleware('jwt.authandrefresh:mode-en');
     }
 
@@ -32,16 +32,16 @@ 
         $planner = \Auth::user();
         $groups = $planner->groupsManaged();
         if ($request->query('current'))
-            $groups->with(['meetings' => function ($query) {
-                $query->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
-                    $query->where('start_time', '=', NULL);//to be planned
+            $groups->with([ 'meetings' => function($query) {
+                $query->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
                 });
-            }]);
+            } ]);
         else
             $groups->with('meetings');
-        return $groups->get();//both planed and to be planned
+        return $groups->get(); //both planed and to be planned
     }
 
     /**

Braces +8 added lines, -5 removed lines

@@ -31,16 +31,19 @@
          */
         $planner = \Auth::user();
         $groups = $planner->groupsManaged();
-        if ($request->query('current'))
-            $groups->with(['meetings' => function ($query) {
+        if ($request->query('current')) {
+                    $groups->with(['meetings' => function ($query) {
                 $query->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
-                    $query->where('start_time', '=', NULL);//to be planned
+                    $query->where('start_time', '=', NULL);
+        }
+        //to be planned
                     //datetime to consider timezone, don't use mysql NOW()
                     $query->orWhere('start_time', '>=', new \DateTime());//planned
                 });
             }]);
-        else
-            $groups->with('meetings');
+        else {
+                    $groups->with('meetings');
+        }
         return $groups->get();//both planed and to be planned
     }
 

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

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Illuminate\Http\Request;
 
-use plunner\Http\Requests;
 use plunner\Http\Controllers\Controller;
 
 class GroupsController extends Controller

Spacing +6 added lines, -6 removed lines

@@ -11,8 +11,8 @@ 
 {
     public function __construct()
     {
-        config(['auth.model' => \plunner\Employee::class]);
-        config(['jwt.user' => \plunner\Employee::class]);
+        config([ 'auth.model' => \plunner\Employee::class ]);
+        config([ 'jwt.user' => \plunner\Employee::class ]);
         $this->middleware('jwt.authandrefresh:mode-en');
     }
 
@@ -27,10 +27,10 @@ 
         $employee = \Auth::user();
         $meetings = $employee->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();
     }
@@ -72,7 +72,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);

Braces +11 added lines, -7 removed lines

@@ -26,9 +26,11 @@ 
     {
         $employee = \Auth::user();
         $meetings = $employee->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
             });
@@ -63,9 +65,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');
     }
@@ -73,8 +76,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);
     }
 }

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
      * Store a newly created resource in storage.
      *
      * @param int $meetingId
-     * @return static
+     * @return Response
      */
     public function showImage($meetingId)
     {

app/Http/Controllers/Companies/Company/CompanyController.php

Spacing +5 added lines, -5 removed lines

@@ -10,8 +10,8 @@ 
 {
     public function __construct()
     {
-        config(['auth.model' => \plunner\Company::class]);
-        config(['jwt.user' => \plunner\Company::class]);
+        config([ 'auth.model' => \plunner\Company::class ]);
+        config([ 'jwt.user' => \plunner\Company::class ]);
         $this->middleware('jwt.authandrefresh:mode-cn');
     }
 
@@ -36,9 +36,9 @@ 
     public function update(CompanyRequest $request)
     {
         $company = \Auth::user();
-        $input = $request->only(['name', 'password']);
-        if (isset($input['password']))
-            $input['password'] = bcrypt($input['password']);
+        $input = $request->only([ 'name', 'password' ]);
+        if (isset($input[ 'password' ]))
+            $input[ 'password' ] = bcrypt($input[ 'password' ]);
         $company->update($input);
         return $company;
     }

Braces +3 added lines, -2 removed lines

@@ -37,8 +37,9 @@
     {
         $employee = \Auth::user();
         $input = $request->only(['name', 'password']);
-        if (isset($input['password']))
-            $input['password'] = bcrypt($input['password']);
+        if (isset($input['password'])) {
+                    $input['password'] = bcrypt($input['password']);
+        }
         $employee->update($input);
         return $employee;
     }