Completed
Pull Request — master (#5)
by claudio
11:05 queued 03:52
created
app/Group.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -37,21 +37,21 @@
 block discarded – undo
37 37
      *
38 38
      * @var array
39 39
      */
40
-    protected $fillable = ['name', 'description', 'planner_id'];
40
+    protected $fillable = [ 'name', 'description', 'planner_id' ];
41 41
 
42 42
     /**
43 43
      * @var array
44 44
      */
45
-    protected $hidden = ['planner'];
45
+    protected $hidden = [ 'planner' ];
46 46
 
47 47
     /**
48 48
      * @var array
49 49
      */
50
-    protected $appends = ['planner_name'];
50
+    protected $appends = [ 'planner_name' ];
51 51
 
52 52
     public function getPlannerNameAttribute()
53 53
     {
54
-        if(is_object($this->planner) && $this->planner->exists)
54
+        if (is_object($this->planner) && $this->planner->exists)
55 55
             return $this->planner->name;
56 56
     }
57 57
 
Please login to merge, or discard this patch.
app/Http/Controllers/Companies/Groups/EmployeesController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -21,8 +21,8 @@  discard block
 block discarded – undo
21 21
      */
22 22
     public function __construct()
23 23
     {
24
-        config(['auth.model' => \plunner\Company::class]);
25
-        config(['jwt.user' => \plunner\Company::class]);
24
+        config([ 'auth.model' => \plunner\Company::class ]);
25
+        config([ 'jwt.user' => \plunner\Company::class ]);
26 26
         $this->middleware('jwt.authandrefresh:mode-cn');
27 27
     }
28 28
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
         //
54 54
         $group = Group::findOrFail($groupId);
55 55
         $this->authorize($group);
56
-        $id = $request->all()['id'];
56
+        $id = $request->all()[ 'id' ];
57 57
         $group->employees()->attach($id);
58 58
         return $group->employees;
59 59
     }
@@ -71,8 +71,8 @@  discard block
 block discarded – undo
71 71
         $employee = Employee::findOrFail($employeeId);
72 72
         $this->authorize($employee);
73 73
         $group = Group::findOrFail($groupId);
74
-        if(!$employee->belongsToGroup($group))
75
-            return Response::json(['error' => 'employId <> groupId'],404);
74
+        if (!$employee->belongsToGroup($group))
75
+            return Response::json([ 'error' => 'employId <> groupId' ], 404);
76 76
         $employee->groups()->detach($groupId);
77 77
         return $group->employees;
78 78
     }
Please login to merge, or discard this patch.
app/Http/routes.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -18,65 +18,65 @@
 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
     //example
54
-    Route::resource('example', 'ExampleController', ['except' => ['create', 'edit']]); //TODO remove
54
+    Route::resource('example', 'ExampleController', [ 'except' => [ 'create', 'edit' ] ]); //TODO remove
55 55
 });
56 56
 
57 57
 
58 58
 /**
59 59
  * Employees
60 60
  */
61
-Route::group(['namespace' => 'Employees', 'prefix' => 'employees'], function() {
61
+Route::group([ 'namespace' => 'Employees', 'prefix' => 'employees' ], function() {
62 62
     //\Auth
63 63
 
64
-    Route::group(['namespace' => 'Auth'], function() {
65
-        Route::group(['prefix' => 'auth'], function () {
64
+    Route::group([ 'namespace' => 'Auth' ], function() {
65
+        Route::group([ 'prefix' => 'auth' ], function() {
66 66
             // Authentication routes...
67
-            Route::post('login', ['as' => 'companies.auth.login', 'uses'=>'AuthController@postLogin']);
67
+            Route::post('login', [ 'as' => 'companies.auth.login', 'uses'=>'AuthController@postLogin' ]);
68 68
 
69 69
             // Registration routes...
70 70
             //Route::post('register', ['as' => 'companies.auth.register', 'uses'=>'AuthController@postRegister']); //the registration is managed by the company
71 71
 
72 72
         });
73 73
 
74
-        Route::group(['prefix' => 'password'], function () {
74
+        Route::group([ 'prefix' => 'password' ], function() {
75 75
             // Password reset link request routes...
76
-            Route::post('email', ['as' => 'companies.auth.email', 'uses'=>'PasswordController@postEmail']);
76
+            Route::post('email', [ 'as' => 'companies.auth.email', 'uses'=>'PasswordController@postEmail' ]);
77 77
 
78 78
             // Password reset routes...
79
-            Route::post('reset', ['as' => 'companies.auth.reset', 'uses'=>'PasswordController@postReset']);
79
+            Route::post('reset', [ 'as' => 'companies.auth.reset', 'uses'=>'PasswordController@postReset' ]);
80 80
         });
81 81
     });
82 82
 
Please login to merge, or discard this patch.
app/Planner.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
      */
62 62
     public function verifyEmployee(Employee $employee)
63 63
     {
64
-        $group = $this->groupsManaged()->whereHas('employees',function ($query) use ($employee) {$query->where('employees.id', $employee->id);})->first();
64
+        $group = $this->groupsManaged()->whereHas('employees', function($query) use ($employee) {$query->where('employees.id', $employee->id); })->first();
65 65
 
66 66
         return (is_object($group) && $group->exists);
67 67
     }
Please login to merge, or discard this patch.
app/Http/Controllers/Companies/Employees/EmployeesController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -21,8 +21,8 @@  discard block
 block discarded – undo
21 21
      */
22 22
     public function __construct()
23 23
     {
24
-        config(['auth.model' => \plunner\Company::class]);
25
-        config(['jwt.user' => \plunner\Company::class]);
24
+        config([ 'auth.model' => \plunner\Company::class ]);
25
+        config([ 'jwt.user' => \plunner\Company::class ]);
26 26
         $this->middleware('jwt.authandrefresh:mode-cn');
27 27
     }
28 28
 
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
         //
54 54
         $company = \Auth::user();
55 55
         $input = $request->all();
56
-        if(isset($input['password']))
57
-            $input['password'] = bcrypt($input['password']);
56
+        if (isset($input[ 'password' ]))
57
+            $input[ 'password' ] = bcrypt($input[ 'password' ]);
58 58
         $employee = $company->employees()->create($input);
59 59
         return $employee;
60 60
     }
@@ -86,8 +86,8 @@  discard block
 block discarded – undo
86 86
         $employee = Employee::findOrFail($id);
87 87
         $this->authorize($employee);
88 88
         $input = $request->all();
89
-        if(isset($input['password']))
90
-            $input['password'] = bcrypt($input['password']);
89
+        if (isset($input[ 'password' ]))
90
+            $input[ 'password' ] = bcrypt($input[ 'password' ]);
91 91
         $employee->update($input);
92 92
         return $employee;
93 93
     }
Please login to merge, or discard this patch.
app/Employee.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -57,14 +57,14 @@  discard block
 block discarded – undo
57 57
      *
58 58
      * @var array
59 59
      */
60
-    protected $fillable = ['name', 'email', 'password'];
60
+    protected $fillable = [ 'name', 'email', 'password' ];
61 61
 
62 62
     /**
63 63
      * The attributes excluded from the model's JSON form.
64 64
      *
65 65
      * @var array
66 66
      */
67
-    protected $hidden = ['password', 'remember_token'];
67
+    protected $hidden = [ 'password', 'remember_token' ];
68 68
 
69 69
     /**
70 70
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
@@ -109,13 +109,13 @@  discard block
 block discarded – undo
109 109
     public function getEmailForPasswordReset()
110 110
     {
111 111
         list(, $caller) = debug_backtrace(false);
112
-        $caller = explode('\\', $caller['class']);
112
+        $caller = explode('\\', $caller[ 'class' ]);
113 113
 
114 114
         //check if this function is called by email sender
115
-        if ($caller[count($caller) - 1] == 'PasswordBroker')
115
+        if ($caller[ count($caller) - 1 ] == 'PasswordBroker')
116 116
             return $this->email;
117 117
         //return unique identify for token repository
118
-        return $this->email . $this->company->id;
118
+        return $this->email.$this->company->id;
119 119
     }
120 120
 
121 121
     /**
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
     public function belongsToGroup(Group $group)
126 126
     {
127 127
         $group = $this->groups()->where('id', $group->id)->first();
128
-        if(is_object($group) && $group->exists)
128
+        if (is_object($group) && $group->exists)
129 129
             return true;
130 130
         return false;
131 131
     }
Please login to merge, or discard this patch.
app/Http/Controllers/Companies/Auth/PasswordController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
      * cn = company normal
32 32
      * @var array
33 33
      */
34
-    protected $custom = ['mode'=>'cn'];
34
+    protected $custom = [ 'mode'=>'cn' ];
35 35
 
36 36
 
37 37
     /**
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
      */
42 42
     public function __construct()
43 43
     {
44
-        config(['auth.model' => \plunner\Company::class]);
45
-        config(['jwt.user' => \plunner\Company::class]);
46
-        config(['auth.password.table' => 'password_resets_companies', 'auth.password.email' => 'emails.companies.password']);
44
+        config([ 'auth.model' => \plunner\Company::class ]);
45
+        config([ 'jwt.user' => \plunner\Company::class ]);
46
+        config([ 'auth.password.table' => 'password_resets_companies', 'auth.password.email' => 'emails.companies.password' ]);
47 47
     }
48 48
 }
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Auth/PasswordController.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -38,12 +38,12 @@  discard block
 block discarded – undo
38 38
      * en = employee normal
39 39
      * @var array
40 40
      */
41
-    protected $custom = ['mode'=>'en'];
41
+    protected $custom = [ 'mode'=>'en' ];
42 42
 
43 43
     /**
44 44
      * @var array
45 45
      */
46
-    protected $username = ['email', 'company_id'];
46
+    protected $username = [ 'email', 'company_id' ];
47 47
 
48 48
     /**
49 49
      * @var company
@@ -57,24 +57,24 @@  discard block
 block discarded – undo
57 57
      */
58 58
     public function __construct()
59 59
     {
60
-        config(['auth.model' => \plunner\Employee::class]);
61
-        config(['jwt.user' => \plunner\Employee::class]);
62
-        config(['auth.password.table' => 'password_resets_employees', 'auth.password.email' => 'emails.employees.password']);
60
+        config([ 'auth.model' => \plunner\Employee::class ]);
61
+        config([ 'jwt.user' => \plunner\Employee::class ]);
62
+        config([ 'auth.password.table' => 'password_resets_employees', 'auth.password.email' => 'emails.employees.password' ]);
63 63
     }
64 64
 
65 65
     public function postEmail(Request $request)
66 66
     {
67
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
67
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
68 68
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
69
-        $request->merge(['company_id' => $this->company->id]);
69
+        $request->merge([ 'company_id' => $this->company->id ]);
70 70
         return $this->postEmailOriginal($request);
71 71
     }
72 72
 
73 73
     public function postReset(Request $request)
74 74
     {
75
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
75
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
76 76
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
77
-        $request->merge(['company_id' => $this->company->id]);
77
+        $request->merge([ 'company_id' => $this->company->id ]);
78 78
         return $this->postResetOriginal($request);
79 79
     }
80 80
 
Please login to merge, or discard this patch.