dsd-meetme / backend

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

Spacing +5 added lines, -5 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();
     }

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

Spacing +10 added lines, -10 removed lines

@@ -16,8 +16,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');
     }
 
@@ -35,7 +35,7 @@ 
 
         if ($meeting->group_id == $groupId)
             return $meeting->timeslots;
-        return Response::json(['error' => 'meeting->group_id <> groupId'], 403);
+        return Response::json([ 'error' => 'meeting->group_id <> groupId' ], 403);
     }
 
     /**
@@ -57,7 +57,7 @@ 
 
         if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId)
             return $timeslot;
-        return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403);
+        return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403);
     }
 
     /**
@@ -73,7 +73,7 @@ 
         $meeting = Meeting::findOrFail($meetingId);
         $this->authorize($meeting);
         if ($meeting->start_time != NULL)
-            return Response::json(['error' => 'the meeting is already planned'], 422);
+            return Response::json([ 'error' => 'the meeting is already planned' ], 422);
 
         $input = $request->all();
 
@@ -81,7 +81,7 @@ 
             $timeslot = $meeting->timeslots()->create($input);
             return $timeslot;
         }
-        return Response::json(['error' => 'meeting->group_id <> groupId'], 403);
+        return Response::json([ 'error' => 'meeting->group_id <> groupId' ], 403);
     }
 
     /**
@@ -97,7 +97,7 @@ 
         $meeting = Meeting::findOrFail($meetingId);
         $this->authorize($meeting);
         if ($meeting->start_time != NULL)
-            return Response::json(['error' => 'the meeting is already planned'], 422);
+            return Response::json([ 'error' => 'the meeting is already planned' ], 422);
         $timeslot = MeetingTimeslot::findOrFail($timeslotId);
         $this->authorize($timeslot);
 
@@ -107,7 +107,7 @@ 
             $timeslot->update($input);
             return $timeslot;
         }
-        return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403);
+        return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403);
     }
 
     /**
@@ -125,7 +125,7 @@ 
         $meeting = Meeting::findOrFail($meetingId);
         $this->authorize($meeting);
         if ($meeting->start_time != NULL)
-            return Response::json(['error' => 'the meeting is already planned'], 422);
+            return Response::json([ 'error' => 'the meeting is already planned' ], 422);
         $timeslot = MeetingTimeslot::findOrFail($timeslotId);
         $this->authorize($timeslot);
 
@@ -133,6 +133,6 @@ 
             $timeslot->delete();
             return $timeslot;
         }
-        return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403);
+        return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403);
     }
 }

app/Http/Controllers/Companies/Auth/AuthController.php

Spacing +10 added lines, -10 removed lines

@@ -40,7 +40,7 @@ 
      * cn = company normal
      * @var array
      */
-    protected $custom = ['mode' => 'cn'];
+    protected $custom = [ 'mode' => 'cn' ];
 
     /**
      * Create a new authentication controller instance.
@@ -48,19 +48,19 @@ 
      */
     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 ]);
     }
 
     public function postLogin(Request $request)
     {
         //remember me
-        $this->validate($request, ['remember' => 'required|boolean']);
+        $this->validate($request, [ 'remember' => 'required|boolean' ]);
         if ($request->input('remember', false)) {
-            config(['jwt.ttl' => '43200']); //30 days
-            $this->custom = array_merge($this->custom, ['remember' => 'true']);
+            config([ 'jwt.ttl' => '43200' ]); //30 days
+            $this->custom = array_merge($this->custom, [ 'remember' => 'true' ]);
         } else
-            $this->custom = array_merge($this->custom, ['remember' => 'false']);
+            $this->custom = array_merge($this->custom, [ 'remember' => 'false' ]);
         return $this->postLoginOriginal($request);
     }
 
@@ -88,9 +88,9 @@ 
     protected function create(array $data)
     {
         return Company::create([
-            'name' => $data['name'],
-            'email' => $data['email'],
-            'password' => bcrypt($data['password']),
+            'name' => $data[ 'name' ],
+            'email' => $data[ 'email' ],
+            'password' => bcrypt($data[ 'password' ]),
         ]);
     }
 

app/Http/routes.php

Spacing +39 added lines, -39 removed lines

@@ -19,41 +19,41 @@ 
  * Companies
  */
 
-Route::group(['namespace' => 'Companies', 'prefix' => 'companies'], function () {
+Route::group([ 'namespace' => 'Companies', 'prefix' => 'companies' ], function() {
 
     //\Auth
 
-    Route::group(['namespace' => 'Auth'], function () {
-        Route::group(['prefix' => 'auth'], function () {
+    Route::group([ 'namespace' => 'Auth' ], function() {
+        Route::group([ 'prefix' => 'auth' ], function() {
             // Authentication routes...
-            Route::post('login', ['as' => 'companies.auth.login', 'uses' => 'AuthController@postLogin']);
+            Route::post('login', [ 'as' => 'companies.auth.login', 'uses' => 'AuthController@postLogin' ]);
 
             // Registration routes...
-            Route::post('register', ['as' => 'companies.auth.register', 'uses' => 'AuthController@postRegister']);
+            Route::post('register', [ 'as' => 'companies.auth.register', 'uses' => 'AuthController@postRegister' ]);
 
         });
 
-        Route::group(['prefix' => 'password'], function () {
+        Route::group([ 'prefix' => 'password' ], function() {
             // Password reset link request routes...
-            Route::post('email', ['as' => 'companies.auth.email', 'uses' => 'PasswordController@postEmail']);
+            Route::post('email', [ 'as' => 'companies.auth.email', 'uses' => 'PasswordController@postEmail' ]);
 
             // Password reset routes...
-            Route::post('reset', ['as' => 'companies.auth.reset', 'uses' => 'PasswordController@postReset']);
+            Route::post('reset', [ 'as' => 'companies.auth.reset', 'uses' => 'PasswordController@postReset' ]);
         });
     });
 
-    Route::group(['namespace' => 'Employees'], function () {
-        Route::resource('employees', 'EmployeesController', ['except' => ['create', 'edit']]);
+    Route::group([ 'namespace' => 'Employees' ], function() {
+        Route::resource('employees', 'EmployeesController', [ 'except' => [ 'create', 'edit' ] ]);
     });
 
-    Route::group(['namespace' => 'Groups'], function () {
-        Route::resource('groups', 'GroupsController', ['except' => ['create', 'edit']]);
-        Route::resource('groups.employees', 'EmployeesController', ['only' => ['store', 'index', 'destroy']]);
+    Route::group([ 'namespace' => 'Groups' ], function() {
+        Route::resource('groups', 'GroupsController', [ 'except' => [ 'create', 'edit' ] ]);
+        Route::resource('groups.employees', 'EmployeesController', [ 'only' => [ 'store', 'index', 'destroy' ] ]);
     });
 
-    Route::group(['namespace' => 'Company', 'prefix' => 'company'], function () {
-        Route::get('/', ['as' => 'companies.company.index', 'uses' => 'CompanyController@index']);
-        Route::put('/', ['as' => 'companies.company.update', 'uses' => 'CompanyController@update']);
+    Route::group([ 'namespace' => 'Company', 'prefix' => 'company' ], function() {
+        Route::get('/', [ 'as' => 'companies.company.index', 'uses' => 'CompanyController@index' ]);
+        Route::put('/', [ 'as' => 'companies.company.update', 'uses' => 'CompanyController@update' ]);
     });
 });
 
@@ -61,52 +61,52 @@ 
 /**
  * Employees
  */
-Route::group(['namespace' => 'Employees', 'prefix' => 'employees'], function () {
+Route::group([ 'namespace' => 'Employees', 'prefix' => 'employees' ], function() {
 
     //\Auth
-    Route::group(['namespace' => 'Auth'], function () {
-        Route::group(['prefix' => 'auth'], function () {
+    Route::group([ 'namespace' => 'Auth' ], function() {
+        Route::group([ 'prefix' => 'auth' ], function() {
             // Authentication routes...
-            Route::post('login', ['as' => 'companies.auth.login', 'uses' => 'AuthController@postLogin']);
+            Route::post('login', [ 'as' => 'companies.auth.login', 'uses' => 'AuthController@postLogin' ]);
 
             // Registration routes...
             //Route::post('register', ['as' => 'companies.auth.register', 'uses'=>'AuthController@postRegister']); //the registration is managed by the company
 
         });
 
-        Route::group(['prefix' => 'password'], function () {
+        Route::group([ 'prefix' => 'password' ], function() {
             // Password reset link request routes...
-            Route::post('email', ['as' => 'companies.auth.email', 'uses' => 'PasswordController@postEmail']);
+            Route::post('email', [ 'as' => 'companies.auth.email', 'uses' => 'PasswordController@postEmail' ]);
 
             // Password reset routes...
-            Route::post('reset', ['as' => 'companies.auth.reset', 'uses' => 'PasswordController@postReset']);
+            Route::post('reset', [ 'as' => 'companies.auth.reset', 'uses' => 'PasswordController@postReset' ]);
         });
     });
 
-    Route::group(['namespace' => 'Calendars'], function () {
-        Route::resource('calendars', 'CalendarsController', ['except' => ['create', 'edit']]);
-        Route::post('calendars/caldav', ['as' => 'employees.calendars.caldav', 'uses' => 'CalendarsController@storeCaldav']);
-        Route::post('calendars/calendars', ['as' => 'employees.calendars.calendars', 'uses' => 'CalendarsController@getCalendars']);
-        Route::resource('calendars.timeslots', 'TimeslotsController', ['except' => ['create', 'edit']]);
+    Route::group([ 'namespace' => 'Calendars' ], function() {
+        Route::resource('calendars', 'CalendarsController', [ 'except' => [ 'create', 'edit' ] ]);
+        Route::post('calendars/caldav', [ 'as' => 'employees.calendars.caldav', 'uses' => 'CalendarsController@storeCaldav' ]);
+        Route::post('calendars/calendars', [ 'as' => 'employees.calendars.calendars', 'uses' => 'CalendarsController@getCalendars' ]);
+        Route::resource('calendars.timeslots', 'TimeslotsController', [ 'except' => [ 'create', 'edit' ] ]);
     });
 
-    Route::group(['namespace' => 'Planners', 'prefix' => 'planners'], function () {
-        Route::resource('groups', 'GroupsController', ['only' => ['index', 'show']]);
-        Route::resource('groups.meetings', 'MeetingsController', ['except' => ['create', 'edit']]);
-        Route::resource('groups.meetings.timeslots', 'MeetingTimeslotsController', ['except' => ['create', 'edit']]);
+    Route::group([ 'namespace' => 'Planners', 'prefix' => 'planners' ], function() {
+        Route::resource('groups', 'GroupsController', [ 'only' => [ 'index', 'show' ] ]);
+        Route::resource('groups.meetings', 'MeetingsController', [ 'except' => [ 'create', 'edit' ] ]);
+        Route::resource('groups.meetings.timeslots', 'MeetingTimeslotsController', [ 'except' => [ 'create', 'edit' ] ]);
     });
 
-    Route::group(['namespace' => 'Groups'], function () {
-        Route::resource('groups', 'GroupsController', ['only' => ['index', 'show']]);
+    Route::group([ 'namespace' => 'Groups' ], function() {
+        Route::resource('groups', 'GroupsController', [ 'only' => [ 'index', 'show' ] ]);
     });
 
 
-    Route::group(['namespace' => 'Meetings'], function () {
-        Route::resource('meetings', 'MeetingsController', ['only' => ['index', 'show']]);
+    Route::group([ 'namespace' => 'Meetings' ], function() {
+        Route::resource('meetings', 'MeetingsController', [ 'only' => [ 'index', 'show' ] ]);
     });
 
-    Route::group(['namespace' => 'Employee', 'prefix' => 'employee'], function () {
-        Route::get('/', ['as' => 'employees.employee.index', 'uses' => 'EmployeeController@index']);
-        Route::put('/', ['as' => 'employees.employee.update', 'uses' => 'EmployeeController@update']);
+    Route::group([ 'namespace' => 'Employee', 'prefix' => 'employee' ], function() {
+        Route::get('/', [ 'as' => 'employees.employee.index', 'uses' => 'EmployeeController@index' ]);
+        Route::put('/', [ 'as' => 'employees.employee.update', 'uses' => 'EmployeeController@update' ]);
     });
 });
\ No newline at end of file

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

app/Http/Controllers/Employees/Employee/EmployeeController.php

Spacing +5 added lines, -5 removed lines

@@ -10,8 +10,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');
     }
 
@@ -36,9 +36,9 @@ 
     public function update(EmployeeRequest $request)
     {
         $employee = \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' ]);
         $employee->update($input);
         return $employee;
     }

app/Console/Commands/Optimise/OptimiseException.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
      * @param Exception $previous
      * @param bool $empty
      */
-    public function __construct($message =  "", $code = 0, Exception $previous = null, $empty = false)
+    public function __construct($message = "", $code = 0, Exception $previous = null, $empty = false)
     {
         parent::__construct($message, $code, $previous);
         $this->empty = $empty;

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;