Completed
Pull Request — master (#48)
by claudio
05:21
created
app/Providers/RouteServiceProvider.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
     public function map(Router $router)
39 39
     {
40
-        $router->group(['namespace' => $this->namespace], function ($router) {
40
+        $router->group([ 'namespace' => $this->namespace ], function($router) {
41 41
             require app_path('Http/routes.php');
42 42
         });
43 43
     }
Please login to merge, or discard this patch.
app/Http/Controllers/Companies/Auth/AuthController.php 3 patches
Unused Use Statements   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,11 +2,11 @@
 block discarded – undo
2 2
 
3 3
 namespace plunner\Http\Controllers\Companies\Auth;
4 4
 
5
-use plunner\Company;
6
-use Validator;
7
-use plunner\Http\Controllers\Controller;
8 5
 use Tymon\JWTAuth\Support\auth\AuthenticatesAndRegistersUsers;
9 6
 use Tymon\JWTAuth\Support\auth\ThrottlesLogins;
7
+use Validator;
8
+use plunner\Company;
9
+use plunner\Http\Controllers\Controller;
10 10
 
11 11
 class AuthController extends Controller
12 12
 {
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
      * cn = company normal
41 41
      * @var array
42 42
      */
43
-    protected $custom = ['mode'=>'cn'];
43
+    protected $custom = [ 'mode'=>'cn' ];
44 44
 
45 45
     /**
46 46
      * Create a new authentication controller instance.
@@ -48,8 +48,8 @@  discard block
 block discarded – undo
48 48
      */
49 49
     public function __construct()
50 50
     {
51
-        config(['auth.model' => \plunner\Company::class]);
52
-        config(['jwt.user' => \plunner\Company::class]);
51
+        config([ 'auth.model' => \plunner\Company::class ]);
52
+        config([ 'jwt.user' => \plunner\Company::class ]);
53 53
     }
54 54
 
55 55
     /**
@@ -76,22 +76,22 @@  discard block
 block discarded – undo
76 76
     protected function create(array $data)
77 77
     {
78 78
         return Company::create([
79
-            'name' => $data['name'],
80
-            'email' => $data['email'],
81
-            'password' => bcrypt($data['password']),
79
+            'name' => $data[ 'name' ],
80
+            'email' => $data[ 'email' ],
81
+            'password' => bcrypt($data[ 'password' ]),
82 82
         ]);
83 83
     }
84 84
 
85 85
     public function postLogin(Request $request)
86 86
     {
87 87
         //remember me
88
-        $this->validate($request, ['remember' => 'boolean']);//TODO insert required
89
-        if($request->input('remember', false))
88
+        $this->validate($request, [ 'remember' => 'boolean' ]); //TODO insert required
89
+        if ($request->input('remember', false))
90 90
         {
91
-            config(['jwt.ttl' =>'43200']); //30 days
92
-            $this->custom = array_merge($this->custom, ['remember'=>'true']);
93
-        }else
94
-            $this->custom = array_merge($this->custom, ['remember'=>'false']);
91
+            config([ 'jwt.ttl' =>'43200' ]); //30 days
92
+            $this->custom = array_merge($this->custom, [ 'remember'=>'true' ]);
93
+        } else
94
+            $this->custom = array_merge($this->custom, [ 'remember'=>'false' ]);
95 95
         return $this->postLoginOriginal($request);
96 96
     }
97 97
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -90,8 +90,9 @@
 block discarded – undo
90 90
         {
91 91
             config(['jwt.ttl' =>'43200']); //30 days
92 92
             $this->custom = array_merge($this->custom, ['remember'=>'true']);
93
-        }else
94
-            $this->custom = array_merge($this->custom, ['remember'=>'false']);
93
+        } else {
94
+                    $this->custom = array_merge($this->custom, ['remember'=>'false']);
95
+        }
95 96
         return $this->postLoginOriginal($request);
96 97
     }
97 98
 
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Auth/AuthController.php 3 patches
Unused Use Statements   +4 added lines, -5 removed lines patch added patch discarded remove patch
@@ -3,13 +3,12 @@
 block discarded – undo
3 3
 namespace plunner\Http\Controllers\Employees\Auth;
4 4
 
5 5
 use Illuminate\Http\Request;
6
-use plunner\Company;
7
-use plunner\employee;
8
-use Validator;
9
-use plunner\Http\Controllers\Controller;
10 6
 use Tymon\JWTAuth\Support\auth\AuthenticatesAndRegistersUsers;
11 7
 use Tymon\JWTAuth\Support\auth\ThrottlesLogins;
12
-use Log;
8
+use Validator;
9
+use plunner\Company;
10
+use plunner\Http\Controllers\Controller;
11
+use plunner\employee;
13 12
 
14 13
 class AuthController extends Controller
15 14
 {
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
      * en = employee normal
44 44
      * @var array
45 45
      */
46
-    protected $custom = ['mode'=>'en'];
46
+    protected $custom = [ 'mode'=>'en' ];
47 47
 
48 48
     /**
49 49
      * @var company
@@ -56,8 +56,8 @@  discard block
 block discarded – undo
56 56
      */
57 57
     public function __construct()
58 58
     {
59
-        config(['auth.model' => \plunner\Employee::class]);
60
-        config(['jwt.user' => \plunner\Employee::class]);
59
+        config([ 'auth.model' => \plunner\Employee::class ]);
60
+        config([ 'jwt.user' => \plunner\Employee::class ]);
61 61
     }
62 62
 
63 63
     /**
@@ -84,15 +84,15 @@  discard block
 block discarded – undo
84 84
     protected function create(array $data)
85 85
     {
86 86
         return $this->company->save(new employee([
87
-            'name' => $data['name'],
88
-            'email' => $data['email'],
89
-            'password' => bcrypt($data['password']),
87
+            'name' => $data[ 'name' ],
88
+            'email' => $data[ 'email' ],
89
+            'password' => bcrypt($data[ 'password' ]),
90 90
         ]));
91 91
     }
92 92
 
93 93
     public function postRegister(Request $request)
94 94
     {
95
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
95
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
96 96
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
97 97
         return $this->postRegisterOriginal($request);
98 98
     }
@@ -101,18 +101,18 @@  discard block
 block discarded – undo
101 101
     public function postLogin(Request $request)
102 102
     {
103 103
         //get company ID and impiled it in the request
104
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
104
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
105 105
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
106
-        $request->merge(['company_id' => $this->company->id]);
106
+        $request->merge([ 'company_id' => $this->company->id ]);
107 107
 
108 108
         //remember me
109
-        $this->validate($request, ['remember' => 'boolean']);//TODO insert required
110
-        if($request->input('remember', false))
109
+        $this->validate($request, [ 'remember' => 'boolean' ]); //TODO insert required
110
+        if ($request->input('remember', false))
111 111
         {
112
-            config(['jwt.ttl' =>'43200']); //30 days
113
-            $this->custom = array_merge($this->custom, ['remember'=>'true']);
114
-        }else
115
-            $this->custom = array_merge($this->custom, ['remember'=>'false']);
112
+            config([ 'jwt.ttl' =>'43200' ]); //30 days
113
+            $this->custom = array_merge($this->custom, [ 'remember'=>'true' ]);
114
+        } else
115
+            $this->custom = array_merge($this->custom, [ 'remember'=>'false' ]);
116 116
 
117 117
         return $this->postLoginOriginal($request);
118 118
     }
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -90,8 +90,9 @@
 block discarded – undo
90 90
         {
91 91
             config(['jwt.ttl' =>'43200']); //30 days
92 92
             $this->custom = array_merge($this->custom, ['remember'=>'true']);
93
-        }else
94
-            $this->custom = array_merge($this->custom, ['remember'=>'false']);
93
+        } else {
94
+                    $this->custom = array_merge($this->custom, ['remember'=>'false']);
95
+        }
95 96
         return $this->postLoginOriginal($request);
96 97
     }
97 98
 
Please login to merge, or discard this patch.
app/Http/Controllers/Companies/Groups/GroupsController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,8 +20,8 @@
 block discarded – undo
20 20
      */
21 21
     public function __construct()
22 22
     {
23
-        config(['auth.model' => \plunner\Company::class]);
24
-        config(['jwt.user' => \plunner\Company::class]);
23
+        config([ 'auth.model' => \plunner\Company::class ]);
24
+        config([ 'jwt.user' => \plunner\Company::class ]);
25 25
         $this->middleware('jwt.authandrefresh:mode-cn');
26 26
     }
27 27
 
Please login to merge, or discard this patch.
app/Timeslot.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.
app/PolicyCheckable.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -1,21 +1,21 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Created by PhpStorm.
4
- * User: Claudio Cardinale <[email protected]>
5
- * Date: 24/11/15
6
- * Time: 21.58
7
- * This program is free software; you can redistribute it and/or
8
- * modify it under the terms of the GNU General Public License
9
- * as published by the Free Software Foundation; either version 2
10
- * of the License, or (at your option) any later version.
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
- * GNU General Public License for more details.
15
- * You should have received a copy of the GNU General Public License
16
- * along with this program; if not, write to the Free Software
17
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
18
- */
3
+     * Created by PhpStorm.
4
+     * User: Claudio Cardinale <[email protected]>
5
+     * Date: 24/11/15
6
+     * Time: 21.58
7
+     * This program is free software; you can redistribute it and/or
8
+     * modify it under the terms of the GNU General Public License
9
+     * as published by the Free Software Foundation; either version 2
10
+     * of the License, or (at your option) any later version.
11
+     * This program is distributed in the hope that it will be useful,
12
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
+     * GNU General Public License for more details.
15
+     * You should have received a copy of the GNU General Public License
16
+     * along with this program; if not, write to the Free Software
17
+     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
18
+     */
19 19
 
20 20
 namespace plunner;
21 21
 
Please login to merge, or discard this patch.
app/Group.php 2 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -51,8 +51,9 @@
 block discarded – undo
51 51
 
52 52
     public function getPlannerNameAttribute()
53 53
     {
54
-        if(is_object($this->planner) && $this->planner->exists)
55
-            return $this->planner->name;
54
+        if(is_object($this->planner) && $this->planner->exists) {
55
+                    return $this->planner->name;
56
+        }
56 57
     }
57 58
 
58 59
     /**
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -44,21 +44,21 @@
 block discarded – undo
44 44
      *
45 45
      * @var array
46 46
      */
47
-    protected $fillable = ['name', 'description', 'planner_id'];
47
+    protected $fillable = [ 'name', 'description', 'planner_id' ];
48 48
 
49 49
     /**
50 50
      * @var array
51 51
      */
52
-    protected $hidden = ['planner', 'pivot'];
52
+    protected $hidden = [ 'planner', 'pivot' ];
53 53
 
54 54
     /**
55 55
      * @var array
56 56
      */
57
-    protected $appends = ['planner_name'];
57
+    protected $appends = [ 'planner_name' ];
58 58
 
59 59
     public function getPlannerNameAttribute()
60 60
     {
61
-        if(is_object($this->planner) && $this->planner->exists)
61
+        if (is_object($this->planner) && $this->planner->exists)
62 62
             return $this->planner->name;
63 63
         return null;
64 64
     }
Please login to merge, or discard this patch.
app/Http/Controllers/Companies/Groups/EmployeesController.php 3 patches
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,8 +3,8 @@
 block discarded – undo
3 3
 namespace plunner\Http\Controllers\Companies\Groups;
4 4
 
5 5
 use Illuminate\Support\Facades\Response;
6
-use plunner\Group;
7 6
 use plunner\Employee;
7
+use plunner\Group;
8 8
 use plunner\Http\Controllers\Controller;
9 9
 use plunner\Http\Requests\Companies\Groups\EmployeeRequest;
10 10
 
Please login to merge, or discard this 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.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -71,8 +71,9 @@
 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 77
         $employee->groups()->detach($groupId);
77 78
         return $group->employees;
78 79
     }
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.