Completed
Push — master ( a0021a...b62e87 )
by claudio
14:16 queued 08:46
created
app/Console/Commands/SyncCaldav/Sync.php 2 patches
Braces   +21 added lines, -16 removed lines patch added patch discarded remove patch
@@ -90,10 +90,11 @@  discard block
 block discarded – undo
90 90
 
91 91
         //insert new timeslots
92 92
         foreach ($events as $event) {
93
-            if (!($event = $this->parseEvent($event)))
94
-                \Event::fire(new ErrorEvent($this->calendar, 'problem during the parsing an event'));
95
-            else
96
-                $calendarMain->timeslots()->create($event);
93
+            if (!($event = $this->parseEvent($event))) {
94
+                            \Event::fire(new ErrorEvent($this->calendar, 'problem during the parsing an event'));
95
+            } else {
96
+                            $calendarMain->timeslots()->create($event);
97
+            }
97 98
         }
98 99
         \Event::fire(new OkEvent($this->calendar));
99 100
     }
@@ -110,8 +111,9 @@  discard block
 block discarded – undo
110 111
         $caldavClient = new SimpleCaldavAdapter();
111 112
         $caldavClient->connect($this->calendar->url, $this->calendar->username, \Crypt::decrypt($this->calendar->password));
112 113
         $calendars = $caldavClient->findCalendars();
113
-        if(!isset($calendars[$this->calendar->calendar_name]))
114
-            throw new CaldavException("calendar inserted doesn't exist");
114
+        if(!isset($calendars[$this->calendar->calendar_name])) {
115
+                    throw new CaldavException("calendar inserted doesn't exist");
116
+        }
115 117
         $caldavClient->setCalendar($calendars[$this->calendar->calendar_name]);//TODO error if the calendar name is wrong
116 118
         /**
117 119
          * 26 hours before to avoid tiemezone problems and dst problems
@@ -128,17 +130,20 @@  discard block
 block discarded – undo
128 130
     {
129 131
         $pattern = "/^((DTSTART;)|(DTEND;))(.*)\$/m";
130 132
         if (preg_match_all($pattern, $event->getData(), $matches)) {
131
-            if (!isset($matches[4]) || count($matches[4]) != 2)
132
-                return null;
133
+            if (!isset($matches[4]) || count($matches[4]) != 2) {
134
+                            return null;
135
+            }
133 136
             $ret = [];
134
-            if ($tmp = $this->parseDate($matches[4][0]))
135
-                $ret['time_start'] = $tmp;
136
-            else
137
-                return null;
138
-            if ($tmp = $this->parseDate($matches[4][1]))
139
-                $ret['time_end'] = $tmp;
140
-            else
141
-                return null;
137
+            if ($tmp = $this->parseDate($matches[4][0])) {
138
+                            $ret['time_start'] = $tmp;
139
+            } else {
140
+                            return null;
141
+            }
142
+            if ($tmp = $this->parseDate($matches[4][1])) {
143
+                            $ret['time_end'] = $tmp;
144
+            } else {
145
+                            return null;
146
+            }
142 147
             return $ret;
143 148
         }
144 149
         return null;
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -110,9 +110,9 @@  discard block
 block discarded – undo
110 110
         $caldavClient = new SimpleCaldavAdapter();
111 111
         $caldavClient->connect($this->calendar->url, $this->calendar->username, \Crypt::decrypt($this->calendar->password));
112 112
         $calendars = $caldavClient->findCalendars();
113
-        if(!isset($calendars[$this->calendar->calendar_name]))
113
+        if (!isset($calendars[ $this->calendar->calendar_name ]))
114 114
             throw new CaldavException("calendar inserted doesn't exist");
115
-        $caldavClient->setCalendar($calendars[$this->calendar->calendar_name]);
115
+        $caldavClient->setCalendar($calendars[ $this->calendar->calendar_name ]);
116 116
         /**
117 117
          * 26 hours before to avoid tiemezone problems and dst problems
118 118
          * 30 days after
@@ -128,15 +128,15 @@  discard block
 block discarded – undo
128 128
     {
129 129
         $pattern = "/^((DTSTART;)|(DTEND;))(.*)\$/m";
130 130
         if (preg_match_all($pattern, $event->getData(), $matches)) {
131
-            if (!isset($matches[4]) || count($matches[4]) != 2)
131
+            if (!isset($matches[ 4 ]) || count($matches[ 4 ]) != 2)
132 132
                 return null;
133
-            $ret = [];
134
-            if ($tmp = $this->parseDate($matches[4][0]))
135
-                $ret['time_start'] = $tmp;
133
+            $ret = [ ];
134
+            if ($tmp = $this->parseDate($matches[ 4 ][ 0 ]))
135
+                $ret[ 'time_start' ] = $tmp;
136 136
             else
137 137
                 return null;
138
-            if ($tmp = $this->parseDate($matches[4][1]))
139
-                $ret['time_end'] = $tmp;
138
+            if ($tmp = $this->parseDate($matches[ 4 ][ 1 ]))
139
+                $ret[ 'time_end' ] = $tmp;
140 140
             else
141 141
                 return null;
142 142
             return $ret;
@@ -152,10 +152,10 @@  discard block
 block discarded – undo
152 152
     {
153 153
         $pattern = "/^((TZID=)|(VALUE=))(.*):(.*)\$/m";
154 154
         if (preg_match_all($pattern, $date, $matches)) {
155
-            if ($matches[1][0] == 'TZID=') {
156
-                return \DateTime::createFromFormat('Ymd\THis', $matches[5][0], new \DateTimeZone($matches[4][0]));
157
-            } else if ($matches[1][0] == 'VALUE=' && $matches[4][0] == 'DATE') {
158
-                return \DateTime::createFromFormat('Ymd\THis', $matches[5][0] . 'T000000');
155
+            if ($matches[ 1 ][ 0 ] == 'TZID=') {
156
+                return \DateTime::createFromFormat('Ymd\THis', $matches[ 5 ][ 0 ], new \DateTimeZone($matches[ 4 ][ 0 ]));
157
+            } else if ($matches[ 1 ][ 0 ] == 'VALUE=' && $matches[ 4 ][ 0 ] == 'DATE') {
158
+                return \DateTime::createFromFormat('Ymd\THis', $matches[ 5 ][ 0 ].'T000000');
159 159
             }
160 160
         }
161 161
         return null;
Please login to merge, or discard this patch.
app/Console/Commands/Optimise/OptimiseCommand.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -70,17 +70,17 @@  discard block
 block discarded – undo
70 70
      */
71 71
     private function makeForeground(Company $company)
72 72
     {
73
-        $this->info('Optimisation company ' . $company->id . ' started');
73
+        $this->info('Optimisation company '.$company->id.' started');
74 74
         try {
75 75
             (new Optimise($company, $this->schedule, $this->laravel))->optimise()->save();
76
-            $this->info('Optimisation ' . $company->id . ' completed');
77
-        }catch(OptimiseException $e) {
76
+            $this->info('Optimisation '.$company->id.' completed');
77
+        } catch (OptimiseException $e) {
78 78
             if ($e->isEmpty()) {
79
-                $mex = 'Company ' . $company->id . ' doesn\'t have sufficient data';
79
+                $mex = 'Company '.$company->id.' doesn\'t have sufficient data';
80 80
                 $this->warn($mex);
81 81
                 \Log::info($mex);
82 82
             } else {
83
-                $mex = 'Error during optimisation of company ' . $company->id . ': ' . $e->getMessage();
83
+                $mex = 'Error during optimisation of company '.$company->id.': '.$e->getMessage();
84 84
                 $this->error($mex);
85 85
                 //TODO log cause, but don't send it to the user
86 86
                 //\Log::error($mex); //already logged in listener
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
      */
110 110
     private function makeBackground(Company $company)
111 111
     {
112
-        $event = $this->schedule->command('optimise:meetings ' . $company->id)->withoutOverlapping();
112
+        $event = $this->schedule->command('optimise:meetings '.$company->id)->withoutOverlapping();
113 113
         if ($event->isDue($this->laravel))
114 114
             $event->run($this->laravel);
115 115
     }
Please login to merge, or discard this patch.
Braces   +15 added lines, -11 removed lines patch added patch discarded remove patch
@@ -58,10 +58,11 @@  discard block
 block discarded – undo
58 58
         //TODO insert a timeout
59 59
         //TODO try...catch with destruct
60 60
         $companyId = $this->argument('companyId');
61
-        if (is_numeric($companyId))
62
-            $this->makeForeground(Company::findOrFail($companyId));
63
-        else
64
-            $this->syncAll();
61
+        if (is_numeric($companyId)) {
62
+                    $this->makeForeground(Company::findOrFail($companyId));
63
+        } else {
64
+                    $this->syncAll();
65
+        }
65 66
     }
66 67
 
67 68
     /**
@@ -74,7 +75,7 @@  discard block
 block discarded – undo
74 75
         try {
75 76
             (new Optimise($company, $this->schedule, $this->laravel))->optimise()->save();
76 77
             $this->info('Optimisation ' . $company->id . ' completed');
77
-        }catch(OptimiseException $e) {
78
+        } catch(OptimiseException $e) {
78 79
             if ($e->isEmpty()) {
79 80
                 $mex = 'Company ' . $company->id . ' doesn\'t have sufficient data';
80 81
                 $this->warn($mex);
@@ -94,13 +95,15 @@  discard block
 block discarded – undo
94 95
         if ($this->option('background')) {
95 96
             \Log::debug(self::BACKGROUND_MOD_MEX);
96 97
             $this->info(self::BACKGROUND_MOD_MEX);
97
-            foreach ($companies as $company)
98
-                $this->makeBackground($company);
98
+            foreach ($companies as $company) {
99
+                            $this->makeBackground($company);
100
+            }
99 101
             \Log::debug(self::BACKGROUND_COMPLETED_MEX);
100 102
             $this->info(self::BACKGROUND_COMPLETED_MEX);
101
-        } else
102
-            foreach ($companies as $company)
103
+        } else {
104
+                    foreach ($companies as $company)
103 105
                 $this->makeForeground($company);
106
+        }
104 107
     }
105 108
 
106 109
     /**
@@ -110,7 +113,8 @@  discard block
 block discarded – undo
110 113
     private function makeBackground(Company $company)
111 114
     {
112 115
         $event = $this->schedule->command('optimise:meetings ' . $company->id)->withoutOverlapping();
113
-        if ($event->isDue($this->laravel))
114
-            $event->run($this->laravel);
116
+        if ($event->isDue($this->laravel)) {
117
+                    $event->run($this->laravel);
118
+        }
115 119
     }
116 120
 }
Please login to merge, or discard this patch.
app/Listeners/Caldav/OkListener.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
     {
27 27
         //
28 28
         $calendar = $event->getCalendar();
29
-        \Log::info('caldav (calendar id = ' . $calendar->calendar_id . ') correctly synchronized');
29
+        \Log::info('caldav (calendar id = '.$calendar->calendar_id.') correctly synchronized');
30 30
         //$calendar = $event->getCalendar()->fresh();
31 31
         $calendar->sync_errors = '';
32 32
         $calendar->save();
Please login to merge, or discard this patch.
app/Listeners/Optimise/ErrorListener.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
     public function handle(ErrorEvent $event)
26 26
     {
27 27
         //
28
-        \Log::error('problems during optimise (company id = ' . $event->getCompany()->id . '): ' . $event->getError());
28
+        \Log::error('problems during optimise (company id = '.$event->getCompany()->id.'): '.$event->getError());
29 29
         $company = $event->getCompany();
30 30
         //$company = $event->getCompany()->fresh();
31 31
         self::sendEmail($company->email, $event->getError());
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
      */
38 38
     static private function sendEmail($email, $error)
39 39
     {
40
-        \Mail::queue('emails.optimise.error', ['error' => $error], function ($message) use ($email) {
40
+        \Mail::queue('emails.optimise.error', [ 'error' => $error ], function($message) use ($email) {
41 41
             $message->from(config('mail.from.address'), config('mail.from.name'));
42 42
             $message->to($email)->subject('Problems during optimisation');
43 43
         });
Please login to merge, or discard this patch.
app/Timeslot.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -26,19 +26,19 @@
 block discarded – undo
26 26
      *
27 27
      * @var array
28 28
      */
29
-    protected $fillable = ['time_start', 'time_end'];
29
+    protected $fillable = [ 'time_start', 'time_end' ];
30 30
 
31 31
     /**
32 32
      * The attributes excluded from the model's JSON form.
33 33
      *
34 34
      * @var array
35 35
      */
36
-    protected $hidden = ['pivot', 'calendar'];
36
+    protected $hidden = [ 'pivot', 'calendar' ];
37 37
 
38 38
     /**
39 39
      * @var array
40 40
      */
41
-    protected $touches = ['calendar'];
41
+    protected $touches = [ 'calendar' ];
42 42
 
43 43
     /**
44 44
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
Please login to merge, or discard this patch.
app/Http/Middleware/GetUserAndRefresh.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,12 +34,12 @@
 block discarded – undo
34 34
                 \JWTFactory::setTTL(43200);
35 35
                 //config(['jwt.ttl' =>'43200']); //30 days
36 36
             }
37
-        }catch(JWTException $e)
37
+        } catch (JWTException $e)
38 38
         {}
39 39
 
40 40
         //this to add the remember me mode field in the new token, but we have the custom check that is an useless
41 41
         //overhead
42
-        $custom = $custom . ';remember-' . $remember == 'true' ? 'true' : 'false';
42
+        $custom = $custom.';remember-'.$remember == 'true' ? 'true' : 'false';
43 43
         return parent::handle($request, $next, $custom);
44 44
     }
45 45
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
                 \JWTFactory::setTTL(43200);
35 35
                 //config(['jwt.ttl' =>'43200']); //30 days
36 36
             }
37
-        }catch(JWTException $e)
37
+        } catch(JWTException $e)
38 38
         {}
39 39
 
40 40
         //this to add the remember me mode field in the new token, but we have the custom check that is an useless
Please login to merge, or discard this patch.
app/Console/Commands/MeetingsList.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -47,12 +47,12 @@
 block discarded – undo
47 47
 
48 48
     private static function withFilter()
49 49
     {
50
-        return ['groups' => function ($query) {
50
+        return [ 'groups' => function($query) {
51 51
             $query->select('id', 'company_id');
52
-        }, 'groups.meetings' => function ($query) {
52
+        }, 'groups.meetings' => function($query) {
53 53
             $query->select('id', 'group_id', 'start_time');
54
-        }, 'groups.meetings.employees' => function ($query) {
54
+        }, 'groups.meetings.employees' => function($query) {
55 55
             $query->select('id');
56
-        }];
56
+        } ];
57 57
     }
58 58
 }
Please login to merge, or discard this patch.
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -39,10 +39,11 @@
 block discarded – undo
39 39
     {
40 40
         //
41 41
         $companyId = $this->argument('companyId');
42
-        if (is_numeric($companyId))
43
-            print_r(Company::with(self::withFilter())->findOrFail($companyId)->toArray());
44
-        else
45
-            print_r(Company::with(self::withFilter())->select('id')->get()->toArray());
42
+        if (is_numeric($companyId)) {
43
+                    print_r(Company::with(self::withFilter())->findOrFail($companyId)->toArray());
44
+        } else {
45
+                    print_r(Company::with(self::withFilter())->select('id')->get()->toArray());
46
+        }
46 47
     }
47 48
 
48 49
     private static function withFilter()
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Planners/MeetingsController.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -14,8 +14,8 @@  discard block
 block discarded – undo
14 14
 {
15 15
     public function __construct()
16 16
     {
17
-        config(['auth.model' => \plunner\Planner::class]);
18
-        config(['jwt.user' => \plunner\Planner::class]);
17
+        config([ 'auth.model' => \plunner\Planner::class ]);
18
+        config([ 'jwt.user' => \plunner\Planner::class ]);
19 19
         $this->middleware('jwt.authandrefresh:mode-en');
20 20
     }
21 21
 
@@ -33,10 +33,10 @@  discard block
 block discarded – undo
33 33
         $this->authorize($group);
34 34
         $meetings = $group->meetings();
35 35
         if ($request->query('current'))
36
-            $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
37
-                $query->where('start_time', '=', NULL);//to be planned
36
+            $meetings->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
         return $meetings->get();
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
      */
87 87
     public function storeImage(Requests\Request $request, $groupId, $meetingId)
88 88
     {
89
-        $this->validate($request, ['data' => 'required|image']);
89
+        $this->validate($request, [ 'data' => 'required|image' ]);
90 90
         $group = Group::findOrFail($groupId);
91 91
         $this->authorize($group);
92 92
         $meeting = Group::findOrFail($meetingId);
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 
99 99
     private static function putImg($file, Meeting $meeting)
100 100
     {
101
-        \Storage::put('meetings/' . $meeting->id, \File::get($file));
101
+        \Storage::put('meetings/'.$meeting->id, \File::get($file));
102 102
     }
103 103
 
104 104
     /**
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 
126 126
     private static function getImg(Meeting $meeting)
127 127
     {
128
-        $name = 'meetings/' . $meeting->id;
128
+        $name = 'meetings/'.$meeting->id;
129 129
         if (!\Storage::exists($name))
130 130
             return false;
131 131
         return \Storage::get($name);
@@ -147,8 +147,8 @@  discard block
 block discarded – undo
147 147
         $this->authorize($meeting);
148 148
         $input = $request->all();
149 149
         //the planner cannot modify the duration of a planed meeting
150
-        if ($meeting->start_time != NULL && $meeting->duration != $input['duration'])
151
-            return Response::json(['error' => 'the meeting is already planned, you cannot change the duration'], 422);
150
+        if ($meeting->start_time != NULL && $meeting->duration != $input[ 'duration' ])
151
+            return Response::json([ 'error' => 'the meeting is already planned, you cannot change the duration' ], 422);
152 152
         $meeting->update($input);
153 153
         return $meeting;
154 154
     }
Please login to merge, or discard this patch.
Braces   +14 added lines, -9 removed lines patch added patch discarded remove patch
@@ -32,9 +32,11 @@  discard block
 block discarded – undo
32 32
         $group = Group::findOrFail($groupId);
33 33
         $this->authorize($group);
34 34
         $meetings = $group->meetings();
35
-        if ($request->query('current'))
36
-            $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
37
-                $query->where('start_time', '=', NULL);//to be planned
35
+        if ($request->query('current')) {
36
+                    $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
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
             });
@@ -116,9 +118,10 @@  discard block
 block discarded – undo
116 118
         $this->authorize($meeting);
117 119
         $ret = self::getImg($meeting);
118 120
         $blank = storage_path('img/meetings.jpg');
119
-        if ($ret === false)
120
-            return (new Response(file_get_contents($blank), 200))
121
+        if ($ret === false) {
122
+                    return (new Response(file_get_contents($blank), 200))
121 123
                 ->header('Content-Type', 'image/jpeg');
124
+        }
122 125
         return (new Response($ret, 200))
123 126
             ->header('Content-Type', 'image/jpeg');
124 127
     }
@@ -126,8 +129,9 @@  discard block
 block discarded – undo
126 129
     private static function getImg(Meeting $meeting)
127 130
     {
128 131
         $name = 'meetings/' . $meeting->id;
129
-        if (!\Storage::exists($name))
130
-            return false;
132
+        if (!\Storage::exists($name)) {
133
+                    return false;
134
+        }
131 135
         return \Storage::get($name);
132 136
     }
133 137
 
@@ -147,8 +151,9 @@  discard block
 block discarded – undo
147 151
         $this->authorize($meeting);
148 152
         $input = $request->all();
149 153
         //the planner cannot modify the duration of a planed meeting
150
-        if ($meeting->start_time != NULL && $meeting->duration != $input['duration'])
151
-            return Response::json(['error' => 'the meeting is already planned, you cannot change the duration'], 422);
154
+        if ($meeting->start_time != NULL && $meeting->duration != $input['duration']) {
155
+                    return Response::json(['error' => 'the meeting is already planned, you cannot change the duration'], 422);
156
+        }
152 157
         $meeting->update($input);
153 158
         return $meeting;
154 159
     }
Please login to merge, or discard this patch.
app/Http/routes.php 1 patch
Spacing   +43 added lines, -43 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,57 +61,57 @@  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::post('groups/{groups}/meetings/{meetings}/image', ['as' => 'employees.planners.groups.meetings.storeImage', 'uses' => 'MeetingsController@storeImage']);
96
-        Route::get('groups/{groups}/meetings/{meetings}/image', ['as' => 'employees.planners.groups.meetings.showImage', 'uses' => 'MeetingsController@showImage']);
97
-        Route::resource('groups.meetings', 'MeetingsController', ['except' => ['create', 'edit']]);
98
-        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::post('groups/{groups}/meetings/{meetings}/image', [ 'as' => 'employees.planners.groups.meetings.storeImage', 'uses' => 'MeetingsController@storeImage' ]);
96
+        Route::get('groups/{groups}/meetings/{meetings}/image', [ 'as' => 'employees.planners.groups.meetings.showImage', 'uses' => 'MeetingsController@showImage' ]);
97
+        Route::resource('groups.meetings', 'MeetingsController', [ 'except' => [ 'create', 'edit' ] ]);
98
+        Route::resource('groups.meetings.timeslots', 'MeetingTimeslotsController', [ 'except' => [ 'create', 'edit' ] ]);
99 99
     });
100 100
 
101
-    Route::group(['namespace' => 'Groups'], function () {
102
-        Route::resource('groups', 'GroupsController', ['only' => ['index', 'show']]);
101
+    Route::group([ 'namespace' => 'Groups' ], function() {
102
+        Route::resource('groups', 'GroupsController', [ 'only' => [ 'index', 'show' ] ]);
103 103
     });
104 104
 
105 105
 
106
-    Route::group(['namespace' => 'Meetings'], function () {
107
-        Route::get('meetings/{meetings}/image', ['as' => 'employees.meetings.showImage', 'uses' => 'MeetingsController@showImage']);
108
-        Route::resource('meetings', 'MeetingsController', ['only' => ['index', 'show']]);
106
+    Route::group([ 'namespace' => 'Meetings' ], function() {
107
+        Route::get('meetings/{meetings}/image', [ 'as' => 'employees.meetings.showImage', 'uses' => 'MeetingsController@showImage' ]);
108
+        Route::resource('meetings', 'MeetingsController', [ 'only' => [ 'index', 'show' ] ]);
109 109
     });
110 110
 
111
-    Route::group(['namespace' => 'Employee', 'prefix' => 'employee'], function () {
112
-        Route::get('/', ['as' => 'employees.employee.index', 'uses' => 'EmployeeController@index']);
113
-        Route::put('/', ['as' => 'employees.employee.update', 'uses' => 'EmployeeController@update']);
111
+    Route::group([ 'namespace' => 'Employee', 'prefix' => 'employee' ], function() {
112
+        Route::get('/', [ 'as' => 'employees.employee.index', 'uses' => 'EmployeeController@index' ]);
113
+        Route::put('/', [ 'as' => 'employees.employee.update', 'uses' => 'EmployeeController@update' ]);
114 114
     });
115 115
 });
116 116
 
117
-Route::get('noauth/meetings/{meetings}/image', ['as' => 'noAuth.meetings.showImage', 'uses' => 'NoAuthController@showImage']);
118 117
\ No newline at end of file
118
+Route::get('noauth/meetings/{meetings}/image', [ 'as' => 'noAuth.meetings.showImage', 'uses' => 'NoAuthController@showImage' ]);
119 119
\ No newline at end of file
Please login to merge, or discard this patch.