dsd-meetme / backend

app/Employee.php

Indentation +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
      *
      * @var string
      */
-     //protected $table = 'employees';
+        //protected $table = 'employees';
 
     /**
      * The attributes that are mass assignable.

Spacing +7 added lines, -7 removed lines

@@ -57,14 +57,14 @@ 
      *
      * @var array
      */
-    protected $fillable = ['name', 'email', 'password'];
+    protected $fillable = [ 'name', 'email', 'password' ];
 
     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
-    protected $hidden = ['password', 'remember_token'];
+    protected $hidden = [ 'password', 'remember_token' ];
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
@@ -109,16 +109,16 @@ 
     public function getEmailForPasswordReset()
     {
         list(, $caller) = debug_backtrace(false);
-        if(isset($caller['class']))
-            $caller = explode('\\', $caller['class']);
+        if (isset($caller[ 'class' ]))
+            $caller = explode('\\', $caller[ 'class' ]);
         else
             $caller = '';
 
         //check if this function is called by email sender
-        if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == ''))
+        if ((count($caller) && $caller[ count($caller) - 1 ] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == ''))
             return $this->email;
         //return unique identify for token repository
-        return $this->email . $this->company->id;
+        return $this->email.$this->company->id;
     }
 
     /**
@@ -128,7 +128,7 @@ 
     public function belongsToGroup(Group $group)
     {
         $group = $this->groups()->where('id', $group->id)->first();
-        if(is_object($group) && $group->exists)
+        if (is_object($group) && $group->exists)
             return true;
         return false;
     }

Braces +11 added lines, -8 removed lines

@@ -109,14 +109,16 @@ 
     public function getEmailForPasswordReset()
     {
         list(, $caller) = debug_backtrace(false);
-        if(isset($caller['class']))
-            $caller = explode('\\', $caller['class']);
-        else
-            $caller = '';
+        if(isset($caller['class'])) {
+                    $caller = explode('\\', $caller['class']);
+        } else {
+                    $caller = '';
+        }
 
         //check if this function is called by email sender
-        if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == ''))
-            return $this->email;
+        if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == '')) {
+                    return $this->email;
+        }
         //return unique identify for token repository
         return $this->email . $this->company->id;
     }
@@ -128,8 +130,9 @@ 
     public function belongsToGroup(Group $group)
     {
         $group = $this->groups()->where('id', $group->id)->first();
-        if(is_object($group) && $group->exists)
-            return true;
+        if(is_object($group) && $group->exists) {
+                    return true;
+        }
         return false;
     }
 

app/Group.php

Braces +3 added lines, -2 removed lines

@@ -51,8 +51,9 @@
 
     public function getPlannerNameAttribute()
     {
-        if(is_object($this->planner) && $this->planner->exists)
-            return $this->planner->name;
+        if(is_object($this->planner) && $this->planner->exists) {
+                    return $this->planner->name;
+        }
     }
 
     /**

Spacing +4 added lines, -4 removed lines

@@ -44,21 +44,21 @@
      *
      * @var array
      */
-    protected $fillable = ['name', 'description', 'planner_id'];
+    protected $fillable = [ 'name', 'description', 'planner_id' ];
 
     /**
      * @var array
      */
-    protected $hidden = ['planner', 'pivot'];
+    protected $hidden = [ 'planner', 'pivot' ];
 
     /**
      * @var array
      */
-    protected $appends = ['planner_name'];
+    protected $appends = [ 'planner_name' ];
 
     public function getPlannerNameAttribute()
     {
-        if(is_object($this->planner) && $this->planner->exists)
+        if (is_object($this->planner) && $this->planner->exists)
             return $this->planner->name;
         return null;
     }

app/Http/Controllers/Companies/Groups/EmployeesController.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -3,8 +3,8 @@
 namespace plunner\Http\Controllers\Companies\Groups;
 
 use Illuminate\Support\Facades\Response;
-use plunner\Group;
 use plunner\Employee;
+use plunner\Group;
 use plunner\Http\Controllers\Controller;
 use plunner\Http\Requests\Companies\Groups\EmployeeRequest;
 

Spacing +5 added lines, -5 removed lines

@@ -21,8 +21,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');
     }
 
@@ -53,7 +53,7 @@ 
         //
         $group = Group::findOrFail($groupId);
         $this->authorize($group);
-        $id = $request->all()['id'];
+        $id = $request->all()[ 'id' ];
         $group->employees()->attach($id);
         return $group->employees;
     }
@@ -71,8 +71,8 @@ 
         $employee = Employee::findOrFail($employeeId);
         $this->authorize($employee);
         $group = Group::findOrFail($groupId);
-        if(!$employee->belongsToGroup($group))
-            return Response::json(['error' => 'employId <> groupId'],404);
+        if (!$employee->belongsToGroup($group))
+            return Response::json([ 'error' => 'employId <> groupId' ], 404);
         $employee->groups()->detach($groupId);
         return $group->employees;
     }

Braces +3 added lines, -2 removed lines

@@ -71,8 +71,9 @@
         $employee = Employee::findOrFail($employeeId);
         $this->authorize($employee);
         $group = Group::findOrFail($groupId);
-        if(!$employee->belongsToGroup($group))
-            return Response::json(['error' => 'employId <> groupId'],404);
+        if(!$employee->belongsToGroup($group)) {
+                    return Response::json(['error' => 'employId <> groupId'],404);
+        }
         $employee->groups()->detach($groupId);
         return $group->employees;
     }

app/Planner.php

Spacing +1 added lines, -1 removed lines

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

app/Http/Controllers/Companies/Employees/EmployeesController.php

Spacing +6 added lines, -6 removed lines

@@ -21,8 +21,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');
     }
 
@@ -53,8 +53,8 @@ 
         //
         $company = \Auth::user();
         $input = $request->all();
-        if(isset($input['password']))
-            $input['password'] = bcrypt($input['password']);
+        if (isset($input[ 'password' ]))
+            $input[ 'password' ] = bcrypt($input[ 'password' ]);
         $employee = $company->employees()->create($input);
         return $employee;
     }
@@ -86,8 +86,8 @@ 
         $employee = Employee::findOrFail($id);
         $this->authorize($employee);
         $input = $request->all();
-        if(isset($input['password']))
-            $input['password'] = bcrypt($input['password']);
+        if (isset($input[ 'password' ]))
+            $input[ 'password' ] = bcrypt($input[ 'password' ]);
         $employee->update($input);
         return $employee;
     }

Braces +6 added lines, -4 removed lines

@@ -53,8 +53,9 @@ 
         //
         $company = \Auth::user();
         $input = $request->all();
-        if(isset($input['password']))
-            $input['password'] = bcrypt($input['password']);
+        if(isset($input['password'])) {
+                    $input['password'] = bcrypt($input['password']);
+        }
         $employee = $company->employees()->create($input);
         return $employee;
     }
@@ -86,8 +87,9 @@ 
         $employee = Employee::findOrFail($id);
         $this->authorize($employee);
         $input = $request->all();
-        if(isset($input['password']))
-            $input['password'] = bcrypt($input['password']);
+        if(isset($input['password'])) {
+                    $input['password'] = bcrypt($input['password']);
+        }
         $employee->update($input);
         return $employee;
     }

app/Http/Middleware/VerifyCsrfToken.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     {
 
         // Don't validate CSRF when testing.
-        if(env('APP_ENV') === 'testing') {
+        if (env('APP_ENV') === 'testing') {
             return true;
         }
 

app/Http/routes.php

Spacing +20 added lines, -20 removed lines

@@ -18,36 +18,36 @@ 
 /**
  * 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' ] ]);
     });
 });
 
@@ -55,25 +55,25 @@ 
 /**
  * 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' ]);
         });
     });
 });
\ No newline at end of file

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

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
         return [
             'name' => 'required|max:255',
             'email' => 'required|email|max:255|unique:employees,email,'.$this->route('employees').',id,company_id,'.$this->user()->id,
-            'password' => ((\Route::current()->getName() == 'companies.employees.store')?'required|':'').'confirmed|min:6',
+            'password' => ((\Route::current()->getName() == 'companies.employees.store') ? 'required|' : '').'confirmed|min:6',
         ];
     }
 }

app/Console/Commands/SyncCaldav/Sync.php

Doc Comments +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
     }
 
     /**
-     * @return array|\it\thecsea\caldav_client_adapter\EventInterface[]
+     * @return EventInterface[]
      * @throws \it\thecsea\caldav_client_adapter\CaldavException
      * @thorws \Illuminate\Contracts\Encryption\DecryptException
      */

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Claudio Cardinale <cardi@thecsea.it>
- * Date: 03/12/15
- * Time: 2.33
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
+     * Created by PhpStorm.
+     * User: Claudio Cardinale <cardi@thecsea.it>
+     * Date: 03/12/15
+     * Time: 2.33
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 2
+     * of the License, or (at your option) any later version.
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+     */
 
 namespace plunner\Console\Commands\SyncCaldav;
 

Braces +19 added lines, -15 removed lines

@@ -89,10 +89,10 @@ 
         try
         {
             $events = $this->getEvents();
-        }catch (\it\thecsea\caldav_client_adapter\CaldavException $e)
+        } catch (\it\thecsea\caldav_client_adapter\CaldavException $e)
         {
             \Event::fire(new CaldavErrorEvent($this->calendar, $e->getMessage()));
-        }catch(\Illuminate\Contracts\Encryption\DecryptException $e){
+        } catch(\Illuminate\Contracts\Encryption\DecryptException $e){
             \Event::fire(new CaldavErrorEvent($this->calendar, $e->getMessage()));
         }
 
@@ -104,8 +104,9 @@ 
         //remove old timeslots
         $calendarMain->timeslots()->delete();
         foreach($events as $event){
-            if(!($event = $this->parseEvent($event)))
-                \Event::fire(new CaldavErrorEvent($this->calendar, 'problem during the parsing an event'));
+            if(!($event = $this->parseEvent($event))) {
+                            \Event::fire(new CaldavErrorEvent($this->calendar, 'problem during the parsing an event'));
+            }
             $calendarMain->timeslots()->create($event);
         }
     }
@@ -118,17 +119,20 @@ 
     {
         $pattern = "/^((DTSTART;)|(DTEND;))(.*)\$/m";
         if(preg_match_all($pattern, $event->getData(), $matches)){
-            if(!isset($matches[4]) || count($matches[4]) != 2)
-                return null;
+            if(!isset($matches[4]) || count($matches[4]) != 2) {
+                            return null;
+            }
             $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;
-            else
-                return null;
+            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;
+            } else {
+                            return null;
+            }
             return $ret;
         }
         return null;
@@ -145,7 +149,7 @@ 
             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')
+            } else if($matches[1][0] == 'VALUE=' && $matches[4][0] == 'DATE')
             {
                 return \DateTime::createFromFormat('Ymd\THis', $matches[5][0].'T000000');
             }

Spacing +20 added lines, -20 removed lines

@@ -73,12 +73,12 @@ 
         $caldavClient = new SimpleCaldavAdapter();
         $caldavClient->connect($this->calendar->url, $this->calendar->username, \Crypt::decrypt($this->calendar->password));
         $calendars = $caldavClient->findCalendars();
-        $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
          */
-        return $caldavClient->getEvents(date('Ymd\THis\Z', time()-93600), date('Ymd\THis\Z', time()+2592000));
+        return $caldavClient->getEvents(date('Ymd\THis\Z', time() - 93600), date('Ymd\THis\Z', time() + 2592000));
     }
 
     /**
@@ -89,13 +89,13 @@ 
         try
         {
             $events = $this->getEvents();
-        }catch (\it\thecsea\caldav_client_adapter\CaldavException $e)
+        } catch (\it\thecsea\caldav_client_adapter\CaldavException $e)
         {
             \Event::fire(new CaldavErrorEvent($this->calendar, $e->getMessage()));
-            return ;
-        }catch(\Illuminate\Contracts\Encryption\DecryptException $e){
+            return;
+        } catch (\Illuminate\Contracts\Encryption\DecryptException $e) {
             \Event::fire(new CaldavErrorEvent($this->calendar, $e->getMessage()));
-            return ;
+            return;
         }
 
         /**
@@ -105,8 +105,8 @@ 
 
         //remove old timeslots
         $calendarMain->timeslots()->delete();
-        foreach($events as $event){
-            if(!($event = $this->parseEvent($event)))
+        foreach ($events as $event) {
+            if (!($event = $this->parseEvent($event)))
                 \Event::fire(new CaldavErrorEvent($this->calendar, 'problem during the parsing an event'));
             $calendarMain->timeslots()->create($event);
         }
@@ -119,16 +119,16 @@ 
     private function parseEvent(EventInterface $event)
     {
         $pattern = "/^((DTSTART;)|(DTEND;))(.*)\$/m";
-        if(preg_match_all($pattern, $event->getData(), $matches)){
-            if(!isset($matches[4]) || count($matches[4]) != 2)
+        if (preg_match_all($pattern, $event->getData(), $matches)) {
+            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;
@@ -143,13 +143,13 @@ 
     private function parseDate($date)
     {
         $pattern = "/^((TZID=)|(VALUE=))(.*):(.*)\$/m";
-        if(preg_match_all($pattern, $date, $matches)){
-            if($matches[1][0] == 'TZID=')
+        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 ], 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 \DateTime::createFromFormat('Ymd\THis', $matches[ 5 ][ 0 ].'T000000');
             }
         }
         return null;