Add key and values to arrayAll function.

ministryofjustice · Nov 27, 2024 · 9fea703 · 9fea703
1 parent ae55af9
commit 9fea703
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/public/app/mu-plugins/moj-auth/traits/jwt.php b/public/app/mu-plugins/moj-auth/traits/jwt.php
@@ -141,7 +141,6 @@ public function setJwt(object $args = new \stdClass()): array
      */
     public function verifyJwtRoles(array $jwt_roles): bool
     {
-
         $this->log('verifyJwtRoles()');
 
         if (!is_array($jwt_roles)) {
@@ -169,15 +168,15 @@ public function verifyJwtRoles(array $jwt_roles): bool
                 return false;
             }
 
-            return $this->arrayAll($conditions, function ($condition, $key) {
-                $method = 'verifyJwtRole' . ucfirst($key);
+            return $this->arrayAll($conditions, function ($condition_name, $condition_value) {
+                $method = 'verifyJwtRole' . ucfirst($condition_name);
 
                 if (!method_exists($this, $method)) {
                     $this->log('verifyJwtRoles() $method does not exist.', null, 'error');
                     return false;
                 }
 
-                return $this->$method($condition);
+                return $this->$method($condition_value);
             });
         });
     }

diff --git a/public/app/mu-plugins/moj-auth/traits/utils.php b/public/app/mu-plugins/moj-auth/traits/utils.php
@@ -128,8 +128,8 @@ public function arrayAny($array, $callback)
 
     public function arrayAll($array, $callback)
     {
-        foreach ($array as $entry) {
-            if (call_user_func($callback, $entry) === false)
+        foreach ($array as $key => $value) {
+            if (call_user_func($callback, $key, $value) === false)
                 return false;
         }
         return true;