Completed
Push — master ( 5a3752...2e0b19 )
by claudio
33:21
created
app/Listeners/Caldav/ErrorListener.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
     public function handle(ErrorEvent $event)
27 27
     {
28 28
         //
29
-        \Log::info('problems during caldav (calendar id = ' . $event->getCalendar()->calendar_id . ') sync: ' . $event->getError());
29
+        \Log::info('problems during caldav (calendar id = '.$event->getCalendar()->calendar_id.') sync: '.$event->getError());
30 30
         $calendar = $event->getCalendar();
31 31
         //$calendar = $event->getCalendar()->fresh();
32 32
         $calendar->sync_errors = $event->getError();
Please login to merge, or discard this patch.
app/Listeners/Optimise/OkListener.php 2 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,8 +31,9 @@
 block discarded – undo
31 31
         self::sendCompanyEmail($company->email);
32 32
         //send emails to employees
33 33
         $employees = $company->employees()->with('meetings')->get();
34
-        foreach ($employees as $employee)
35
-            self::sendEmployeeEmail($employee->email, $employee->meetings);
34
+        foreach ($employees as $employee) {
35
+                    self::sendEmployeeEmail($employee->email, $employee->meetings);
36
+        }
36 37
     }
37 38
 
38 39
     /**
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -25,14 +25,14 @@  discard block
 block discarded – undo
25 25
     public function handle(OkEvent $event)
26 26
     {
27 27
         //
28
-        \Log::info('Meeting correctly optimised (company id = ' . $event->getCompany()->id . ')');
28
+        \Log::info('Meeting correctly optimised (company id = '.$event->getCompany()->id.')');
29 29
         $company = $event->getCompany()->fresh();
30 30
         //send email to company
31 31
         self::sendCompanyEmail($company->email);
32 32
         //send emails to employees
33
-        $employees = $company->employees()->with(['meetings'=>function($query){
33
+        $employees = $company->employees()->with([ 'meetings'=>function($query) {
34 34
             $query->where('start_time', '>=', new \DateTime());
35
-        }])->get();
35
+        } ])->get();
36 36
         foreach ($employees as $employee)
37 37
             self::sendEmployeeEmail($employee->email, $employee->meetings);
38 38
     }
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
      */
43 43
     static private function sendCompanyEmail($email)
44 44
     {
45
-        \Mail::queue('emails.optimise.ok.company', [], function ($message) use ($email) {
45
+        \Mail::queue('emails.optimise.ok.company', [ ], function($message) use ($email) {
46 46
             $message->from(config('mail.from.address'), config('mail.from.name'));
47 47
             $message->to($email)->subject('Meetings optimised');
48 48
         });
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
      */
55 55
     static private function sendEmployeeEmail($email, $meetings)
56 56
     {
57
-        \Mail::queue('emails.optimise.ok.employee', ['meetings' => $meetings], function ($message) use ($email) {
57
+        \Mail::queue('emails.optimise.ok.employee', [ 'meetings' => $meetings ], function($message) use ($email) {
58 58
             $message->from(config('mail.from.address'), config('mail.from.name'));
59 59
             $message->to($email)->subject('Meetings of next week');
60 60
         });
Please login to merge, or discard this patch.
app/Planner.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
      */
57 57
     public function verifyEmployee(Employee $employee)
58 58
     {
59
-        $group = $this->groupsManaged()->whereHas('employees', function ($query) use ($employee) {
59
+        $group = $this->groupsManaged()->whereHas('employees', function($query) use ($employee) {
60 60
             $query->where('employees.id', $employee->id);
61 61
         })->first();
62 62
 
Please login to merge, or discard this patch.
app/Http/Controllers/Companies/Auth/AuthController.php 2 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -79,8 +79,9 @@
 block discarded – undo
79 79
         if ($request->input('remember', false)) {
80 80
             config(['jwt.ttl' => '43200']); //30 days
81 81
             $this->custom = array_merge($this->custom, ['remember' => 'true']);
82
-        } else
83
-            $this->custom = array_merge($this->custom, ['remember' => 'false']);
82
+        } else {
83
+                    $this->custom = array_merge($this->custom, ['remember' => 'false']);
84
+        }
84 85
 
85 86
         return $this->postLoginOriginal($request);
86 87
     }
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
      * cn = company normal
41 41
      * @var array
42 42
      */
43
-    protected $custom = ['mode' => 'cn'];
43
+    protected $custom = [ 'mode' => 'cn' ];
44 44
 
45 45
     /**
46 46
      * Create a new authentication controller instance.
@@ -48,19 +48,19 @@  discard block
 block discarded – undo
48 48
      */
49 49
     public function __construct()
50 50
     {
51
-        config(['auth.model' => \plunner\Company::class]);
52
-        config(['jwt.user' => \plunner\Company::class]);
51
+        config([ 'auth.model' => \plunner\Company::class ]);
52
+        config([ 'jwt.user' => \plunner\Company::class ]);
53 53
     }
54 54
 
55 55
     public function postLogin(Request $request)
56 56
     {
57 57
         //remember me
58
-        $this->validate($request, ['remember' => 'required|boolean']);
58
+        $this->validate($request, [ 'remember' => 'required|boolean' ]);
59 59
         if ($request->input('remember', false)) {
60
-            config(['jwt.ttl' => '43200']); //30 days
61
-            $this->custom = array_merge($this->custom, ['remember' => 'true']);
60
+            config([ 'jwt.ttl' => '43200' ]); //30 days
61
+            $this->custom = array_merge($this->custom, [ 'remember' => 'true' ]);
62 62
         } else
63
-            $this->custom = array_merge($this->custom, ['remember' => 'false']);
63
+            $this->custom = array_merge($this->custom, [ 'remember' => 'false' ]);
64 64
         return $this->postLoginOriginal($request);
65 65
     }
66 66
 
@@ -88,9 +88,9 @@  discard block
 block discarded – undo
88 88
     protected function create(array $data)
89 89
     {
90 90
         return Company::create([
91
-            'name' => $data['name'],
92
-            'email' => $data['email'],
93
-            'password' => bcrypt($data['password']),
91
+            'name' => $data[ 'name' ],
92
+            'email' => $data[ 'email' ],
93
+            'password' => bcrypt($data[ 'password' ]),
94 94
         ]);
95 95
     }
96 96
 
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Planners/GroupsController.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
12 12
 {
13 13
     public function __construct()
14 14
     {
15
-        config(['auth.model' => Planner::class]);
16
-        config(['jwt.user' => Planner::class]);
15
+        config([ 'auth.model' => Planner::class ]);
16
+        config([ 'jwt.user' => Planner::class ]);
17 17
         $this->middleware('jwt.authandrefresh:mode-en');
18 18
     }
19 19
 
@@ -32,16 +32,16 @@  discard block
 block discarded – undo
32 32
         $planner = \Auth::user();
33 33
         $groups = $planner->groupsManaged();
34 34
         if ($request->query('current'))
35
-            $groups->with(['meetings' => function ($query) {
36
-                $query->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
37
-                    $query->where('start_time', '=', NULL);//to be planned
35
+            $groups->with([ 'meetings' => function($query) {
36
+                $query->where(function($query) { //parenthesis for conditions ...(C1 OR C2)...
37
+                    $query->where('start_time', '=', NULL); //to be planned
38 38
                     //datetime to consider timezone, don't use mysql NOW()
39
-                    $query->orWhere('start_time', '>=', new \DateTime());//planned
39
+                    $query->orWhere('start_time', '>=', new \DateTime()); //planned
40 40
                 });
41
-            }]);
41
+            } ]);
42 42
         else
43 43
             $groups->with('meetings');
44
-        return $groups->get();//both planed and to be planned
44
+        return $groups->get(); //both planed and to be planned
45 45
     }
46 46
 
47 47
     /**
Please login to merge, or discard this patch.
Braces   +8 added lines, -5 removed lines patch added patch discarded remove patch
@@ -31,16 +31,19 @@
 block discarded – undo
31 31
          */
32 32
         $planner = \Auth::user();
33 33
         $groups = $planner->groupsManaged();
34
-        if ($request->query('current'))
35
-            $groups->with(['meetings' => function ($query) {
34
+        if ($request->query('current')) {
35
+                    $groups->with(['meetings' => function ($query) {
36 36
                 $query->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
37
-                    $query->where('start_time', '=', NULL);//to be planned
37
+                    $query->where('start_time', '=', NULL);
38
+        }
39
+        //to be planned
38 40
                     //datetime to consider timezone, don't use mysql NOW()
39 41
                     $query->orWhere('start_time', '>=', new \DateTime());//planned
40 42
                 });
41 43
             }]);
42
-        else
43
-            $groups->with('meetings');
44
+        else {
45
+                    $groups->with('meetings');
46
+        }
44 47
         return $groups->get();//both planed and to be planned
45 48
     }
46 49
 
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Meetings/MeetingsController.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -11,8 +11,8 @@  discard block
 block discarded – undo
11 11
 {
12 12
     public function __construct()
13 13
     {
14
-        config(['auth.model' => \plunner\Employee::class]);
15
-        config(['jwt.user' => \plunner\Employee::class]);
14
+        config([ 'auth.model' => \plunner\Employee::class ]);
15
+        config([ 'jwt.user' => \plunner\Employee::class ]);
16 16
         $this->middleware('jwt.authandrefresh:mode-en');
17 17
     }
18 18
 
@@ -27,10 +27,10 @@  discard block
 block discarded – undo
27 27
         $employee = \Auth::user();
28 28
         $meetings = $employee->meetings();
29 29
         if ($request->query('current'))
30
-            $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
31
-                $query->where('start_time', '=', NULL);//to be planned
30
+            $meetings->where(function($query) { //parenthesis for conditions ...(C1 OR C2)...
31
+                $query->where('start_time', '=', NULL); //to be planned
32 32
                 //datetime to consider timezone, don't use mysql NOW()
33
-                $query->orWhere('start_time', '>=', new \DateTime());//planned
33
+                $query->orWhere('start_time', '>=', new \DateTime()); //planned
34 34
             });
35 35
         return $meetings->get();
36 36
     }
Please login to merge, or discard this patch.
Braces   +5 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,9 +31,11 @@
 block discarded – undo
31 31
         $group = Group::findOrFail($groupId);
32 32
         $this->authorize($group);
33 33
         $meetings = $group->meetings();
34
-        if ($request->query('current'))
35
-            $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
36
-                $query->where('start_time', '=', NULL);//to be planned
34
+        if ($request->query('current')) {
35
+                    $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
36
+                $query->where('start_time', '=', NULL);
37
+        }
38
+        //to be planned
37 39
                 //datetime to consider timezone, don't use mysql NOW()
38 40
                 $query->orWhere('start_time', '>=', new \DateTime());//planned
39 41
             });
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Planners/MeetingTimeslotsController.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -16,8 +16,8 @@  discard block
 block discarded – undo
16 16
 {
17 17
     public function __construct()
18 18
     {
19
-        config(['auth.model' => \plunner\Planner::class]);
20
-        config(['jwt.user' => \plunner\Planner::class]);
19
+        config([ 'auth.model' => \plunner\Planner::class ]);
20
+        config([ 'jwt.user' => \plunner\Planner::class ]);
21 21
         $this->middleware('jwt.authandrefresh:mode-en');
22 22
     }
23 23
 
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 
36 36
         if ($meeting->group_id == $groupId)
37 37
             return $meeting->timeslots;
38
-        return Response::json(['error' => 'meeting->group_id <> groupId'], 403);
38
+        return Response::json([ 'error' => 'meeting->group_id <> groupId' ], 403);
39 39
     }
40 40
 
41 41
     /**
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 
58 58
         if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId)
59 59
             return $timeslot;
60
-        return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403);
60
+        return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403);
61 61
     }
62 62
 
63 63
     /**
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
         $meeting = Meeting::findOrFail($meetingId);
74 74
         $this->authorize($meeting);
75 75
         if ($meeting->start_time != NULL)
76
-            return Response::json(['error' => 'the meeting is already planned'], 422);
76
+            return Response::json([ 'error' => 'the meeting is already planned' ], 422);
77 77
 
78 78
         $input = $request->all();
79 79
 
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
             $timeslot = $meeting->timeslots()->create($input);
82 82
             return $timeslot;
83 83
         }
84
-        return Response::json(['error' => 'meeting->group_id <> groupId'], 403);
84
+        return Response::json([ 'error' => 'meeting->group_id <> groupId' ], 403);
85 85
     }
86 86
 
87 87
     /**
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
         $meeting = Meeting::findOrFail($meetingId);
98 98
         $this->authorize($meeting);
99 99
         if ($meeting->start_time != NULL)
100
-            return Response::json(['error' => 'the meeting is already planned'], 422);
100
+            return Response::json([ 'error' => 'the meeting is already planned' ], 422);
101 101
         $timeslot = MeetingTimeslot::findOrFail($timeslotId);
102 102
         $this->authorize($timeslot);
103 103
 
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
             $timeslot->update($input);
108 108
             return $timeslot;
109 109
         }
110
-        return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403);
110
+        return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403);
111 111
     }
112 112
 
113 113
     /**
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
         $meeting = Meeting::findOrFail($meetingId);
126 126
         $this->authorize($meeting);
127 127
         if ($meeting->start_time != NULL)
128
-            return Response::json(['error' => 'the meeting is already planned'], 422);
128
+            return Response::json([ 'error' => 'the meeting is already planned' ], 422);
129 129
         $timeslot = MeetingTimeslot::findOrFail($timeslotId);
130 130
         $this->authorize($timeslot);
131 131
 
@@ -133,6 +133,6 @@  discard block
 block discarded – undo
133 133
             $timeslot->delete();
134 134
             return $timeslot;
135 135
         }
136
-        return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403);
136
+        return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403);
137 137
     }
138 138
 }
Please login to merge, or discard this patch.
Braces   +15 added lines, -10 removed lines patch added patch discarded remove patch
@@ -33,8 +33,9 @@  discard block
 block discarded – undo
33 33
         $meeting = Meeting::findOrFail($meetingId);
34 34
         $this->authorize($meeting);
35 35
 
36
-        if ($meeting->group_id == $groupId)
37
-            return $meeting->timeslots;
36
+        if ($meeting->group_id == $groupId) {
37
+                    return $meeting->timeslots;
38
+        }
38 39
         return Response::json(['error' => 'meeting->group_id <> groupId'], 403);
39 40
     }
40 41
 
@@ -55,8 +56,9 @@  discard block
 block discarded – undo
55 56
         $timeslot = MeetingTimeslot::findOrFail($timeslotId);
56 57
         $this->authorize($timeslot);
57 58
 
58
-        if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId)
59
-            return $timeslot;
59
+        if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId) {
60
+                    return $timeslot;
61
+        }
60 62
         return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403);
61 63
     }
62 64
 
@@ -72,8 +74,9 @@  discard block
 block discarded – undo
72 74
         $this->authorize($group);
73 75
         $meeting = Meeting::findOrFail($meetingId);
74 76
         $this->authorize($meeting);
75
-        if ($meeting->start_time != NULL)
76
-            return Response::json(['error' => 'the meeting is already planned'], 422);
77
+        if ($meeting->start_time != NULL) {
78
+                    return Response::json(['error' => 'the meeting is already planned'], 422);
79
+        }
77 80
 
78 81
         $input = $request->all();
79 82
 
@@ -96,8 +99,9 @@  discard block
 block discarded – undo
96 99
         $this->authorize($group);
97 100
         $meeting = Meeting::findOrFail($meetingId);
98 101
         $this->authorize($meeting);
99
-        if ($meeting->start_time != NULL)
100
-            return Response::json(['error' => 'the meeting is already planned'], 422);
102
+        if ($meeting->start_time != NULL) {
103
+                    return Response::json(['error' => 'the meeting is already planned'], 422);
104
+        }
101 105
         $timeslot = MeetingTimeslot::findOrFail($timeslotId);
102 106
         $this->authorize($timeslot);
103 107
 
@@ -124,8 +128,9 @@  discard block
 block discarded – undo
124 128
         $this->authorize($group);
125 129
         $meeting = Meeting::findOrFail($meetingId);
126 130
         $this->authorize($meeting);
127
-        if ($meeting->start_time != NULL)
128
-            return Response::json(['error' => 'the meeting is already planned'], 422);
131
+        if ($meeting->start_time != NULL) {
132
+                    return Response::json(['error' => 'the meeting is already planned'], 422);
133
+        }
129 134
         $timeslot = MeetingTimeslot::findOrFail($timeslotId);
130 135
         $this->authorize($timeslot);
131 136
 
Please login to merge, or discard this patch.
app/Http/routes.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -19,41 +19,41 @@  discard block
 block discarded – undo
19 19
  * Companies
20 20
  */
21 21
 
22
-Route::group(['namespace' => 'Companies', 'prefix' => 'companies'], function () {
22
+Route::group([ 'namespace' => 'Companies', 'prefix' => 'companies' ], function() {
23 23
 
24 24
     //\Auth
25 25
 
26
-    Route::group(['namespace' => 'Auth'], function () {
27
-        Route::group(['prefix' => 'auth'], function () {
26
+    Route::group([ 'namespace' => 'Auth' ], function() {
27
+        Route::group([ 'prefix' => 'auth' ], function() {
28 28
             // Authentication routes...
29
-            Route::post('login', ['as' => 'companies.auth.login', 'uses' => 'AuthController@postLogin']);
29
+            Route::post('login', [ 'as' => 'companies.auth.login', 'uses' => 'AuthController@postLogin' ]);
30 30
 
31 31
             // Registration routes...
32
-            Route::post('register', ['as' => 'companies.auth.register', 'uses' => 'AuthController@postRegister']);
32
+            Route::post('register', [ 'as' => 'companies.auth.register', 'uses' => 'AuthController@postRegister' ]);
33 33
 
34 34
         });
35 35
 
36
-        Route::group(['prefix' => 'password'], function () {
36
+        Route::group([ 'prefix' => 'password' ], function() {
37 37
             // Password reset link request routes...
38
-            Route::post('email', ['as' => 'companies.auth.email', 'uses' => 'PasswordController@postEmail']);
38
+            Route::post('email', [ 'as' => 'companies.auth.email', 'uses' => 'PasswordController@postEmail' ]);
39 39
 
40 40
             // Password reset routes...
41
-            Route::post('reset', ['as' => 'companies.auth.reset', 'uses' => 'PasswordController@postReset']);
41
+            Route::post('reset', [ 'as' => 'companies.auth.reset', 'uses' => 'PasswordController@postReset' ]);
42 42
         });
43 43
     });
44 44
 
45
-    Route::group(['namespace' => 'Employees'], function () {
46
-        Route::resource('employees', 'EmployeesController', ['except' => ['create', 'edit']]);
45
+    Route::group([ 'namespace' => 'Employees' ], function() {
46
+        Route::resource('employees', 'EmployeesController', [ 'except' => [ 'create', 'edit' ] ]);
47 47
     });
48 48
 
49
-    Route::group(['namespace' => 'Groups'], function () {
50
-        Route::resource('groups', 'GroupsController', ['except' => ['create', 'edit']]);
51
-        Route::resource('groups.employees', 'EmployeesController', ['only' => ['store', 'index', 'destroy']]);
49
+    Route::group([ 'namespace' => 'Groups' ], function() {
50
+        Route::resource('groups', 'GroupsController', [ 'except' => [ 'create', 'edit' ] ]);
51
+        Route::resource('groups.employees', 'EmployeesController', [ 'only' => [ 'store', 'index', 'destroy' ] ]);
52 52
     });
53 53
 
54
-    Route::group(['namespace' => 'Company', 'prefix' => 'company'], function () {
55
-        Route::get('/', ['as' => 'companies.company.index', 'uses' => 'CompanyController@index']);
56
-        Route::put('/', ['as' => 'companies.company.update', 'uses' => 'CompanyController@update']);
54
+    Route::group([ 'namespace' => 'Company', 'prefix' => 'company' ], function() {
55
+        Route::get('/', [ 'as' => 'companies.company.index', 'uses' => 'CompanyController@index' ]);
56
+        Route::put('/', [ 'as' => 'companies.company.update', 'uses' => 'CompanyController@update' ]);
57 57
     });
58 58
 });
59 59
 
@@ -61,52 +61,52 @@  discard block
 block discarded – undo
61 61
 /**
62 62
  * Employees
63 63
  */
64
-Route::group(['namespace' => 'Employees', 'prefix' => 'employees'], function () {
64
+Route::group([ 'namespace' => 'Employees', 'prefix' => 'employees' ], function() {
65 65
 
66 66
     //\Auth
67
-    Route::group(['namespace' => 'Auth'], function () {
68
-        Route::group(['prefix' => 'auth'], function () {
67
+    Route::group([ 'namespace' => 'Auth' ], function() {
68
+        Route::group([ 'prefix' => 'auth' ], function() {
69 69
             // Authentication routes...
70
-            Route::post('login', ['as' => 'companies.auth.login', 'uses' => 'AuthController@postLogin']);
70
+            Route::post('login', [ 'as' => 'companies.auth.login', 'uses' => 'AuthController@postLogin' ]);
71 71
 
72 72
             // Registration routes...
73 73
             //Route::post('register', ['as' => 'companies.auth.register', 'uses'=>'AuthController@postRegister']); //the registration is managed by the company
74 74
 
75 75
         });
76 76
 
77
-        Route::group(['prefix' => 'password'], function () {
77
+        Route::group([ 'prefix' => 'password' ], function() {
78 78
             // Password reset link request routes...
79
-            Route::post('email', ['as' => 'companies.auth.email', 'uses' => 'PasswordController@postEmail']);
79
+            Route::post('email', [ 'as' => 'companies.auth.email', 'uses' => 'PasswordController@postEmail' ]);
80 80
 
81 81
             // Password reset routes...
82
-            Route::post('reset', ['as' => 'companies.auth.reset', 'uses' => 'PasswordController@postReset']);
82
+            Route::post('reset', [ 'as' => 'companies.auth.reset', 'uses' => 'PasswordController@postReset' ]);
83 83
         });
84 84
     });
85 85
 
86
-    Route::group(['namespace' => 'Calendars'], function () {
87
-        Route::resource('calendars', 'CalendarsController', ['except' => ['create', 'edit']]);
88
-        Route::post('calendars/caldav', ['as' => 'employees.calendars.caldav', 'uses' => 'CalendarsController@storeCaldav']);
89
-        Route::post('calendars/calendars', ['as' => 'employees.calendars.calendars', 'uses' => 'CalendarsController@getCalendars']);
90
-        Route::resource('calendars.timeslots', 'TimeslotsController', ['except' => ['create', 'edit']]);
86
+    Route::group([ 'namespace' => 'Calendars' ], function() {
87
+        Route::resource('calendars', 'CalendarsController', [ 'except' => [ 'create', 'edit' ] ]);
88
+        Route::post('calendars/caldav', [ 'as' => 'employees.calendars.caldav', 'uses' => 'CalendarsController@storeCaldav' ]);
89
+        Route::post('calendars/calendars', [ 'as' => 'employees.calendars.calendars', 'uses' => 'CalendarsController@getCalendars' ]);
90
+        Route::resource('calendars.timeslots', 'TimeslotsController', [ 'except' => [ 'create', 'edit' ] ]);
91 91
     });
92 92
 
93
-    Route::group(['namespace' => 'Planners', 'prefix' => 'planners'], function () {
94
-        Route::resource('groups', 'GroupsController', ['only' => ['index', 'show']]);
95
-        Route::resource('groups.meetings', 'MeetingsController', ['except' => ['create', 'edit']]);
96
-        Route::resource('groups.meetings.timeslots', 'MeetingTimeslotsController', ['except' => ['create', 'edit']]);
93
+    Route::group([ 'namespace' => 'Planners', 'prefix' => 'planners' ], function() {
94
+        Route::resource('groups', 'GroupsController', [ 'only' => [ 'index', 'show' ] ]);
95
+        Route::resource('groups.meetings', 'MeetingsController', [ 'except' => [ 'create', 'edit' ] ]);
96
+        Route::resource('groups.meetings.timeslots', 'MeetingTimeslotsController', [ 'except' => [ 'create', 'edit' ] ]);
97 97
     });
98 98
 
99
-    Route::group(['namespace' => 'Groups'], function () {
100
-        Route::resource('groups', 'GroupsController', ['only' => ['index', 'show']]);
99
+    Route::group([ 'namespace' => 'Groups' ], function() {
100
+        Route::resource('groups', 'GroupsController', [ 'only' => [ 'index', 'show' ] ]);
101 101
     });
102 102
 
103 103
 
104
-    Route::group(['namespace' => 'Meetings'], function () {
105
-        Route::resource('meetings', 'MeetingsController', ['only' => ['index', 'show']]);
104
+    Route::group([ 'namespace' => 'Meetings' ], function() {
105
+        Route::resource('meetings', 'MeetingsController', [ 'only' => [ 'index', 'show' ] ]);
106 106
     });
107 107
 
108
-    Route::group(['namespace' => 'Employee', 'prefix' => 'employee'], function () {
109
-        Route::get('/', ['as' => 'employees.employee.index', 'uses' => 'EmployeeController@index']);
110
-        Route::put('/', ['as' => 'employees.employee.update', 'uses' => 'EmployeeController@update']);
108
+    Route::group([ 'namespace' => 'Employee', 'prefix' => 'employee' ], function() {
109
+        Route::get('/', [ 'as' => 'employees.employee.index', 'uses' => 'EmployeeController@index' ]);
110
+        Route::put('/', [ 'as' => 'employees.employee.update', 'uses' => 'EmployeeController@update' ]);
111 111
     });
112 112
 });
113 113
\ No newline at end of file
Please login to merge, or discard this patch.
app/Http/Controllers/Companies/Company/CompanyController.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@  discard block
 block discarded – undo
10 10
 {
11 11
     public function __construct()
12 12
     {
13
-        config(['auth.model' => \plunner\Company::class]);
14
-        config(['jwt.user' => \plunner\Company::class]);
13
+        config([ 'auth.model' => \plunner\Company::class ]);
14
+        config([ 'jwt.user' => \plunner\Company::class ]);
15 15
         $this->middleware('jwt.authandrefresh:mode-cn');
16 16
     }
17 17
 
@@ -36,9 +36,9 @@  discard block
 block discarded – undo
36 36
     public function update(CompanyRequest $request)
37 37
     {
38 38
         $company = \Auth::user();
39
-        $input = $request->only(['name', 'password']);
40
-        if (isset($input['password']))
41
-            $input['password'] = bcrypt($input['password']);
39
+        $input = $request->only([ 'name', 'password' ]);
40
+        if (isset($input[ 'password' ]))
41
+            $input[ 'password' ] = bcrypt($input[ 'password' ]);
42 42
         $company->update($input);
43 43
         return $company;
44 44
     }
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,8 +37,9 @@
 block discarded – undo
37 37
     {
38 38
         $employee = \Auth::user();
39 39
         $input = $request->only(['name', 'password']);
40
-        if (isset($input['password']))
41
-            $input['password'] = bcrypt($input['password']);
40
+        if (isset($input['password'])) {
41
+                    $input['password'] = bcrypt($input['password']);
42
+        }
42 43
         $employee->update($input);
43 44
         return $employee;
44 45
     }
Please login to merge, or discard this patch.