changed order of array merge in JWT (#1222)

* changed order of array merge in JWT to allow inline to overwrite default custom claim * syntax is important
tymondesigns · Jun 22, 2017 · 69973ed · 69973ed
1 parent 57853c0
commit 69973ed
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/JWT.php b/src/JWT.php
@@ -238,8 +238,8 @@ protected function getClaimsArray(JWTSubject $subject)
     {
         return array_merge(
             $this->getClaimsForSubject($subject),
-            $this->customClaims, // custom claims from inline setter
-            $subject->getJWTCustomClaims() // custom claims from JWTSubject method
+            $subject->getJWTCustomClaims(), // custom claims from JWTSubject method
+            $this->customClaims // custom claims from inline setter
         );
     }