Completed
Push — master ( 486b73...844878 )
by claudio
03:43
created
migrations/2015_11_17_140639_create_password_resets_employees_table.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
      */
13 13
     public function up()
14 14
     {
15
-        Schema::create('password_resets_employees', function (Blueprint $table) {
15
+        Schema::create('password_resets_employees', function(Blueprint $table) {
16 16
             $table->string('email')->index();
17 17
             $table->string('token')->index();
18 18
             $table->timestamp('created_at');
Please login to merge, or discard this patch.
database/migrations/2015_11_17_150653_create_groups_table.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
      */
13 13
     public function up()
14 14
     {
15
-        Schema::create('groups', function (Blueprint $table) {
15
+        Schema::create('groups', function(Blueprint $table) {
16 16
             $table->increments('id');
17 17
             $table->timestamps();
18 18
             $table->string('name');
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
             $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade')->onUpdate('cascade');
22 22
             $table->integer('planner_id')->unsigned();
23 23
             $table->foreign('planner_id')->references('id')->on('employees')->onDelete('cascade')->onUpdate('cascade');
24
-            $table->unique(['name', 'company_id']);
24
+            $table->unique([ 'name', 'company_id' ]);
25 25
         });
26 26
     }
27 27
 
Please login to merge, or discard this patch.
database/migrations/2015_11_17_160832_create_pivot_employee_groups.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,12 +12,12 @@
 block discarded – undo
12 12
      */
13 13
     public function up()
14 14
     {
15
-        Schema::create('employee_groups', function (Blueprint $table) {
15
+        Schema::create('employee_groups', function(Blueprint $table) {
16 16
             $table->integer('employee_id')->unsigned();
17 17
             $table->foreign('employee_id')->references('id')->on('employees')->onDelete('cascade')->onUpdate('cascade');
18 18
             $table->integer('group_id')->unsigned();
19 19
             $table->foreign('group_id')->references('id')->on('groups')->onDelete('cascade')->onUpdate('cascade');
20
-            $table->unique(['employee_id', 'group_id']);
20
+            $table->unique([ 'employee_id', 'group_id' ]);
21 21
         });
22 22
     }
23 23
 
Please login to merge, or discard this patch.
database/seeds/InitSeeder.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,14 +33,14 @@
 block discarded – undo
33 33
 
34 34
     static private function company()
35 35
     {
36
-        factory(plunner\Company::class, 10)->create()->each(function ($company) {
36
+        factory(plunner\Company::class, 10)->create()->each(function($company) {
37 37
             self::employees($company);
38 38
         });
39 39
     }
40 40
 
41 41
     static private function employees($company)
42 42
     {
43
-        factory(plunner\Employee::class, 3)->make()->each(function ($employee) use($company){
43
+        factory(plunner\Employee::class, 3)->make()->each(function($employee) use($company){
44 44
             $company->employees()->save($employee);
45 45
         });
46 46
     }
Please login to merge, or discard this patch.
resources/lang/en/validation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -104,6 +104,6 @@
 block discarded – undo
104 104
     |
105 105
     */
106 106
 
107
-    'attributes' => [],
107
+    'attributes' => [ ],
108 108
 
109 109
 ];
Please login to merge, or discard this patch.
server.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
  */
9 9
 
10 10
 $uri = urldecode(
11
-    parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
11
+    parse_url($_SERVER[ 'REQUEST_URI' ], PHP_URL_PATH)
12 12
 );
13 13
 
14 14
 // This file allows us to emulate Apache's "mod_rewrite" functionality from the
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/EmployeesController.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -3,8 +3,6 @@
 block discarded – undo
3 3
 namespace plunner\Http\Controllers\Employees;
4 4
 
5 5
 use Illuminate\Http\Request;
6
-
7
-use plunner\Http\Requests;
8 6
 use plunner\Http\Controllers\Controller;
9 7
 
10 8
 class GroupsController extends Controller
Please login to merge, or discard this patch.
app/Company.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -51,14 +51,14 @@
 block discarded – undo
51 51
      *
52 52
      * @var array
53 53
      */
54
-    protected $fillable = ['name', 'email', 'password'];
54
+    protected $fillable = [ 'name', 'email', 'password' ];
55 55
 
56 56
     /**
57 57
      * The attributes excluded from the model's JSON form.
58 58
      *
59 59
      * @var array
60 60
      */
61
-    protected $hidden = ['password', 'remember_token'];
61
+    protected $hidden = [ 'password', 'remember_token' ];
62 62
 
63 63
     public function company()
64 64
     {
Please login to merge, or discard this patch.
app/Http/Middleware/GetUserAndRefresh.php 3 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,6 @@
 block discarded – undo
2 2
 
3 3
 namespace plunner\Http\Middleware;
4 4
 
5
-use Doctrine\Common\Util\Debug;
6 5
 use Log;
7 6
 use Tymon\JWTAuth\Exceptions\JWTException;
8 7
 use Tymon\JWTAuth\Exceptions\TokenExpiredException;
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -22,27 +22,27 @@  discard block
 block discarded – undo
22 22
     {
23 23
         $custom = $this->convertToArray($custom);
24 24
         $headers = $request->headers->all();
25
-        foreach($headers as $header)
26
-            Log::info('header: '.implode('-',$header));
25
+        foreach ($headers as $header)
26
+            Log::info('header: '.implode('-', $header));
27 27
 
28
-        if($token = $this->auth->setRequest($request)->getToken()) {
29
-        }else if ($this->auth->getUserModel()){
28
+        if ($token = $this->auth->setRequest($request)->getToken()) {
29
+        } else if ($this->auth->getUserModel()) {
30 30
             $token = $this->auth->fromUser($this->auth->getUserModel(), $custom);
31
-        }else {
31
+        } else {
32 32
             return $this->respond('tymon.jwt.absent', 'token_not_provided', 401);
33 33
         }
34 34
 
35 35
         try {
36 36
             $user = $this->auth->authenticate($token, $custom);
37 37
         } catch (TokenExpiredException $e) {
38
-            return $this->respond('tymon.jwt.expired', 'token_expired', $e->getStatusCode(), [$e]);
39
-        } catch(InvalidClaimException $e) {
40
-            return $this->respond('tymon.jwt.invalid', 'claim_invalid', $e->getStatusCode(), [$e]);
38
+            return $this->respond('tymon.jwt.expired', 'token_expired', $e->getStatusCode(), [ $e ]);
39
+        } catch (InvalidClaimException $e) {
40
+            return $this->respond('tymon.jwt.invalid', 'claim_invalid', $e->getStatusCode(), [ $e ]);
41 41
         } catch (JWTException $e) {
42
-            return $this->respond('tymon.jwt.invalid', 'token_invalid', $e->getStatusCode(), [$e]);
42
+            return $this->respond('tymon.jwt.invalid', 'token_invalid', $e->getStatusCode(), [ $e ]);
43 43
         }
44 44
 
45
-        if (! $user) {
45
+        if (!$user) {
46 46
             return $this->respond('tymon.jwt.user_not_found', 'user_not_found', 404);
47 47
         }
48 48
 
@@ -58,13 +58,13 @@  discard block
 block discarded – undo
58 58
         try {
59 59
             $newToken = $this->auth->refresh($token, $custom);
60 60
         } catch (TokenExpiredException $e) {
61
-            return $this->respond('tymon.jwt.expired', 'token_expired', $e->getStatusCode(), [$e]);
61
+            return $this->respond('tymon.jwt.expired', 'token_expired', $e->getStatusCode(), [ $e ]);
62 62
         } catch (JWTException $e) {
63
-            return $this->respond('tymon.jwt.invalid', 'token_invalid', $e->getStatusCode(), [$e]);
63
+            return $this->respond('tymon.jwt.invalid', 'token_invalid', $e->getStatusCode(), [ $e ]);
64 64
         }
65 65
 
66 66
         // send the refreshed token back to the client
67
-        $response->headers->set('Authorization', 'Bearer ' . $newToken);
67
+        $response->headers->set('Authorization', 'Bearer '.$newToken);
68 68
 
69 69
         return $response;
70 70
     }
Please login to merge, or discard this patch.
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -22,13 +22,14 @@
 block discarded – undo
22 22
     {
23 23
         $custom = $this->convertToArray($custom);
24 24
         $headers = $request->headers->all();
25
-        foreach($headers as $header)
26
-            Log::info('header: '.implode('-',$header));
25
+        foreach($headers as $header) {
26
+                    Log::info('header: '.implode('-',$header));
27
+        }
27 28
 
28 29
         if($token = $this->auth->setRequest($request)->getToken()) {
29
-        }else if ($this->auth->getUserModel()){
30
+        } else if ($this->auth->getUserModel()){
30 31
             $token = $this->auth->fromUser($this->auth->getUserModel(), $custom);
31
-        }else {
32
+        } else {
32 33
             return $this->respond('tymon.jwt.absent', 'token_not_provided', 401);
33 34
         }
34 35
 
Please login to merge, or discard this patch.