opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update core 8.3.0

Browse source
This commit is contained in:
Rob Davies 2017-04-13 15:53:35 +01:00
parent da7a7918f8
commit cd7a898e66
6144 changed files with 132297 additions and 87747 deletions
Download patch file Download diff file Expand all files Collapse all files

20
web/core/modules/user/src/PermissionHandler.php
View file

@ -136,8 +136,8 @@ class PermissionHandler implements PermissionHandlerInterface {
* - provider: The provider of the permission.
*/
protected function buildPermissionsYaml() {
$all_permissions = array();
$all_callback_permissions = array();
$all_permissions = [];
$all_callback_permissions = [];
foreach ($this->getYamlDiscovery()->findAll() as $provider => $permissions) {
// The top-level 'permissions_callback' is a list of methods in controller
@ -151,15 +151,15 @@ class PermissionHandler implements PermissionHandlerInterface {
// defaults can then get processed below.
foreach ($callback_permissions as $name => $callback_permission) {
if (!is_array($callback_permission)) {
$callback_permission = array(
$callback_permission = [
'title' => $callback_permission,
);
];
}
$callback_permission += array(
$callback_permission += [
'description' => NULL,
'provider' => $provider,
);
];
$all_callback_permissions[$name] = $callback_permission;
}
@ -171,9 +171,9 @@ class PermissionHandler implements PermissionHandlerInterface {
foreach ($permissions as &$permission) {
if (!is_array($permission)) {
$permission = array(
$permission = [
'title' => $permission,
);
];
}
$permission['title'] = $this->t($permission['title']);
$permission['description'] = isset($permission['description']) ? $this->t($permission['description']) : NULL;
@ -198,7 +198,7 @@ class PermissionHandler implements PermissionHandlerInterface {
* - description: The description of the permission, defaults to NULL.
* - provider: The provider of the permission.
*/
protected function sortPermissions(array $all_permissions = array()) {
protected function sortPermissions(array $all_permissions = []) {
// Get a list of all the modules providing permissions and sort by
// display name.
$modules = $this->getModuleNames();
@ -221,7 +221,7 @@ class PermissionHandler implements PermissionHandlerInterface {
* Returns the human readable names of all modules keyed by machine name.
*/
protected function getModuleNames() {
$modules = array();
$modules = [];
foreach (array_keys($this->moduleHandler->getModuleList()) as $module) {
$modules[$module] = $this->moduleHandler->getName($module);
}