commit 14655d0400383915a9292fcbb423006d09012d9d Author: Pieter Frenssen Date: Tue Sep 30 17:54:45 2014 +0200 69 diff --git a/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php b/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php index dca77bb..2a662a1 100644 --- a/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php +++ b/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php @@ -211,40 +211,43 @@ public function testHiddenUserSettings($field, $viewer, $target, $view, $edit) { * Provides test data for testHiddenUserSettings(). */ public function hiddenUserSettingsProvider() { - foreach (array( + $access_info = array(); + + $fields = array( 'preferred_langcode', 'preferred_admin_langcode', 'signature', 'signature_format', 'timezone', - 'mail') as $field - ) { - $access_info = array( - array( - 'field' => $field, - 'viewer' => 'viewer', - 'target' => 'viewer', - 'view' => TRUE, - 'edit' => TRUE, - ), - array( - 'field' => $field, - 'viewer' => 'viewer', - 'target' => 'owner', - 'view' => FALSE, - // Anyone with edit access to the user can also edit these fields. - 'edit' => TRUE, - ), - array( - 'field' => $field, - 'viewer' => 'admin', - 'target' => 'owner', - 'view' => TRUE, - 'edit' => TRUE, - ) + 'mail', + ); + + foreach ($fields as $field) { + $access_info[] = array( + 'field' => $field, + 'viewer' => 'viewer', + 'target' => 'viewer', + 'view' => TRUE, + 'edit' => TRUE, + ); + $access_info[] = array( + 'field' => $field, + 'viewer' => 'viewer', + 'target' => 'owner', + 'view' => FALSE, + // Anyone with edit access to the user can also edit these fields. + 'edit' => TRUE, + ); + $access_info[] = array( + 'field' => $field, + 'viewer' => 'admin', + 'target' => 'owner', + 'view' => TRUE, + 'edit' => TRUE, ); - return $access_info; } + + return $access_info; } /** @@ -260,38 +263,41 @@ public function testAdminFieldAccess($field, $viewer, $target, $view, $edit) { * Provides test data for testAdminFieldAccess(). */ public function adminFieldAccessProvider() { - foreach (array( + $access_info = array(); + + $fields = array( 'roles', 'status', 'access', 'login', - 'init') as $field - ) { - $access_info = array( - array( - 'field' => $field, - 'viewer' => 'viewer', - 'target' => 'viewer', - 'view' => FALSE, - 'edit' => FALSE, - ), - array( - 'field' => $field, - 'viewer' => 'viewer', - 'target' => 'owner', - 'view' => FALSE, - 'edit' => FALSE, - ), - array( - 'field' => $field, - 'viewer' => 'admin', - 'target' => 'owner', - 'view' => TRUE, - 'edit' => TRUE, - ) + 'init', + ); + + foreach ($fields as $field) { + $access_info[] = array( + 'field' => $field, + 'viewer' => 'viewer', + 'target' => 'viewer', + 'view' => FALSE, + 'edit' => FALSE, + ); + $access_info[] = array( + 'field' => $field, + 'viewer' => 'viewer', + 'target' => 'owner', + 'view' => FALSE, + 'edit' => FALSE, + ); + $access_info[] = array( + 'field' => $field, + 'viewer' => 'admin', + 'target' => 'owner', + 'view' => TRUE, + 'edit' => TRUE, ); - return $access_info; } + + return $access_info; } /**