dsd-meetme / backend

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

Spacing +12 added lines, -12 removed lines

@@ -40,7 +40,7 @@ 
      * cn = company normal
      * @var array
      */
-    protected $custom = ['mode'=>'cn'];
+    protected $custom = [ 'mode'=>'cn' ];
 
     /**
      * Create a new authentication controller instance.
@@ -48,8 +48,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 ]);
     }
 
     /**
@@ -76,22 +76,22 @@ 
     protected function create(array $data)
     {
         return Company::create([
-            'name' => $data['name'],
-            'email' => $data['email'],
-            'password' => bcrypt($data['password']),
+            'name' => $data[ 'name' ],
+            'email' => $data[ 'email' ],
+            'password' => bcrypt($data[ 'password' ]),
         ]);
     }
 
     public function postLogin(Request $request)
     {
         //remember me
-        $this->validate($request, ['remember' => 'boolean']);//TODO insert required
-        if($request->input('remember', false))
+        $this->validate($request, [ 'remember' => 'boolean' ]); //TODO insert required
+        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']);
+            config([ 'jwt.ttl' =>'43200' ]); //30 days
+            $this->custom = array_merge($this->custom, [ 'remember'=>'true' ]);
+        } else
+            $this->custom = array_merge($this->custom, [ 'remember'=>'false' ]);
         return $this->postLoginOriginal($request);
     }
 

app/Http/Kernel.php

Spacing +1 added lines, -1 removed lines

@@ -30,6 +30,6 @@
         'auth' => \plunner\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'guest' => \plunner\Http\Middleware\RedirectIfAuthenticated::class,
-        'jwt.authandrefresh' =>  \plunner\Http\Middleware\GetUserAndRefresh::class,//'Tymon\JWTAuth\Middleware\GetUserAndRefresh',
+        'jwt.authandrefresh' =>  \plunner\Http\Middleware\GetUserAndRefresh::class, //'Tymon\JWTAuth\Middleware\GetUserAndRefresh',
     ];
 }

app/Http/Middleware/GetUserAndRefresh.php

Spacing +3 added lines, -3 removed lines

@@ -25,15 +25,15 @@
     public function handle($request, \Closure $next, $custom = '')
     {
         $remember = false;
-        if($this->auth->setRequest($request)->getToken() && ($remember = $this->auth->getPayload()->get('remember')) &&
-                $remember == 'true'){
+        if ($this->auth->setRequest($request)->getToken() && ($remember = $this->auth->getPayload()->get('remember')) &&
+                $remember == 'true') {
             JWTFactory::setTTL(43200);
             //config(['jwt.ttl' =>'43200']); //30 days
         }
 
         //this to add the remember me mode field in the new token, but we have the custom check that is an useless
         //overhead
-        $custom = $custom.';remember-'.$remember=='true'?'true':'false';
+        $custom = $custom.';remember-'.$remember == 'true' ? 'true' : 'false';
         return parent::handle($request, $next, $custom);
     }
 

app/Http/Controllers/Companies/Company/CompanyController.php

Spacing +3 added lines, -3 removed lines

@@ -10,8 +10,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');
     }
 
@@ -36,7 +36,7 @@ 
     public function update(CompanyRequest $request)
     {
         $company = \Auth::user();
-        $input = $request->only(['name', 'password']);
+        $input = $request->only([ 'name', 'password' ]);
         $company->update($input);
         return $company;
     }

app/Http/routes.php

Spacing +34 added lines, -34 removed lines

@@ -18,41 +18,41 @@ 
 /**
  * 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' ] ]);
     });
 
-    Route::group(['namespace' => 'Company', 'prefix' => 'company'], function() {
-        Route::get('/', ['as' => 'companies.company.index', 'uses' => 'CompanyController@index']);
-        Route::put('/', ['as' => 'companies.company.update', 'uses' => 'CompanyController@update']);
+    Route::group([ 'namespace' => 'Company', 'prefix' => 'company' ], function() {
+        Route::get('/', [ 'as' => 'companies.company.index', 'uses' => 'CompanyController@index' ]);
+        Route::put('/', [ 'as' => 'companies.company.update', 'uses' => 'CompanyController@update' ]);
     });
 });
 
@@ -60,44 +60,44 @@ 
 /**
  * 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' ]);
         });
     });
 
-    Route::group(['namespace' => 'Calendars'], function() {
-        Route::resource('calendars', 'CalendarsController', ['except' => ['create', 'edit']]);
-        Route::post('calendars/caldav', ['as' => 'employees.calendars.caldav','uses'=>'CalendarsController@storeCaldav']);
-        Route::post('calendars/calendars', ['as' => 'employees.calendars.calendars','uses'=>'CalendarsController@getCalendars']); //TODO it's correct post? or not
+    Route::group([ 'namespace' => 'Calendars' ], function() {
+        Route::resource('calendars', 'CalendarsController', [ 'except' => [ 'create', 'edit' ] ]);
+        Route::post('calendars/caldav', [ 'as' => 'employees.calendars.caldav', 'uses'=>'CalendarsController@storeCaldav' ]);
+        Route::post('calendars/calendars', [ 'as' => 'employees.calendars.calendars', 'uses'=>'CalendarsController@getCalendars' ]); //TODO it's correct post? or not
     });
 
-    Route::group(['namespace' => 'Planners', 'prefix' => 'planners'], function() {
-        Route::resource('groups', 'GroupsController', ['only' => ['index', 'show']]);
+    Route::group([ 'namespace' => 'Planners', 'prefix' => 'planners' ], function() {
+        Route::resource('groups', 'GroupsController', [ 'only' => [ 'index', 'show' ] ]);
     });
 
-    Route::group(['namespace' => 'Groups'], function() {
-        Route::resource('groups', 'GroupsController', ['only' => ['index', 'show']]);
+    Route::group([ 'namespace' => 'Groups' ], function() {
+        Route::resource('groups', 'GroupsController', [ 'only' => [ 'index', 'show' ] ]);
     });
 
-    Route::group(['namespace' => 'Employee', 'prefix' => 'employee'], function() {
-        Route::get('/', ['as' => 'employees.employee.index', 'uses' => 'EmployeeController@index']);
-        Route::put('/', ['as' => 'employees.employee.update', 'uses' => 'EmployeeController@update']);
+    Route::group([ 'namespace' => 'Employee', 'prefix' => 'employee' ], function() {
+        Route::get('/', [ 'as' => 'employees.employee.index', 'uses' => 'EmployeeController@index' ]);
+        Route::put('/', [ 'as' => 'employees.employee.update', 'uses' => 'EmployeeController@update' ]);
     });
 });
\ No newline at end of file

app/Http/Controllers/Employees/Employee/EmployeeController.php

Spacing +3 added lines, -3 removed lines

@@ -10,8 +10,8 @@ 
 {
     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 ]);
         $this->middleware('jwt.authandrefresh:mode-en');
     }
 
@@ -36,7 +36,7 @@ 
     public function update(EmployeeRequest $request)
     {
         $employee = \Auth::user();
-        $input = $request->only(['name', 'password']);
+        $input = $request->only([ 'name', 'password' ]);
         $employee->update($input);
         return $employee;
     }

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

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
         return [
             'name' => 'required|min:1|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')?'sometimes|':'').'required|confirmed|min:6',
+            'password' => ((\Route::current()->getName() == 'companies.employees.store') ? 'sometimes|' : '').'required|confirmed|min:6',
         ];
     }
 }

app/Employee.php

Spacing +9 added lines, -9 removed lines

@@ -50,19 +50,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()
     {
@@ -98,7 +98,7 @@ 
      * to get all meetings where the user can go user groups with meetings
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
-    public function meetings(){
+    public function meetings() {
         //TODO durign the inserting chek if the meeting is of a group of the user
         return $this->belongsToMany(Meeting::class);
     }
@@ -114,16 +114,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;
     }
 
     /**
@@ -133,7 +133,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;
     }