dsd-meetme / backend

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

Unused Use Statements +3 added lines, -4 removed lines

@@ -3,13 +3,12 @@
 namespace plunner\Http\Controllers\Employees\Auth;
 
 use Illuminate\Http\Request;
-use Log;
-use plunner\Company;
-use plunner\employee;
-use plunner\Http\Controllers\Controller;
 use Tymon\JWTAuth\Support\auth\AuthenticatesAndRegistersUsers;
 use Tymon\JWTAuth\Support\auth\ThrottlesLogins;
 use Validator;
+use plunner\Company;
+use plunner\Http\Controllers\Controller;
+use plunner\employee;
 
 /**
  * Class AuthController

Braces +3 added lines, -2 removed lines

@@ -79,8 +79,9 @@
         if ($request->input('remember', false)) {
             config(['jwt.ttl' => '43200']); //30 days
             $this->custom = array_merge($this->custom, ['remember' => 'true']);
-        } else
-            $this->custom = array_merge($this->custom, ['remember' => 'false']);
+        } else {
+                    $this->custom = array_merge($this->custom, ['remember' => 'false']);
+        }
 
         return $this->postLoginOriginal($request);
     }

Spacing +14 added lines, -14 removed lines

@@ -43,7 +43,7 @@ 
      * en = employee normal
      * @var array
      */
-    protected $custom = ['mode' => 'en'];
+    protected $custom = [ 'mode' => 'en' ];
 
     /**
      * @var company
@@ -56,13 +56,13 @@ 
      */
     public function __construct()
     {
-        config(['auth.model' => \plunner\Employee::class]);
-        config(['jwt.user' => \plunner\Employee::class]);
+        config([ 'auth.model' => \plunner\Employee::class ]);
+        config([ 'jwt.user' => \plunner\Employee::class ]);
     }
 
     public function postRegister(Request $request)
     {
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
         return $this->postRegisterOriginal($request);
     }
@@ -70,17 +70,17 @@ 
     public function postLogin(Request $request)
     {
         //get company ID and impiled it in the request
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
-        $request->merge(['company_id' => $this->company->id]);
+        $request->merge([ 'company_id' => $this->company->id ]);
 
         //remember me
-        $this->validate($request, ['remember' => 'required|boolean']);
+        $this->validate($request, [ 'remember' => 'required|boolean' ]);
         if ($request->input('remember', false)) {
-            config(['jwt.ttl' => '43200']); //30 days
-            $this->custom = array_merge($this->custom, ['remember' => 'true']);
+            config([ 'jwt.ttl' => '43200' ]); //30 days
+            $this->custom = array_merge($this->custom, [ 'remember' => 'true' ]);
         } else
-            $this->custom = array_merge($this->custom, ['remember' => 'false']);
+            $this->custom = array_merge($this->custom, [ 'remember' => 'false' ]);
 
         return $this->postLoginOriginal($request);
     }
@@ -95,7 +95,7 @@ 
     {
         return Validator::make($data, [
             'name' => 'required|min:1|max:255',
-            'email' => 'required|email|max:255|unique:employees,email,NULL,id,company_id,' . $this->company->id,
+            'email' => 'required|email|max:255|unique:employees,email,NULL,id,company_id,'.$this->company->id,
             'password' => 'required|confirmed|min:6',
         ]);
     }
@@ -109,9 +109,9 @@ 
     protected function create(array $data)
     {
         return $this->company->save(new employee([
-            'name' => $data['name'],
-            'email' => $data['email'],
-            'password' => bcrypt($data['password']),
+            'name' => $data[ 'name' ],
+            'email' => $data[ 'email' ],
+            'password' => bcrypt($data[ 'password' ]),
         ]));
     }
 }

app/Http/Controllers/Employees/Auth/PasswordController.php

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

@@ -3,9 +3,9 @@
 namespace plunner\Http\Controllers\Employees\Auth;
 
 use Illuminate\Http\Request;
+use Tymon\JWTAuth\Support\auth\ResetsPasswords;
 use plunner\Company;
 use plunner\Http\Controllers\Controller;
-use Tymon\JWTAuth\Support\auth\ResetsPasswords;
 
 /**
  * Class PasswordController

Spacing +9 added lines, -9 removed lines

@@ -36,12 +36,12 @@ 
      * en = employee normal
      * @var array
      */
-    protected $custom = ['mode' => 'en'];
+    protected $custom = [ 'mode' => 'en' ];
 
     /**
      * @var array
      */
-    protected $username = ['email', 'company_id'];
+    protected $username = [ 'email', 'company_id' ];
 
     /**
      * @var company
@@ -54,24 +54,24 @@ 
      */
     public function __construct()
     {
-        config(['auth.model' => \plunner\Employee::class]);
-        config(['jwt.user' => \plunner\Employee::class]);
-        config(['auth.password.table' => 'password_resets_employees', 'auth.password.email' => 'emails.employees.password']);
+        config([ 'auth.model' => \plunner\Employee::class ]);
+        config([ 'jwt.user' => \plunner\Employee::class ]);
+        config([ 'auth.password.table' => 'password_resets_employees', 'auth.password.email' => 'emails.employees.password' ]);
     }
 
     public function postEmail(Request $request)
     {
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
-        $request->merge(['company_id' => $this->company->id]);
+        $request->merge([ 'company_id' => $this->company->id ]);
         return $this->postEmailOriginal($request);
     }
 
     public function postReset(Request $request)
     {
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
-        $request->merge(['company_id' => $this->company->id]);
+        $request->merge([ 'company_id' => $this->company->id ]);
         return $this->postResetOriginal($request);
     }
 

app/Console/Commands/Inspire.php

Spacing +1 added lines, -1 removed lines

@@ -28,6 +28,6 @@
      */
     public function handle()
     {
-        $this->comment(PHP_EOL . Inspiring::quote() . PHP_EOL);
+        $this->comment(PHP_EOL.Inspiring::quote().PHP_EOL);
     }
 }

app/Console/Commands/Optimise/OptimiseCommand.php

Spacing +3 added lines, -3 removed lines

@@ -70,9 +70,9 @@ 
      */
     private function makeForeground(Company $company)
     {
-        $this->info('Optimisation company ' . $company->id . ' started');
+        $this->info('Optimisation company '.$company->id.' started');
         (new Optimise($company, $this->schedule, $this->laravel))->optimise()->save();
-        $this->info('Optimisation ' . $company->id . ' completed');
+        $this->info('Optimisation '.$company->id.' completed');
     }
 
     private function syncAll()
@@ -96,7 +96,7 @@ 
      */
     private function makeBackground(Company $company)
     {
-        $event = $this->schedule->command('optimise:meetings ' . $company->id)->withoutOverlapping();
+        $event = $this->schedule->command('optimise:meetings '.$company->id)->withoutOverlapping();
         if ($event->isDue($this->laravel))
             $event->run($this->laravel);
     }

Braces +14 added lines, -10 removed lines

@@ -58,10 +58,11 @@ 
         //TODO insert a timeout
         //TODO try...catch with destruct
         $companyId = $this->argument('companyId');
-        if (is_numeric($companyId))
-            $this->makeForeground(Company::findOrFail($companyId));
-        else
-            $this->syncAll();
+        if (is_numeric($companyId)) {
+                    $this->makeForeground(Company::findOrFail($companyId));
+        } else {
+                    $this->syncAll();
+        }
     }
 
     /**
@@ -81,13 +82,15 @@ 
         if ($this->option('background')) {
             \Log::debug(self::BACKGROUND_MOD_MEX);
             $this->info(self::BACKGROUND_MOD_MEX);
-            foreach ($calendars as $calendar)
-                $this->makeBackground($calendar);
+            foreach ($calendars as $calendar) {
+                            $this->makeBackground($calendar);
+            }
             \Log::debug(self::BACKGROUND_COMPLETED_MEX);
             $this->info(self::BACKGROUND_COMPLETED_MEX);
-        } else
-            foreach ($calendars as $calendar)
+        } else {
+                    foreach ($calendars as $calendar)
                 $this->makeForeground($calendar);
+        }
     }
 
     /**
@@ -97,7 +100,8 @@ 
     private function makeBackground(Company $company)
     {
         $event = $this->schedule->command('optimise:meetings ' . $company->id)->withoutOverlapping();
-        if ($event->isDue($this->laravel))
-            $event->run($this->laravel);
+        if ($event->isDue($this->laravel)) {
+                    $event->run($this->laravel);
+        }
     }
 }

app/Console/Commands/Optimise/Path.php

Spacing +11 added lines, -11 removed lines

@@ -53,7 +53,7 @@ 
         if (file_exists($path->getPath()))
             throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
         if (!@mkdir($path->getPath()))
-            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');;
+            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)'); ;
         if (!is_dir($path->getPath()))
             throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
         return $path;
@@ -104,7 +104,7 @@ 
      */
     public function getModelPath()
     {
-        return $this->path . '/model.mod';
+        return $this->path.'/model.mod';
     }
 
     /**
@@ -112,7 +112,7 @@ 
      */
     public function getUsersPath()
     {
-        return $this->path . '/Users.csv';
+        return $this->path.'/Users.csv';
     }
 
     /**
@@ -120,7 +120,7 @@ 
      */
     public function getMeetingsPath()
     {
-        return $this->path . '/Meeting.csv';
+        return $this->path.'/Meeting.csv';
     }
 
     /**
@@ -128,7 +128,7 @@ 
      */
     public function getMeetingsDurationPath()
     {
-        return $this->path . '/MeetingsDuration.csv';
+        return $this->path.'/MeetingsDuration.csv';
     }
 
     /**
@@ -136,7 +136,7 @@ 
      */
     public function getMeetingsAvailabilityPath()
     {
-        return $this->path . '/MeetingsAvailability.csv';
+        return $this->path.'/MeetingsAvailability.csv';
     }
 
     /**
@@ -144,7 +144,7 @@ 
      */
     public function getUsersAvailabilityPath()
     {
-        return $this->path . '/UsersAvailability.csv';
+        return $this->path.'/UsersAvailability.csv';
     }
 
     /**
@@ -152,7 +152,7 @@ 
      */
     public function getUsersMeetingsPath()
     {
-        return $this->path . '/UsersMeetings.csv';
+        return $this->path.'/UsersMeetings.csv';
     }
 
     /**
@@ -160,7 +160,7 @@ 
      */
     public function getXPath()
     {
-        return $this->path . '/x.csv';
+        return $this->path.'/x.csv';
     }
 
     /**
@@ -168,7 +168,7 @@ 
      */
     public function getYPath()
     {
-        return $this->path . '/y.csv';
+        return $this->path.'/y.csv';
     }
 
     /**
@@ -176,6 +176,6 @@ 
      */
     public function getOutputPath()
     {
-        return $this->path . '/out.txt';
+        return $this->path.'/out.txt';
     }
 }
\ No newline at end of file

Braces +13 added lines, -8 removed lines

@@ -50,12 +50,16 @@ 
     {
         $path = new Path(tempnam(sys_get_temp_dir(), 'OPT')); //TODO check the return in case of errors this return false on failure
         unlink($path->getPath()); //remove file to create a dir
-        if (file_exists($path->getPath()))
-            throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
-        if (!@mkdir($path->getPath()))
-            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');;
-        if (!is_dir($path->getPath()))
-            throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
+        if (file_exists($path->getPath())) {
+                    throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
+        }
+        if (!@mkdir($path->getPath())) {
+                    throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');
+        }
+        ;
+        if (!is_dir($path->getPath())) {
+                    throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
+        }
         return $path;
     }
 
@@ -80,8 +84,9 @@ 
      */
     public function __destruct()
     {
-        if ($this->path && is_dir($this->path) && !self::delTree($this->path))
-            throw new OptimiseException('problems during removing of path directory');
+        if ($this->path && is_dir($this->path) && !self::delTree($this->path)) {
+                    throw new OptimiseException('problems during removing of path directory');
+        }
     }
 
     /**

app/Console/Commands/SyncCaldav/SyncCaldav.php

Spacing +3 added lines, -3 removed lines

@@ -71,9 +71,9 @@ 
      */
     private function makeForeground(Caldav $calendar)
     {
-        $this->info('Sync calendar ' . $calendar->calendar_id . ' started');
+        $this->info('Sync calendar '.$calendar->calendar_id.' started');
         (new Sync($calendar))->sync();
-        $this->info('Sync calendar ' . $calendar->calendar_id . ' completed');
+        $this->info('Sync calendar '.$calendar->calendar_id.' completed');
     }
 
     private function syncAll()
@@ -97,7 +97,7 @@ 
      */
     private function makeBackground(Caldav $calendar)
     {
-        $event = $this->schedule->command('sync:caldav ' . $calendar->calendar_id)->withoutOverlapping();
+        $event = $this->schedule->command('sync:caldav '.$calendar->calendar_id)->withoutOverlapping();
         if ($event->isDue($this->laravel))
             $event->run($this->laravel);
     }

Braces +14 added lines, -10 removed lines

@@ -59,10 +59,11 @@ 
     {
         //
         $calendarId = $this->argument('calendarId');
-        if (is_numeric($calendarId))
-            $this->makeForeground(Caldav::findOrFail($calendarId));
-        else
-            $this->syncAll();
+        if (is_numeric($calendarId)) {
+                    $this->makeForeground(Caldav::findOrFail($calendarId));
+        } else {
+                    $this->syncAll();
+        }
     }
 
     /**
@@ -82,13 +83,15 @@ 
         if ($this->option('background')) {
             \Log::debug(self::BACKGROUND_MOD_MEX);
             $this->info(self::BACKGROUND_MOD_MEX);
-            foreach ($calendars as $calendar)
-                $this->makeBackground($calendar);
+            foreach ($calendars as $calendar) {
+                            $this->makeBackground($calendar);
+            }
             \Log::debug(self::BACKGROUND_COMPLETED_MEX);
             $this->info(self::BACKGROUND_COMPLETED_MEX);
-        } else
-            foreach ($calendars as $calendar)
+        } else {
+                    foreach ($calendars as $calendar)
                 $this->makeForeground($calendar);
+        }
     }
 
     /**
@@ -98,7 +101,8 @@ 
     private function makeBackground(Caldav $calendar)
     {
         $event = $this->schedule->command('sync:caldav ' . $calendar->calendar_id)->withoutOverlapping();
-        if ($event->isDue($this->laravel))
-            $event->run($this->laravel);
+        if ($event->isDue($this->laravel)) {
+                    $event->run($this->laravel);
+        }
     }
 }

app/Employee.php

Spacing +7 added lines, -7 removed lines

@@ -43,19 +43,19 @@ 
      *
      * @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', 'pivot'];
+    protected $hidden = [ 'password', 'remember_token', 'pivot' ];
 
     /**
      * @var array
      */
-    protected $appends = ['is_planner'];
+    protected $appends = [ 'is_planner' ];
 
     public function getIsPlannerAttribute()
     {
@@ -97,16 +97,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;
     }
 
     /**

Braces +8 added lines, -6 removed lines

@@ -97,14 +97,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;
     }

app/Group.php

Spacing +3 added lines, -3 removed lines

@@ -31,17 +31,17 @@
      *
      * @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()
     {

Braces +3 added lines, -2 removed lines

@@ -45,8 +45,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;
+        }
         return null;
     }
 

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

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
      * cn = company normal
      * @var array
      */
-    protected $custom = ['mode' => 'cn'];
+    protected $custom = [ 'mode' => 'cn' ];
 
 
     /**
@@ -40,8 +40,8 @@ 
      */
     public function __construct()
     {
-        config(['auth.model' => \plunner\Company::class]);
-        config(['jwt.user' => \plunner\Company::class]);
-        config(['auth.password.table' => 'password_resets_companies', 'auth.password.email' => 'emails.companies.password']);
+        config([ 'auth.model' => \plunner\Company::class ]);
+        config([ 'jwt.user' => \plunner\Company::class ]);
+        config([ 'auth.password.table' => 'password_resets_companies', 'auth.password.email' => 'emails.companies.password' ]);
     }
 }