Completed
Pull Request — master (#42)
by claudio
10:02
created
app/Http/Requests/Companies/Employees/EmployeeRequest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
         return [
35 35
             'name' => 'required|max:255',
36 36
             'email' => 'required|email|max:255|unique:employees,email,'.$this->route('employees').',id,company_id,'.$this->user()->id,
37
-            'password' => ((\Route::current()->getName() == 'companies.employees.store')?'required|':'').'confirmed|min:6',
37
+            'password' => ((\Route::current()->getName() == 'companies.employees.store') ? 'required|' : '').'confirmed|min:6',
38 38
         ];
39 39
     }
40 40
 }
Please login to merge, or discard this patch.
app/Console/Commands/SyncCaldav/SyncCaldav.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
     {
54 54
         //
55 55
         $calendarId = $this->argument('calendarId');
56
-        if(is_numeric($calendarId))
56
+        if (is_numeric($calendarId))
57 57
             $this->makeForeground(Caldav::findOrFail($calendarId));
58 58
         else
59 59
             $this->syncAll();
@@ -62,15 +62,15 @@  discard block
 block discarded – undo
62 62
     private function syncAll()
63 63
     {
64 64
         $calendars = Caldav::all();
65
-        if($this->option('background')) {
65
+        if ($this->option('background')) {
66 66
             \Log::debug(self::BACKGROUND_MOD_MEX);
67 67
             $this->info(self::BACKGROUND_MOD_MEX);
68 68
             foreach ($calendars as $calendar)
69 69
                 $this->makeBackground($calendar);
70 70
             \Log::debug(self::BACKGROUND_COMPLETED_MEX);
71 71
             $this->info(self::BACKGROUND_COMPLETED_MEX);
72
-        }else
73
-            foreach($calendars as $calendar)
72
+        } else
73
+            foreach ($calendars as $calendar)
74 74
                 $this->makeForeground($calendar);
75 75
     }
76 76
 
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
     private function makeBackground(Caldav $calendar)
82 82
     {
83 83
         $event = $this->schedule->command('sync:caldav '.$calendar->calendar_id)->withoutOverlapping();
84
-        if($event->isDue($this->laravel))
84
+        if ($event->isDue($this->laravel))
85 85
              $event->run($this->laravel);
86 86
     }
87 87
 
@@ -91,8 +91,8 @@  discard block
 block discarded – undo
91 91
      */
92 92
     private function makeForeground(Caldav $calendar)
93 93
     {
94
-        $this->info('Sync calendar '. $calendar->calendar_id.' started');
94
+        $this->info('Sync calendar '.$calendar->calendar_id.' started');
95 95
         (new Sync($calendar))->sync();
96
-        $this->info('Sync calendar '. $calendar->calendar_id.' completed');
96
+        $this->info('Sync calendar '.$calendar->calendar_id.' completed');
97 97
     }
98 98
 }
Please login to merge, or discard this patch.
app/Caldav.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -37,19 +37,19 @@
 block discarded – undo
37 37
     /**
38 38
      * @var array
39 39
      */
40
-    protected $touches = ['calendar'];
40
+    protected $touches = [ 'calendar' ];
41 41
 
42 42
     /**
43 43
      * @var array
44 44
      */
45
-    protected $fillable = ['url', 'username', 'password', 'calendar_name'];
45
+    protected $fillable = [ 'url', 'username', 'password', 'calendar_name' ];
46 46
 
47 47
     /**
48 48
      * The attributes excluded from the model's JSON form.
49 49
      *
50 50
      * @var array
51 51
      */
52
-    protected $hidden = ['password'];
52
+    protected $hidden = [ 'password' ];
53 53
 
54 54
     /**
55 55
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Planners/GroupsController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,8 +18,8 @@
 block discarded – undo
18 18
      */
19 19
     public function __construct()
20 20
     {
21
-        config(['auth.model' => Planner::class]);
22
-        config(['jwt.user' => Planner::class]);
21
+        config([ 'auth.model' => Planner::class ]);
22
+        config([ 'jwt.user' => Planner::class ]);
23 23
         $this->middleware('jwt.authandrefresh:mode-en');
24 24
     }
25 25
 
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Groups/GroupsController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,8 +21,8 @@
 block discarded – undo
21 21
      */
22 22
     public function __construct()
23 23
     {
24
-        config(['auth.model' => \plunner\Employee::class]);
25
-        config(['jwt.user' => \plunner\Employee::class]);
24
+        config([ 'auth.model' => \plunner\Employee::class ]);
25
+        config([ 'jwt.user' => \plunner\Employee::class ]);
26 26
         $this->middleware('jwt.authandrefresh:mode-en');
27 27
     }
28 28
 
Please login to merge, or discard this patch.
app/Console/Commands/SyncCaldav/Sync.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -73,12 +73,12 @@  discard block
 block discarded – undo
73 73
         $caldavClient = new SimpleCaldavAdapter();
74 74
         $caldavClient->connect($this->calendar->url, $this->calendar->username, \Crypt::decrypt($this->calendar->password));
75 75
         $calendars = $caldavClient->findCalendars();
76
-        $caldavClient->setCalendar($calendars[$this->calendar->calendar_name]);//TODO error if the calendar name is wrong
76
+        $caldavClient->setCalendar($calendars[ $this->calendar->calendar_name ]); //TODO error if the calendar name is wrong
77 77
         /**
78 78
          * 26 hours before to avoid tiemezone problems and dst problems
79 79
          * 30 days after
80 80
          */
81
-        return $caldavClient->getEvents(date('Ymd\THis\Z', time()-93600), date('Ymd\THis\Z', time()+2592000));
81
+        return $caldavClient->getEvents(date('Ymd\THis\Z', time() - 93600), date('Ymd\THis\Z', time() + 2592000));
82 82
     }
83 83
 
84 84
     /**
@@ -89,13 +89,13 @@  discard block
 block discarded – undo
89 89
         try
90 90
         {
91 91
             $events = $this->getEvents();
92
-        }catch (\it\thecsea\caldav_client_adapter\CaldavException $e)
92
+        } catch (\it\thecsea\caldav_client_adapter\CaldavException $e)
93 93
         {
94 94
             \Event::fire(new CaldavErrorEvent($this->calendar, $e->getMessage()));
95
-            return ;
96
-        }catch(\Illuminate\Contracts\Encryption\DecryptException $e){
95
+            return;
96
+        } catch (\Illuminate\Contracts\Encryption\DecryptException $e) {
97 97
             \Event::fire(new CaldavErrorEvent($this->calendar, $e->getMessage()));
98
-            return ;
98
+            return;
99 99
         }
100 100
 
101 101
         /**
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
105 105
 
106 106
         //remove old timeslots
107 107
         $calendarMain->timeslots()->delete();
108
-        foreach($events as $event){
109
-            if(!($event = $this->parseEvent($event)))
108
+        foreach ($events as $event) {
109
+            if (!($event = $this->parseEvent($event)))
110 110
                 \Event::fire(new CaldavErrorEvent($this->calendar, 'problem during the parsing an event'));
111 111
             else
112 112
                 $calendarMain->timeslots()->create($event);
@@ -120,16 +120,16 @@  discard block
 block discarded – undo
120 120
     private function parseEvent(EventInterface $event)
121 121
     {
122 122
         $pattern = "/^((DTSTART;)|(DTEND;))(.*)\$/m";
123
-        if(preg_match_all($pattern, $event->getData(), $matches)){
124
-            if(!isset($matches[4]) || count($matches[4]) != 2)
123
+        if (preg_match_all($pattern, $event->getData(), $matches)) {
124
+            if (!isset($matches[ 4 ]) || count($matches[ 4 ]) != 2)
125 125
                 return null;
126
-            $ret = [];
127
-            if($tmp = $this->parseDate($matches[4][0]))
128
-                $ret['time_start'] = $tmp;
126
+            $ret = [ ];
127
+            if ($tmp = $this->parseDate($matches[ 4 ][ 0 ]))
128
+                $ret[ 'time_start' ] = $tmp;
129 129
             else
130 130
                 return null;
131
-            if($tmp = $this->parseDate($matches[4][1]))
132
-                $ret['time_end'] = $tmp;
131
+            if ($tmp = $this->parseDate($matches[ 4 ][ 1 ]))
132
+                $ret[ 'time_end' ] = $tmp;
133 133
             else
134 134
                 return null;
135 135
             return $ret;
@@ -144,13 +144,13 @@  discard block
 block discarded – undo
144 144
     private function parseDate($date)
145 145
     {
146 146
         $pattern = "/^((TZID=)|(VALUE=))(.*):(.*)\$/m";
147
-        if(preg_match_all($pattern, $date, $matches)){
148
-            if($matches[1][0] == 'TZID=')
147
+        if (preg_match_all($pattern, $date, $matches)) {
148
+            if ($matches[ 1 ][ 0 ] == 'TZID=')
149 149
             {
150
-                return \DateTime::createFromFormat('Ymd\THis', $matches[5][0], new \DateTimeZone($matches[4][0]));
151
-            }else if($matches[1][0] == 'VALUE=' && $matches[4][0] == 'DATE')
150
+                return \DateTime::createFromFormat('Ymd\THis', $matches[ 5 ][ 0 ], new \DateTimeZone($matches[ 4 ][ 0 ]));
151
+            } else if ($matches[ 1 ][ 0 ] == 'VALUE=' && $matches[ 4 ][ 0 ] == 'DATE')
152 152
             {
153
-                return \DateTime::createFromFormat('Ymd\THis', $matches[5][0].'T000000');
153
+                return \DateTime::createFromFormat('Ymd\THis', $matches[ 5 ][ 0 ].'T000000');
154 154
             }
155 155
         }
156 156
         return null;
Please login to merge, or discard this patch.
app/Calendar.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
      *
38 38
      * @var array
39 39
      */
40
-    protected $fillable = ['name', 'enabled'];
40
+    protected $fillable = [ 'name', 'enabled' ];
41 41
 
42 42
     /**
43 43
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
Please login to merge, or discard this patch.
app/Http/routes.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -18,36 +18,36 @@  discard block
 block discarded – undo
18 18
 /**
19 19
  * Companies
20 20
  */
21
-Route::group(['namespace' => 'Companies', 'prefix' => 'companies'], function() {
21
+Route::group([ 'namespace' => 'Companies', 'prefix' => 'companies' ], function() {
22 22
 
23 23
     //\Auth
24 24
 
25
-    Route::group(['namespace' => 'Auth'], function() {
26
-        Route::group(['prefix' => 'auth'], function () {
25
+    Route::group([ 'namespace' => 'Auth' ], function() {
26
+        Route::group([ 'prefix' => 'auth' ], function() {
27 27
             // Authentication routes...
28
-            Route::post('login', ['as' => 'companies.auth.login','uses'=>'AuthController@postLogin']);
28
+            Route::post('login', [ 'as' => 'companies.auth.login', 'uses'=>'AuthController@postLogin' ]);
29 29
 
30 30
             // Registration routes...
31
-            Route::post('register', ['as' => 'companies.auth.register', 'uses'=>'AuthController@postRegister']);
31
+            Route::post('register', [ 'as' => 'companies.auth.register', 'uses'=>'AuthController@postRegister' ]);
32 32
 
33 33
         });
34 34
 
35
-        Route::group(['prefix' => 'password'], function () {
35
+        Route::group([ 'prefix' => 'password' ], function() {
36 36
             // Password reset link request routes...
37
-            Route::post('email', ['as' => 'companies.auth.email', 'uses'=>'PasswordController@postEmail']);
37
+            Route::post('email', [ 'as' => 'companies.auth.email', 'uses'=>'PasswordController@postEmail' ]);
38 38
 
39 39
             // Password reset routes...
40
-            Route::post('reset', ['as' => 'companies.auth.reset', 'uses'=>'PasswordController@postReset']);
40
+            Route::post('reset', [ 'as' => 'companies.auth.reset', 'uses'=>'PasswordController@postReset' ]);
41 41
         });
42 42
     });
43 43
 
44
-    Route::group(['namespace' => 'Employees'], function() {
45
-        Route::resource('employees', 'EmployeesController', ['except' => ['create', 'edit']]);
44
+    Route::group([ 'namespace' => 'Employees' ], function() {
45
+        Route::resource('employees', 'EmployeesController', [ 'except' => [ 'create', 'edit' ] ]);
46 46
     });
47 47
 
48
-    Route::group(['namespace' => 'Groups'], function() {
49
-        Route::resource('groups', 'GroupsController', ['except' => ['create', 'edit']]);
50
-        Route::resource('groups.employees', 'EmployeesController', ['only' => ['store', 'index', 'destroy']]);
48
+    Route::group([ 'namespace' => 'Groups' ], function() {
49
+        Route::resource('groups', 'GroupsController', [ 'except' => [ 'create', 'edit' ] ]);
50
+        Route::resource('groups.employees', 'EmployeesController', [ 'only' => [ 'store', 'index', 'destroy' ] ]);
51 51
     });
52 52
 });
53 53
 
@@ -55,39 +55,39 @@  discard block
 block discarded – undo
55 55
 /**
56 56
  * Employees
57 57
  */
58
-Route::group(['namespace' => 'Employees', 'prefix' => 'employees'], function() {
58
+Route::group([ 'namespace' => 'Employees', 'prefix' => 'employees' ], function() {
59 59
 
60 60
     //\Auth
61
-    Route::group(['namespace' => 'Auth'], function() {
62
-        Route::group(['prefix' => 'auth'], function () {
61
+    Route::group([ 'namespace' => 'Auth' ], function() {
62
+        Route::group([ 'prefix' => 'auth' ], function() {
63 63
             // Authentication routes...
64
-            Route::post('login', ['as' => 'companies.auth.login', 'uses'=>'AuthController@postLogin']);
64
+            Route::post('login', [ 'as' => 'companies.auth.login', 'uses'=>'AuthController@postLogin' ]);
65 65
 
66 66
             // Registration routes...
67 67
             //Route::post('register', ['as' => 'companies.auth.register', 'uses'=>'AuthController@postRegister']); //the registration is managed by the company
68 68
 
69 69
         });
70 70
 
71
-        Route::group(['prefix' => 'password'], function () {
71
+        Route::group([ 'prefix' => 'password' ], function() {
72 72
             // Password reset link request routes...
73
-            Route::post('email', ['as' => 'companies.auth.email', 'uses'=>'PasswordController@postEmail']);
73
+            Route::post('email', [ 'as' => 'companies.auth.email', 'uses'=>'PasswordController@postEmail' ]);
74 74
 
75 75
             // Password reset routes...
76
-            Route::post('reset', ['as' => 'companies.auth.reset', 'uses'=>'PasswordController@postReset']);
76
+            Route::post('reset', [ 'as' => 'companies.auth.reset', 'uses'=>'PasswordController@postReset' ]);
77 77
         });
78 78
     });
79 79
 
80
-    Route::group(['namespace' => 'Calendars'], function() {
81
-        Route::resource('calendars', 'CalendarsController', ['except' => ['create', 'edit']]);
82
-        Route::post('calendars/caldav', ['as' => 'employees.calendars.caldav','uses'=>'CalendarsController@storeCaldav']);
83
-        Route::post('calendars/calendars', ['as' => 'employees.calendars.calendars','uses'=>'CalendarsController@getCalendars']); //TODO it's correct post? or not
80
+    Route::group([ 'namespace' => 'Calendars' ], function() {
81
+        Route::resource('calendars', 'CalendarsController', [ 'except' => [ 'create', 'edit' ] ]);
82
+        Route::post('calendars/caldav', [ 'as' => 'employees.calendars.caldav', 'uses'=>'CalendarsController@storeCaldav' ]);
83
+        Route::post('calendars/calendars', [ 'as' => 'employees.calendars.calendars', 'uses'=>'CalendarsController@getCalendars' ]); //TODO it's correct post? or not
84 84
     });
85 85
 
86
-    Route::group(['namespace' => 'Planners', 'prefix' => 'planners'], function() {
87
-        Route::resource('groups', 'GroupsController', ['only' => ['index', 'show']]);
86
+    Route::group([ 'namespace' => 'Planners', 'prefix' => 'planners' ], function() {
87
+        Route::resource('groups', 'GroupsController', [ 'only' => [ 'index', 'show' ] ]);
88 88
     });
89 89
 
90
-    Route::group(['namespace' => 'Groups'], function() {
91
-        Route::resource('groups', 'GroupsController', ['only' => ['index', 'show']]);
90
+    Route::group([ 'namespace' => 'Groups' ], function() {
91
+        Route::resource('groups', 'GroupsController', [ 'only' => [ 'index', 'show' ] ]);
92 92
     });
93 93
 });
94 94
\ No newline at end of file
Please login to merge, or discard this patch.
app/MeetingTimeslot.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
      *
12 12
      * @var array
13 13
      */
14
-    protected $fillable = ['time_start', 'time_end'];
14
+    protected $fillable = [ 'time_start', 'time_end' ];
15 15
 
16 16
     public function employees()
17 17
     {
Please login to merge, or discard this patch.