diff --git a/core/modules/action/action.permissions.yml b/core/modules/action/action.permissions.yml
index 0f00dcd..2b734a3 100644
--- a/core/modules/action/action.permissions.yml
+++ b/core/modules/action/action.permissions.yml
@@ -1,2 +1,2 @@
-administer actions:
+administer_actions:
title: 'Administer actions'
diff --git a/core/modules/action/action.routing.yml b/core/modules/action/action.routing.yml
index c75ff23..2572a6a 100644
--- a/core/modules/action/action.routing.yml
+++ b/core/modules/action/action.routing.yml
@@ -4,7 +4,7 @@ action.admin:
_title: 'Actions'
_entity_list: 'action'
requirements:
- _permission: 'administer actions'
+ _permission: 'administer_actions'
action.admin_add:
path: '/admin/config/system/actions/add/{action_id}'
@@ -12,7 +12,7 @@ action.admin_add:
_entity_form: 'action.add'
_title: 'Add'
requirements:
- _permission: 'administer actions'
+ _permission: 'administer_actions'
entity.action.edit_form:
path: '/admin/config/system/actions/configure/{action}'
@@ -20,7 +20,7 @@ entity.action.edit_form:
_entity_form: 'action.edit'
_title: 'Edit'
requirements:
- _permission: 'administer actions'
+ _permission: 'administer_actions'
entity.action.delete_form:
path: '/admin/config/system/actions/configure/{action}/delete'
@@ -28,5 +28,5 @@ entity.action.delete_form:
_entity_form: 'action.delete'
_title: 'Delete'
requirements:
- _permission: 'administer actions'
+ _permission: 'administer_actions'
diff --git a/core/modules/action/src/Tests/ConfigurationTest.php b/core/modules/action/src/Tests/ConfigurationTest.php
index 42da0a6..60b53d8 100644
--- a/core/modules/action/src/Tests/ConfigurationTest.php
+++ b/core/modules/action/src/Tests/ConfigurationTest.php
@@ -30,7 +30,7 @@ class ConfigurationTest extends WebTestBase {
*/
function testActionConfiguration() {
// Create a user with permission to view the actions administration pages.
- $user = $this->drupalCreateUser(array('administer actions'));
+ $user = $this->drupalCreateUser(array('administer_actions'));
$this->drupalLogin($user);
// Make a POST request to admin/config/system/actions.
diff --git a/core/modules/aggregator/aggregator.permissions.yml b/core/modules/aggregator/aggregator.permissions.yml
index e96ddb4..7b1dcb8 100644
--- a/core/modules/aggregator/aggregator.permissions.yml
+++ b/core/modules/aggregator/aggregator.permissions.yml
@@ -1,4 +1,4 @@
-administer news feeds:
+administer_news_feeds:
title: 'Administer news feeds'
-access news feeds:
+access_news_feeds:
title: 'View news feeds'
diff --git a/core/modules/aggregator/aggregator.routing.yml b/core/modules/aggregator/aggregator.routing.yml
index 58d7fcf..7c54d23 100644
--- a/core/modules/aggregator/aggregator.routing.yml
+++ b/core/modules/aggregator/aggregator.routing.yml
@@ -4,7 +4,7 @@ aggregator.admin_overview:
_content: '\Drupal\aggregator\Controller\AggregatorController::adminOverview'
_title: 'Feed aggregator'
requirements:
- _permission: 'administer news feeds'
+ _permission: 'administer_news_feeds'
aggregator.admin_settings:
path: '/admin/config/services/aggregator/settings'
@@ -12,7 +12,7 @@ aggregator.admin_settings:
_form: '\Drupal\aggregator\Form\SettingsForm'
_title: 'Settings'
requirements:
- _permission: 'administer news feeds'
+ _permission: 'administer_news_feeds'
aggregator.feed_items_delete:
path: '/admin/config/services/aggregator/delete/{aggregator_feed}'
@@ -20,7 +20,7 @@ aggregator.feed_items_delete:
_entity_form: 'aggregator_feed.delete_items'
_title: 'Delete items'
requirements:
- _permission: 'administer news feeds'
+ _permission: 'administer_news_feeds'
aggregator.feed_refresh:
path: '/admin/config/services/aggregator/update/{aggregator_feed}'
@@ -28,7 +28,7 @@ aggregator.feed_refresh:
_content: '\Drupal\aggregator\Controller\AggregatorController::feedRefresh'
_title: 'Update items'
requirements:
- _permission: 'administer news feeds'
+ _permission: 'administer_news_feeds'
_csrf_token: 'TRUE'
aggregator.opml_add:
@@ -37,7 +37,7 @@ aggregator.opml_add:
_form: '\Drupal\aggregator\Form\OpmlFeedAdd'
_title: 'Import OPML'
requirements:
- _permission: 'administer news feeds'
+ _permission: 'administer_news_feeds'
aggregator.feed_add:
path: '/aggregator/sources/add'
@@ -45,7 +45,7 @@ aggregator.feed_add:
_content: '\Drupal\aggregator\Controller\AggregatorController::feedAdd'
_title: 'Add feed'
requirements:
- _permission: 'administer news feeds'
+ _permission: 'administer_news_feeds'
options:
_admin_route: TRUE
@@ -55,7 +55,7 @@ entity.aggregator_feed.canonical:
_entity_view: 'aggregator_feed'
_title_callback: '\Drupal\aggregator\Controller\AggregatorController::feedTitle'
requirements:
- _permission: 'access news feeds'
+ _permission: 'access_news_feeds'
entity.aggregator_feed.edit_form:
path: '/aggregator/sources/{aggregator_feed}/configure'
@@ -63,7 +63,7 @@ entity.aggregator_feed.edit_form:
_entity_form: 'aggregator_feed.default'
_title: 'Configure'
requirements:
- _permission: 'administer news feeds'
+ _permission: 'administer_news_feeds'
options:
_admin_route: TRUE
@@ -73,7 +73,7 @@ entity.aggregator_feed.delete_form:
_entity_form: 'aggregator_feed.delete'
_title: 'Delete feed'
requirements:
- _permission: 'administer news feeds'
+ _permission: 'administer_news_feeds'
options:
_admin_route: TRUE
@@ -83,4 +83,4 @@ aggregator.page_last:
_content: '\Drupal\aggregator\Controller\AggregatorController::pageLast'
_title: 'Feed aggregator'
requirements:
- _permission: 'access news feeds'
+ _permission: 'access_news_feeds'
diff --git a/core/modules/aggregator/config/install/views.view.aggregator_sources.yml b/core/modules/aggregator/config/install/views.view.aggregator_sources.yml
index c2f90ad..b477c48 100644
--- a/core/modules/aggregator/config/install/views.view.aggregator_sources.yml
+++ b/core/modules/aggregator/config/install/views.view.aggregator_sources.yml
@@ -22,7 +22,7 @@ display:
access:
type: perm
options:
- perm: 'access news feeds'
+ perm: 'access_news_feeds'
provider: null
cache:
type: none
diff --git a/core/modules/aggregator/src/FeedAccessControlHandler.php b/core/modules/aggregator/src/FeedAccessControlHandler.php
index f147c53..d6b6199 100644
--- a/core/modules/aggregator/src/FeedAccessControlHandler.php
+++ b/core/modules/aggregator/src/FeedAccessControlHandler.php
@@ -25,11 +25,11 @@ class FeedAccessControlHandler extends EntityAccessControlHandler {
protected function checkAccess(EntityInterface $entity, $operation, $langcode, AccountInterface $account) {
switch ($operation) {
case 'view':
- return AccessResult::allowedIfHasPermission($account, 'access news feeds');
+ return AccessResult::allowedIfHasPermission($account, 'access_news_feeds');
break;
default:
- return AccessResult::allowedIfHasPermission($account, 'administer news feeds');
+ return AccessResult::allowedIfHasPermission($account, 'administer_news_feeds');
break;
}
}
@@ -38,7 +38,7 @@ protected function checkAccess(EntityInterface $entity, $operation, $langcode, A
* {@inheritdoc}
*/
protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) {
- return AccessResult::allowedIfHasPermission($account, 'administer news feeds');
+ return AccessResult::allowedIfHasPermission($account, 'administer_news_feeds');
}
}
diff --git a/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php b/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php
index 16ca1af..ba1163f 100644
--- a/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php
+++ b/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php
@@ -110,8 +110,8 @@ public function defaultConfiguration() {
* {@inheritdoc}
*/
protected function blockAccess(AccountInterface $account) {
- // Only grant access to users with the 'access news feeds' permission.
- return $account->hasPermission('access news feeds');
+ // Only grant access to users with the 'access_news_feeds' permission.
+ return $account->hasPermission('access_news_feeds');
}
/**
diff --git a/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php b/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php
index 844f0b1..1e79d97 100644
--- a/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php
+++ b/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php
@@ -34,10 +34,10 @@ public function testBlockLinks() {
// Need admin user to be able to access block admin.
$admin_user = $this->drupalCreateUser(array(
- 'administer blocks',
+ 'administer_blocks',
'access administration pages',
- 'administer news feeds',
- 'access news feeds',
+ 'administer_news_feeds',
+ 'access_news_feeds',
));
$this->drupalLogin($admin_user);
diff --git a/core/modules/aggregator/src/Tests/AggregatorTestBase.php b/core/modules/aggregator/src/Tests/AggregatorTestBase.php
index 57fcf88..c2b6e57 100644
--- a/core/modules/aggregator/src/Tests/AggregatorTestBase.php
+++ b/core/modules/aggregator/src/Tests/AggregatorTestBase.php
@@ -31,7 +31,7 @@ protected function setUp() {
$this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
}
- $web_user = $this->drupalCreateUser(array('access administration pages', 'administer news feeds', 'access news feeds', 'create article content'));
+ $web_user = $this->drupalCreateUser(array('access administration pages', 'administer_news_feeds', 'access_news_feeds', 'create article content'));
$this->drupalLogin($web_user);
}
diff --git a/core/modules/aggregator/src/Tests/FeedCacheTagsTest.php b/core/modules/aggregator/src/Tests/FeedCacheTagsTest.php
index 2ad5f5a..293d755 100644
--- a/core/modules/aggregator/src/Tests/FeedCacheTagsTest.php
+++ b/core/modules/aggregator/src/Tests/FeedCacheTagsTest.php
@@ -37,7 +37,7 @@ protected function setUp() {
// Give anonymous users permission to access feeds, so that we can verify
// the cache tags of cached versions of feeds.
$user_role = Role::load(DRUPAL_ANONYMOUS_RID);
- $user_role->grantPermission('access news feeds');
+ $user_role->grantPermission('access_news_feeds');
$user_role->save();
}
diff --git a/core/modules/aggregator/src/Tests/ImportOpmlTest.php b/core/modules/aggregator/src/Tests/ImportOpmlTest.php
index 821a34a..246b6b2 100644
--- a/core/modules/aggregator/src/Tests/ImportOpmlTest.php
+++ b/core/modules/aggregator/src/Tests/ImportOpmlTest.php
@@ -24,7 +24,7 @@ class ImportOpmlTest extends AggregatorTestBase {
protected function setUp() {
parent::setUp();
- $admin_user = $this->drupalCreateUser(array('administer news feeds', 'access news feeds', 'create article content', 'administer blocks'));
+ $admin_user = $this->drupalCreateUser(array('administer_news_feeds', 'access_news_feeds', 'create article content', 'administer_blocks'));
$this->drupalLogin($admin_user);
}
diff --git a/core/modules/aggregator/src/Tests/ItemCacheTagsTest.php b/core/modules/aggregator/src/Tests/ItemCacheTagsTest.php
index f79a53c..178550f 100644
--- a/core/modules/aggregator/src/Tests/ItemCacheTagsTest.php
+++ b/core/modules/aggregator/src/Tests/ItemCacheTagsTest.php
@@ -38,7 +38,7 @@ protected function setUp() {
// Give anonymous users permission to access feeds, so that we can verify
// the cache tags of cached versions of feed items.
$user_role = Role::load(DRUPAL_ANONYMOUS_RID);
- $user_role->grantPermission('access news feeds');
+ $user_role->grantPermission('access_news_feeds');
$user_role->save();
}
diff --git a/core/modules/ban/ban.permissions.yml b/core/modules/ban/ban.permissions.yml
index 7f385fd..c15eced 100644
--- a/core/modules/ban/ban.permissions.yml
+++ b/core/modules/ban/ban.permissions.yml
@@ -1,2 +1,2 @@
-ban IP addresses:
+ban_IP_addresses:
title: 'Ban IP addresses'
diff --git a/core/modules/ban/ban.routing.yml b/core/modules/ban/ban.routing.yml
index 2420dc0..e388053 100644
--- a/core/modules/ban/ban.routing.yml
+++ b/core/modules/ban/ban.routing.yml
@@ -5,7 +5,7 @@ ban.admin_page:
_title: 'IP address bans'
default_ip: ''
requirements:
- _permission: 'ban IP addresses'
+ _permission: 'ban_IP_addresses'
ban.delete:
path: '/admin/config/people/ban/delete/{ban_id}'
@@ -13,4 +13,4 @@ ban.delete:
_form: '\Drupal\ban\Form\BanDelete'
_title: 'Delete IP address'
requirements:
- _permission: 'ban IP addresses'
+ _permission: 'ban_IP_addresses'
diff --git a/core/modules/ban/src/Tests/IpAddressBlockingTest.php b/core/modules/ban/src/Tests/IpAddressBlockingTest.php
index 0122ceb..6fbbcd7 100644
--- a/core/modules/ban/src/Tests/IpAddressBlockingTest.php
+++ b/core/modules/ban/src/Tests/IpAddressBlockingTest.php
@@ -28,7 +28,7 @@ class IpAddressBlockingTest extends WebTestBase {
*/
function testIPAddressValidation() {
// Create user.
- $admin_user = $this->drupalCreateUser(array('ban IP addresses'));
+ $admin_user = $this->drupalCreateUser(array('ban_IP_addresses'));
$this->drupalLogin($admin_user);
$this->drupalGet('admin/config/people/ban');
diff --git a/core/modules/block/block.permissions.yml b/core/modules/block/block.permissions.yml
index 83f35cd..c2f2d72 100644
--- a/core/modules/block/block.permissions.yml
+++ b/core/modules/block/block.permissions.yml
@@ -1,2 +1,2 @@
-administer blocks:
+administer_blocks:
title: 'Administer blocks'
diff --git a/core/modules/block/block.routing.yml b/core/modules/block/block.routing.yml
index d4276f5..bca4015 100644
--- a/core/modules/block/block.routing.yml
+++ b/core/modules/block/block.routing.yml
@@ -5,7 +5,7 @@ block.admin_demo:
_title_callback: 'theme_handler:getName'
requirements:
_access_theme: 'TRUE'
- _permission: 'administer blocks'
+ _permission: 'administer_blocks'
options:
_admin_route: FALSE
@@ -15,7 +15,7 @@ entity.block.delete_form:
_entity_form: 'block.delete'
_title: 'Delete block'
requirements:
- _permission: 'administer blocks'
+ _permission: 'administer_blocks'
entity.block.edit_form:
path: '/admin/structure/block/manage/{block}'
@@ -31,7 +31,7 @@ block.admin_display:
_content: '\Drupal\block\Controller\BlockListController::listing'
_title: 'Block layout'
requirements:
- _permission: 'administer blocks'
+ _permission: 'administer_blocks'
block.admin_display_theme:
path: 'admin/structure/block/list/{theme}'
@@ -40,7 +40,7 @@ block.admin_display_theme:
_title: 'Block layout'
requirements:
_access_theme: 'TRUE'
- _permission: 'administer blocks'
+ _permission: 'administer_blocks'
block.admin_add:
path: '/admin/structure/block/add/{plugin_id}/{theme}'
@@ -49,11 +49,11 @@ block.admin_add:
theme: null
_title: 'Configure block'
requirements:
- _permission: 'administer blocks'
+ _permission: 'administer_blocks'
block.category_autocomplete:
path: '/block-category/autocomplete'
defaults:
_controller: '\Drupal\block\Controller\CategoryAutocompleteController::autocomplete'
requirements:
- _permission: 'administer blocks'
+ _permission: 'administer_blocks'
diff --git a/core/modules/block/src/Entity/Block.php b/core/modules/block/src/Entity/Block.php
index 6f7f276..34edc6c 100644
--- a/core/modules/block/src/Entity/Block.php
+++ b/core/modules/block/src/Entity/Block.php
@@ -30,7 +30,7 @@
* "delete" = "Drupal\block\Form\BlockDeleteForm"
* }
* },
- * admin_permission = "administer blocks",
+ * admin_permission = "administer_blocks",
* entity_keys = {
* "id" = "id"
* },
diff --git a/core/modules/block/src/Tests/BlockAdminThemeTest.php b/core/modules/block/src/Tests/BlockAdminThemeTest.php
index 9a86f29..ad93077 100644
--- a/core/modules/block/src/Tests/BlockAdminThemeTest.php
+++ b/core/modules/block/src/Tests/BlockAdminThemeTest.php
@@ -28,7 +28,7 @@ class BlockAdminThemeTest extends WebTestBase {
*/
function testAdminTheme() {
// Create administrative user.
- $admin_user = $this->drupalCreateUser(array('administer blocks', 'administer themes'));
+ $admin_user = $this->drupalCreateUser(array('administer_blocks', 'administer themes'));
$this->drupalLogin($admin_user);
// Ensure that access to block admin page is denied when theme is not
diff --git a/core/modules/block/src/Tests/BlockCacheTest.php b/core/modules/block/src/Tests/BlockCacheTest.php
index fd9fc88..8ee621f 100644
--- a/core/modules/block/src/Tests/BlockCacheTest.php
+++ b/core/modules/block/src/Tests/BlockCacheTest.php
@@ -39,7 +39,7 @@ protected function setUp() {
parent::setUp();
// Create an admin user, log in and enable test blocks.
- $this->admin_user = $this->drupalCreateUser(array('administer blocks', 'access administration pages'));
+ $this->admin_user = $this->drupalCreateUser(array('administer_blocks', 'access administration pages'));
$this->drupalLogin($this->admin_user);
// Create additional users to test caching modes.
diff --git a/core/modules/block/src/Tests/BlockHiddenRegionTest.php b/core/modules/block/src/Tests/BlockHiddenRegionTest.php
index 95b06f3..5d80474 100644
--- a/core/modules/block/src/Tests/BlockHiddenRegionTest.php
+++ b/core/modules/block/src/Tests/BlockHiddenRegionTest.php
@@ -34,7 +34,7 @@ protected function setUp() {
// Create administrative user.
$this->adminUser = $this->drupalCreateUser(array(
- 'administer blocks',
+ 'administer_blocks',
'administer themes',
'search content',
)
diff --git a/core/modules/block/src/Tests/BlockHookOperationTest.php b/core/modules/block/src/Tests/BlockHookOperationTest.php
index c5758d3..49aa749 100644
--- a/core/modules/block/src/Tests/BlockHookOperationTest.php
+++ b/core/modules/block/src/Tests/BlockHookOperationTest.php
@@ -28,7 +28,7 @@ protected function setUp() {
parent::setUp();
$permissions = array(
- 'administer blocks',
+ 'administer_blocks',
);
// Create and log in user.
diff --git a/core/modules/block/src/Tests/BlockInvalidRegionTest.php b/core/modules/block/src/Tests/BlockInvalidRegionTest.php
index 246684b..60e5ed7 100644
--- a/core/modules/block/src/Tests/BlockInvalidRegionTest.php
+++ b/core/modules/block/src/Tests/BlockInvalidRegionTest.php
@@ -31,7 +31,7 @@ protected function setUp() {
$admin_user = $this->drupalCreateUser(array(
'administer site configuration',
'access administration pages',
- 'administer blocks',
+ 'administer_blocks',
));
$this->drupalLogin($admin_user);
}
diff --git a/core/modules/block/src/Tests/BlockLanguageCacheTest.php b/core/modules/block/src/Tests/BlockLanguageCacheTest.php
index 432c387..8bd4b70 100644
--- a/core/modules/block/src/Tests/BlockLanguageCacheTest.php
+++ b/core/modules/block/src/Tests/BlockLanguageCacheTest.php
@@ -53,7 +53,7 @@ protected function setUp() {
public function testBlockLinks() {
// Create admin user to be able to access block admin.
$admin_user = $this->drupalCreateUser(array(
- 'administer blocks',
+ 'administer_blocks',
'access administration pages',
'administer menu',
));
diff --git a/core/modules/block/src/Tests/BlockLanguageTest.php b/core/modules/block/src/Tests/BlockLanguageTest.php
index 380c65c..65d00b0 100644
--- a/core/modules/block/src/Tests/BlockLanguageTest.php
+++ b/core/modules/block/src/Tests/BlockLanguageTest.php
@@ -34,7 +34,7 @@ protected function setUp() {
parent::setUp();
// Create a new user, allow him to manage the blocks and the languages.
- $this->adminUser = $this->drupalCreateUser(array('administer blocks', 'administer languages', 'administer site configuration'));
+ $this->adminUser = $this->drupalCreateUser(array('administer_blocks', 'administer languages', 'administer site configuration'));
$this->drupalLogin($this->adminUser);
// Add predefined language.
diff --git a/core/modules/block/src/Tests/BlockTestBase.php b/core/modules/block/src/Tests/BlockTestBase.php
index 5f33eb9..79e115c 100644
--- a/core/modules/block/src/Tests/BlockTestBase.php
+++ b/core/modules/block/src/Tests/BlockTestBase.php
@@ -51,7 +51,7 @@ protected function setUp() {
// Create and log in an administrative user having access to the Full HTML
// text format.
$this->adminUser = $this->drupalCreateUser(array(
- 'administer blocks',
+ 'administer_blocks',
$full_html_format->getPermissionName(),
'access administration pages',
));
diff --git a/core/modules/block/src/Tests/BlockTitleXSSTest.php b/core/modules/block/src/Tests/BlockTitleXSSTest.php
index 9eca4b5..9ffdcf6 100644
--- a/core/modules/block/src/Tests/BlockTitleXSSTest.php
+++ b/core/modules/block/src/Tests/BlockTitleXSSTest.php
@@ -37,7 +37,7 @@ function testXSSInTitle() {
$this->drupalGet('');
$this->assertNoRaw('', 'The block title was properly sanitized when rendered.');
- $this->drupalLogin($this->drupalCreateUser(array('administer blocks', 'access administration pages')));
+ $this->drupalLogin($this->drupalCreateUser(array('administer_blocks', 'access administration pages')));
$default_theme = \Drupal::config('system.theme')->get('default');
$this->drupalGet('admin/structure/block/list/' . $default_theme);
$this->assertNoRaw("", 'The block title was properly sanitized in Block Plugin UI Admin page.');
diff --git a/core/modules/block/src/Tests/BlockUiTest.php b/core/modules/block/src/Tests/BlockUiTest.php
index 7b6f945..1178ae9 100644
--- a/core/modules/block/src/Tests/BlockUiTest.php
+++ b/core/modules/block/src/Tests/BlockUiTest.php
@@ -48,7 +48,7 @@ protected function setUp() {
parent::setUp();
// Create and log in an administrative user.
$this->adminUser = $this->drupalCreateUser(array(
- 'administer blocks',
+ 'administer_blocks',
'access administration pages',
));
$this->drupalLogin($this->adminUser);
diff --git a/core/modules/block/src/Tests/NonDefaultBlockAdminTest.php b/core/modules/block/src/Tests/NonDefaultBlockAdminTest.php
index c2e7e03..9b16e76 100644
--- a/core/modules/block/src/Tests/NonDefaultBlockAdminTest.php
+++ b/core/modules/block/src/Tests/NonDefaultBlockAdminTest.php
@@ -27,7 +27,7 @@ class NonDefaultBlockAdminTest extends WebTestBase {
* Test non-default theme admin.
*/
function testNonDefaultBlockAdmin() {
- $admin_user = $this->drupalCreateUser(array('administer blocks', 'administer themes'));
+ $admin_user = $this->drupalCreateUser(array('administer_blocks', 'administer themes'));
$this->drupalLogin($admin_user);
$new_theme = 'bartik';
\Drupal::service('theme_handler')->install(array($new_theme));
diff --git a/core/modules/block/src/Tests/Views/DisplayBlockTest.php b/core/modules/block/src/Tests/Views/DisplayBlockTest.php
index 3c0deab..5a4f602 100644
--- a/core/modules/block/src/Tests/Views/DisplayBlockTest.php
+++ b/core/modules/block/src/Tests/Views/DisplayBlockTest.php
@@ -47,7 +47,7 @@ protected function setUp() {
* Tests default and custom block categories.
*/
public function testBlockCategory() {
- $this->drupalLogin($this->drupalCreateUser(array('administer views', 'administer blocks')));
+ $this->drupalLogin($this->drupalCreateUser(array('administer views', 'administer_blocks')));
// Create a new view in the UI.
$edit = array();
@@ -182,7 +182,7 @@ protected function testDeleteBlockDisplay() {
* Test the block form for a Views block.
*/
public function testViewsBlockForm() {
- $this->drupalLogin($this->drupalCreateUser(array('administer blocks')));
+ $this->drupalLogin($this->drupalCreateUser(array('administer_blocks')));
$default_theme = \Drupal::config('system.theme')->get('default');
$this->drupalGet('admin/structure/block/add/views_block:test_view_block-block_1/' . $default_theme);
$elements = $this->xpath('//input[@name="label"]');
@@ -270,7 +270,7 @@ public function testBlockRendering() {
* Tests the contextual links on a Views block.
*/
public function testBlockContextualLinks() {
- $this->drupalLogin($this->drupalCreateUser(array('administer views', 'access contextual links', 'administer blocks')));
+ $this->drupalLogin($this->drupalCreateUser(array('administer views', 'access contextual links', 'administer_blocks')));
$block = $this->drupalPlaceBlock('views_block:test_view_block-block_1');
$cached_block = $this->drupalPlaceBlock('views_block:test_view_block-block_1', array('cache' => array('max_age' => 3600)));
$this->drupalGet('test-page');
diff --git a/core/modules/block_content/block_content.routing.yml b/core/modules/block_content/block_content.routing.yml
index 1628b89..757f87c 100644
--- a/core/modules/block_content/block_content.routing.yml
+++ b/core/modules/block_content/block_content.routing.yml
@@ -4,7 +4,7 @@ block_content.type_list:
_entity_list: 'block_content_type'
_title: 'Edit'
requirements:
- _permission: 'administer blocks'
+ _permission: 'administer_blocks'
block_content.add_page:
path: '/block/add'
@@ -14,7 +14,7 @@ block_content.add_page:
options:
_admin_route: TRUE
requirements:
- _permission: 'administer blocks'
+ _permission: 'administer_blocks'
block_content.add_form:
path: '/block/add/{block_content_type}'
@@ -24,7 +24,7 @@ block_content.add_form:
options:
_admin_route: TRUE
requirements:
- _permission: 'administer blocks'
+ _permission: 'administer_blocks'
entity.block_content_type.delete_form:
path: '/admin/structure/block/block-content/manage/{block_content_type}/delete'
@@ -61,7 +61,7 @@ block_content.type_add:
_entity_form: 'block_content_type.add'
_title: 'Add'
requirements:
- _permission: 'administer blocks'
+ _permission: 'administer_blocks'
entity.block_content_type.edit_form:
path: '/admin/structure/block/block-content/manage/{block_content_type}'
@@ -77,4 +77,4 @@ block_content.list:
_title: 'Custom block library'
_entity_list: 'block_content'
requirements:
- _permission: 'administer blocks'
+ _permission: 'administer_blocks'
diff --git a/core/modules/block_content/src/BlockContentForm.php b/core/modules/block_content/src/BlockContentForm.php
index 769a7f3..4b8538a 100644
--- a/core/modules/block_content/src/BlockContentForm.php
+++ b/core/modules/block_content/src/BlockContentForm.php
@@ -141,14 +141,14 @@ public function form(array $form, FormStateInterface $form_state) {
'library' => array('block_content/drupal.block_content'),
),
'#weight' => 20,
- '#access' => $block->isNewRevision() || $account->hasPermission('administer blocks'),
+ '#access' => $block->isNewRevision() || $account->hasPermission('administer_blocks'),
);
$form['revision_information']['revision'] = array(
'#type' => 'checkbox',
'#title' => $this->t('Create new revision'),
'#default_value' => $block->isNewRevision(),
- '#access' => $account->hasPermission('administer blocks'),
+ '#access' => $account->hasPermission('administer_blocks'),
);
// Check the revision log checkbox when the log textarea is filled in.
diff --git a/core/modules/block_content/src/Entity/BlockContent.php b/core/modules/block_content/src/Entity/BlockContent.php
index e2320bd..437fe6f 100644
--- a/core/modules/block_content/src/Entity/BlockContent.php
+++ b/core/modules/block_content/src/Entity/BlockContent.php
@@ -34,7 +34,7 @@
* },
* "translation" = "Drupal\block_content\BlockContentTranslationHandler"
* },
- * admin_permission = "administer blocks",
+ * admin_permission = "administer_blocks",
* base_table = "block_content",
* revision_table = "block_content_revision",
* data_table = "block_content_field_data",
diff --git a/core/modules/block_content/src/Entity/BlockContentType.php b/core/modules/block_content/src/Entity/BlockContentType.php
index 007ebfb..5849b35 100644
--- a/core/modules/block_content/src/Entity/BlockContentType.php
+++ b/core/modules/block_content/src/Entity/BlockContentType.php
@@ -27,7 +27,7 @@
* },
* "list_builder" = "Drupal\block_content\BlockContentTypeListBuilder"
* },
- * admin_permission = "administer blocks",
+ * admin_permission = "administer_blocks",
* config_prefix = "type",
* bundle_of = "block_content",
* entity_keys = {
diff --git a/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php b/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
index 51ea7e5..33cf2a5 100644
--- a/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
+++ b/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
@@ -160,7 +160,7 @@ public function build() {
'%uuid' => $uuid,
'!url' => $this->urlGenerator->generate('block_content.add_page')
)),
- '#access' => $this->account->hasPermission('administer blocks')
+ '#access' => $this->account->hasPermission('administer_blocks')
);
}
}
diff --git a/core/modules/block_content/src/Tests/BlockContentListTest.php b/core/modules/block_content/src/Tests/BlockContentListTest.php
index 07a3299..b875506 100644
--- a/core/modules/block_content/src/Tests/BlockContentListTest.php
+++ b/core/modules/block_content/src/Tests/BlockContentListTest.php
@@ -28,7 +28,7 @@ class BlockContentListTest extends WebTestBase {
* Tests the custom block listing page.
*/
public function testListing() {
- $this->drupalLogin($this->drupalCreateUser(array('administer blocks', 'translate configuration')));
+ $this->drupalLogin($this->drupalCreateUser(array('administer_blocks', 'translate configuration')));
$this->drupalGet('admin/structure/block/block-content');
// Test for the page title.
diff --git a/core/modules/block_content/src/Tests/BlockContentTestBase.php b/core/modules/block_content/src/Tests/BlockContentTestBase.php
index 5bb7122..870045c 100644
--- a/core/modules/block_content/src/Tests/BlockContentTestBase.php
+++ b/core/modules/block_content/src/Tests/BlockContentTestBase.php
@@ -32,7 +32,7 @@
* @var array
*/
protected $permissions = array(
- 'administer blocks'
+ 'administer_blocks'
);
/**
diff --git a/core/modules/block_content/src/Tests/BlockContentTranslationUITest.php b/core/modules/block_content/src/Tests/BlockContentTranslationUITest.php
index aec6f69..8c58d6c 100644
--- a/core/modules/block_content/src/Tests/BlockContentTranslationUITest.php
+++ b/core/modules/block_content/src/Tests/BlockContentTranslationUITest.php
@@ -47,7 +47,7 @@ public function getTranslatorPermissions() {
return array_merge(parent::getTranslatorPermissions(), array(
'translate any entity',
'access administration pages',
- 'administer blocks',
+ 'administer_blocks',
'administer block_content fields'
));
}
diff --git a/core/modules/block_content/src/Tests/BlockContentTypeTest.php b/core/modules/block_content/src/Tests/BlockContentTypeTest.php
index 76dfdb7..350c6f5 100644
--- a/core/modules/block_content/src/Tests/BlockContentTypeTest.php
+++ b/core/modules/block_content/src/Tests/BlockContentTypeTest.php
@@ -27,7 +27,7 @@ class BlockContentTypeTest extends BlockContentTestBase {
* @var array
*/
protected $permissions = array(
- 'administer blocks',
+ 'administer_blocks',
'administer block_content fields'
);
diff --git a/core/modules/book/src/Tests/BookTest.php b/core/modules/book/src/Tests/BookTest.php
index b229104..875fb96 100644
--- a/core/modules/book/src/Tests/BookTest.php
+++ b/core/modules/book/src/Tests/BookTest.php
@@ -61,7 +61,7 @@ protected function setUp() {
// Create users.
$this->book_author = $this->drupalCreateUser(array('create new books', 'create book content', 'edit own book content', 'add content to books'));
$this->web_user = $this->drupalCreateUser(array('access printer-friendly version', 'node test view'));
- $this->admin_user = $this->drupalCreateUser(array('create new books', 'create book content', 'edit own book content', 'add content to books', 'administer blocks', 'administer permissions', 'administer book outlines', 'node test view', 'administer content types', 'administer site configuration'));
+ $this->admin_user = $this->drupalCreateUser(array('create new books', 'create book content', 'edit own book content', 'add content to books', 'administer_blocks', 'administer permissions', 'administer book outlines', 'node test view', 'administer content types', 'administer site configuration'));
}
/**
diff --git a/core/modules/comment/src/Tests/CommentBlockTest.php b/core/modules/comment/src/Tests/CommentBlockTest.php
index fc6c1bf..c9b1c2d 100644
--- a/core/modules/comment/src/Tests/CommentBlockTest.php
+++ b/core/modules/comment/src/Tests/CommentBlockTest.php
@@ -24,7 +24,7 @@ class CommentBlockTest extends CommentTestBase {
protected function setUp() {
parent::setUp();
- // Update admin user to have the 'administer blocks' permission.
+ // Update admin user to have the 'administer_blocks' permission.
$this->admin_user = $this->drupalCreateUser(array(
'administer content types',
'administer comments',
@@ -32,7 +32,7 @@ protected function setUp() {
'post comments',
'access comments',
'access content',
- 'administer blocks',
+ 'administer_blocks',
));
}
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
index 3d7c0c3..1c302e0 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
@@ -52,7 +52,7 @@ protected function setUp() {
$permissions = array(
'access site-wide contact form',
- 'administer blocks',
+ 'administer_blocks',
'administer contact forms',
'administer content types',
'administer block_content fields',
diff --git a/core/modules/forum/src/Tests/ForumBlockTest.php b/core/modules/forum/src/Tests/ForumBlockTest.php
index 78e1c44..a58182b 100644
--- a/core/modules/forum/src/Tests/ForumBlockTest.php
+++ b/core/modules/forum/src/Tests/ForumBlockTest.php
@@ -35,7 +35,7 @@ protected function setUp() {
// Create users.
$this->adminUser = $this->drupalCreateUser(array(
'access administration pages',
- 'administer blocks',
+ 'administer_blocks',
'administer nodes',
'create forum content',
'post comments',
diff --git a/core/modules/forum/src/Tests/ForumNodeAccessTest.php b/core/modules/forum/src/Tests/ForumNodeAccessTest.php
index 34ddd35..eb29c4c 100644
--- a/core/modules/forum/src/Tests/ForumNodeAccessTest.php
+++ b/core/modules/forum/src/Tests/ForumNodeAccessTest.php
@@ -40,7 +40,7 @@ function testForumNodeAccess() {
// Create some users.
$access_user = $this->drupalCreateUser(array('node test view'));
$no_access_user = $this->drupalCreateUser();
- $admin_user = $this->drupalCreateUser(array('access administration pages', 'administer modules', 'administer blocks', 'create forum content'));
+ $admin_user = $this->drupalCreateUser(array('access administration pages', 'administer modules', 'administer_blocks', 'create forum content'));
$this->drupalLogin($admin_user);
diff --git a/core/modules/forum/src/Tests/ForumTest.php b/core/modules/forum/src/Tests/ForumTest.php
index 8ebdb81..c7cb0ad 100644
--- a/core/modules/forum/src/Tests/ForumTest.php
+++ b/core/modules/forum/src/Tests/ForumTest.php
@@ -73,7 +73,7 @@ protected function setUp() {
$this->admin_user = $this->drupalCreateUser(array(
'access administration pages',
'administer modules',
- 'administer blocks',
+ 'administer_blocks',
'administer forums',
'administer menu',
'administer taxonomy',
diff --git a/core/modules/language/src/Tests/LanguageBlockSettingsVisibilityTest.php b/core/modules/language/src/Tests/LanguageBlockSettingsVisibilityTest.php
index e1f9cb9..9a400a5 100644
--- a/core/modules/language/src/Tests/LanguageBlockSettingsVisibilityTest.php
+++ b/core/modules/language/src/Tests/LanguageBlockSettingsVisibilityTest.php
@@ -19,7 +19,7 @@ class LanguageBlockSettingsVisibilityTest extends WebTestBase {
public static $modules = array('block', 'language');
public function testUnnecessaryLanguageSettingsVisibility() {
- $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages', 'administer blocks'));
+ $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages', 'administer_blocks'));
$this->drupalLogin($admin_user);
$this->drupalPostForm('admin/config/regional/language/add', array('predefined_langcode' => 'hu'), t('Add language'));
$this->drupalGet('admin/structure/block/add/system_menu_block:admin/stark');
diff --git a/core/modules/language/src/Tests/LanguageSwitchingTest.php b/core/modules/language/src/Tests/LanguageSwitchingTest.php
index 16fa5ac..bc5ef83 100644
--- a/core/modules/language/src/Tests/LanguageSwitchingTest.php
+++ b/core/modules/language/src/Tests/LanguageSwitchingTest.php
@@ -28,7 +28,7 @@ protected function setUp() {
parent::setUp();
// Create and login user.
- $admin_user = $this->drupalCreateUser(array('administer blocks', 'administer languages', 'access administration pages'));
+ $admin_user = $this->drupalCreateUser(array('administer_blocks', 'administer languages', 'access administration pages'));
$this->drupalLogin($admin_user);
}
diff --git a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php b/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
index 9ec78f4..de723ae 100644
--- a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
+++ b/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
@@ -63,7 +63,7 @@ class LanguageUILanguageNegotiationTest extends WebTestBase {
protected function setUp() {
parent::setUp();
- $admin_user = $this->drupalCreateUser(array('administer languages', 'translate interface', 'access administration pages', 'administer blocks'));
+ $admin_user = $this->drupalCreateUser(array('administer languages', 'translate interface', 'access administration pages', 'administer_blocks'));
$this->drupalLogin($admin_user);
}
diff --git a/core/modules/menu_ui/src/Tests/MenuTest.php b/core/modules/menu_ui/src/Tests/MenuTest.php
index c35d0d1..f905ba2 100644
--- a/core/modules/menu_ui/src/Tests/MenuTest.php
+++ b/core/modules/menu_ui/src/Tests/MenuTest.php
@@ -61,7 +61,7 @@ protected function setUp() {
$this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
// Create users.
- $this->admin_user = $this->drupalCreateUser(array('access administration pages', 'administer blocks', 'administer menu', 'create article content'));
+ $this->admin_user = $this->drupalCreateUser(array('access administration pages', 'administer_blocks', 'administer menu', 'create article content'));
$this->authenticated_user = $this->drupalCreateUser(array());
}
@@ -493,7 +493,7 @@ function testSystemMenuRename() {
* Tests that menu items pointing to unpublished nodes are editable.
*/
function testUnpublishedNodeMenuItem() {
- $this->drupalLogin($this->drupalCreateUser(array('access administration pages', 'administer blocks', 'administer menu', 'create article content', 'bypass node access')));
+ $this->drupalLogin($this->drupalCreateUser(array('access administration pages', 'administer_blocks', 'administer menu', 'create article content', 'bypass node access')));
// Create an unpublished node.
$node = $this->drupalCreateNode(array(
'type' => 'article',
@@ -515,7 +515,7 @@ function testUnpublishedNodeMenuItem() {
* Tests the contextual links on a menu block.
*/
public function testBlockContextualLinks() {
- $this->drupalLogin($this->drupalCreateUser(array('administer menu', 'access contextual links', 'administer blocks')));
+ $this->drupalLogin($this->drupalCreateUser(array('administer menu', 'access contextual links', 'administer_blocks')));
$this->addMenuLink();
$block = $this->drupalPlaceBlock('system_menu_block:tools', array('label' => 'Tools', 'provider' => 'system'));
$this->drupalGet('test-page');
diff --git a/core/modules/node/src/Tests/NodeBlockFunctionalTest.php b/core/modules/node/src/Tests/NodeBlockFunctionalTest.php
index 9bc5054..155a0d0 100644
--- a/core/modules/node/src/Tests/NodeBlockFunctionalTest.php
+++ b/core/modules/node/src/Tests/NodeBlockFunctionalTest.php
@@ -39,7 +39,7 @@ protected function setUp() {
parent::setUp();
// Create users and test node.
- $this->adminUser = $this->drupalCreateUser(array('administer content types', 'administer nodes', 'administer blocks'));
+ $this->adminUser = $this->drupalCreateUser(array('administer content types', 'administer nodes', 'administer_blocks'));
$this->webUser = $this->drupalCreateUser(array('access content', 'create article content'));
}
diff --git a/core/modules/node/src/Tests/NodeSyndicateBlockTest.php b/core/modules/node/src/Tests/NodeSyndicateBlockTest.php
index 8df9147..ede61c5 100644
--- a/core/modules/node/src/Tests/NodeSyndicateBlockTest.php
+++ b/core/modules/node/src/Tests/NodeSyndicateBlockTest.php
@@ -25,7 +25,7 @@ protected function setUp() {
parent::setUp();
// Create a user and log in.
- $admin_user = $this->drupalCreateUser(array('administer blocks'));
+ $admin_user = $this->drupalCreateUser(array('administer_blocks'));
$this->drupalLogin($admin_user);
}
diff --git a/core/modules/search/src/Tests/SearchBlockTest.php b/core/modules/search/src/Tests/SearchBlockTest.php
index cdc7905..52a65e2 100644
--- a/core/modules/search/src/Tests/SearchBlockTest.php
+++ b/core/modules/search/src/Tests/SearchBlockTest.php
@@ -25,7 +25,7 @@ protected function setUp() {
parent::setUp();
// Create and login user.
- $admin_user = $this->drupalCreateUser(array('administer blocks', 'search content'));
+ $admin_user = $this->drupalCreateUser(array('administer_blocks', 'search content'));
$this->drupalLogin($admin_user);
}
diff --git a/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php b/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php
index e7c98c6..e48332d 100644
--- a/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php
+++ b/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php
@@ -39,7 +39,7 @@ protected function setUp() {
parent::setUp();
// Login as a user that can create and search content.
- $this->search_user = $this->drupalCreateUser(array('search content', 'administer search', 'administer nodes', 'bypass node access', 'access user profiles', 'administer users', 'administer blocks', 'access site reports'));
+ $this->search_user = $this->drupalCreateUser(array('search content', 'administer search', 'administer nodes', 'bypass node access', 'access user profiles', 'administer users', 'administer_blocks', 'access site reports'));
$this->drupalLogin($this->search_user);
// Add a single piece of content and index it.
diff --git a/core/modules/statistics/src/Tests/StatisticsTestBase.php b/core/modules/statistics/src/Tests/StatisticsTestBase.php
index 5559ac2..2fda98f 100644
--- a/core/modules/statistics/src/Tests/StatisticsTestBase.php
+++ b/core/modules/statistics/src/Tests/StatisticsTestBase.php
@@ -33,8 +33,8 @@ protected function setUp() {
$this->blocking_user = $this->drupalCreateUser(array(
'access administration pages',
'access site reports',
- 'ban IP addresses',
- 'administer blocks',
+ 'ban_IP_addresses',
+ 'administer_blocks',
'administer statistics',
'administer users',
));
diff --git a/core/modules/system/src/Entity/Action.php b/core/modules/system/src/Entity/Action.php
index a7176db..64bc12e 100644
--- a/core/modules/system/src/Entity/Action.php
+++ b/core/modules/system/src/Entity/Action.php
@@ -20,7 +20,7 @@
* @ConfigEntityType(
* id = "action",
* label = @Translation("Action"),
- * admin_permission = "administer actions",
+ * admin_permission = "administer_actions",
* entity_keys = {
* "id" = "id",
* "label" = "label"
diff --git a/core/modules/system/src/Tests/System/AccessDeniedTest.php b/core/modules/system/src/Tests/System/AccessDeniedTest.php
index 12f7cdc..ad09a76 100644
--- a/core/modules/system/src/Tests/System/AccessDeniedTest.php
+++ b/core/modules/system/src/Tests/System/AccessDeniedTest.php
@@ -29,7 +29,7 @@ protected function setUp() {
parent::setUp();
// Create an administrative user.
- $this->admin_user = $this->drupalCreateUser(array('access administration pages', 'administer site configuration', 'administer blocks'));
+ $this->admin_user = $this->drupalCreateUser(array('access administration pages', 'administer site configuration', 'administer_blocks'));
user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access user profiles'));
user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, array('access user profiles'));
diff --git a/core/modules/system/src/Tests/System/ThemeTest.php b/core/modules/system/src/Tests/System/ThemeTest.php
index 1534675..bf839ab 100644
--- a/core/modules/system/src/Tests/System/ThemeTest.php
+++ b/core/modules/system/src/Tests/System/ThemeTest.php
@@ -30,7 +30,7 @@ protected function setUp() {
$this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
- $this->admin_user = $this->drupalCreateUser(array('access administration pages', 'view the administration theme', 'administer themes', 'bypass node access', 'administer blocks'));
+ $this->admin_user = $this->drupalCreateUser(array('access administration pages', 'view the administration theme', 'administer themes', 'bypass node access', 'administer_blocks'));
$this->drupalLogin($this->admin_user);
$this->node = $this->drupalCreateNode();
}
diff --git a/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php b/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php
index d0c0685..6fea807 100644
--- a/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php
+++ b/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php
@@ -69,7 +69,7 @@ protected function setUp() {
'administer themes',
'administer nodes',
'access content overview',
- 'administer blocks',
+ 'administer_blocks',
'administer menu',
'administer modules',
'administer permissions',
diff --git a/core/modules/user/src/Tests/UserBlocksTest.php b/core/modules/user/src/Tests/UserBlocksTest.php
index b81d038..eb7e545 100644
--- a/core/modules/user/src/Tests/UserBlocksTest.php
+++ b/core/modules/user/src/Tests/UserBlocksTest.php
@@ -33,7 +33,7 @@ class UserBlocksTest extends WebTestBase {
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(array('administer blocks'));
+ $this->adminUser = $this->drupalCreateUser(array('administer_blocks'));
$this->drupalLogin($this->adminUser);
$this->drupalPlaceBlock('user_login_block');
$this->drupalLogout($this->adminUser);
diff --git a/core/modules/user/src/Tests/UserPermissionsTest.php b/core/modules/user/src/Tests/UserPermissionsTest.php
index ec7ed23..8bdacc7 100644
--- a/core/modules/user/src/Tests/UserPermissionsTest.php
+++ b/core/modules/user/src/Tests/UserPermissionsTest.php
@@ -85,11 +85,11 @@ function testAdministratorRole() {
$edit['user_admin_role'] = $this->rid;
$this->drupalPostForm('admin/config/people/accounts', $edit, t('Save configuration'));
- // Enable aggregator module and ensure the 'administer news feeds'
+ // Enable aggregator module and ensure the 'administer_news_feeds'
// permission is assigned by default.
\Drupal::ModuleHandler()->install(array('aggregator'));
- $this->assertTrue($this->admin_user->hasPermission('administer news feeds'), 'The permission was automatically assigned to the administrator role');
+ $this->assertTrue($this->admin_user->hasPermission('administer_news_feeds'), 'The permission was automatically assigned to the administrator role');
}
/**
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index c2037de..40032e9 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1206,7 +1206,7 @@ function user_role_load($rid) {
* @code
* array(
* 'administer nodes' => 0, // Revoke 'administer nodes'
- * 'administer blocks' => FALSE, // Revoke 'administer blocks'
+ * 'administer_blocks' => FALSE, // Revoke 'administer_blocks'
* 'access user profiles' => 1, // Grant 'access user profiles'
* 'access content' => TRUE, // Grant 'access content'
* 'access comments' => 'access comments', // Grant 'access comments'
diff --git a/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php b/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php
index 6580c0c..9200fca 100644
--- a/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php
+++ b/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php
@@ -37,7 +37,7 @@ protected function setUp() {
$this->enableViewsTestModule();
- $admin_user = $this->drupalCreateUser(array('administer news feeds'));
+ $admin_user = $this->drupalCreateUser(array('administer_news_feeds'));
$this->drupalLogin($admin_user);
}
diff --git a/core/modules/views/src/Tests/Wizard/WizardTestBase.php b/core/modules/views/src/Tests/Wizard/WizardTestBase.php
index 0a2e998..9d724b1 100644
--- a/core/modules/views/src/Tests/Wizard/WizardTestBase.php
+++ b/core/modules/views/src/Tests/Wizard/WizardTestBase.php
@@ -25,7 +25,7 @@ protected function setUp() {
parent::setUp();
// Create and log in a user with administer views permission.
- $views_admin = $this->drupalCreateUser(array('administer views', 'administer blocks', 'bypass node access', 'access user profiles', 'view all revisions'));
+ $views_admin = $this->drupalCreateUser(array('administer views', 'administer_blocks', 'bypass node access', 'access user profiles', 'view all revisions'));
$this->drupalLogin($views_admin);
}
diff --git a/core/modules/views_ui/src/Tests/UITestBase.php b/core/modules/views_ui/src/Tests/UITestBase.php
index f8cef54..d36ea14 100644
--- a/core/modules/views_ui/src/Tests/UITestBase.php
+++ b/core/modules/views_ui/src/Tests/UITestBase.php
@@ -42,7 +42,7 @@ protected function setUp() {
$this->adminUser = $this->drupalCreateUser(array('administer views'));
- $this->fullAdminUser = $this->drupalCreateUser(array('administer views', 'administer blocks', 'bypass node access', 'access user profiles', 'view all revisions'));
+ $this->fullAdminUser = $this->drupalCreateUser(array('administer views', 'administer_blocks', 'bypass node access', 'access user profiles', 'view all revisions'));
$this->drupalLogin($this->fullAdminUser);
}
diff --git a/core/profiles/standard/src/Tests/StandardTest.php b/core/profiles/standard/src/Tests/StandardTest.php
index 3ba2347..fc49685 100644
--- a/core/profiles/standard/src/Tests/StandardTest.php
+++ b/core/profiles/standard/src/Tests/StandardTest.php
@@ -33,7 +33,7 @@ function testStandard() {
// Test anonymous user can access 'Main navigation' block.
$admin = $this->drupalCreateUser(array(
- 'administer blocks',
+ 'administer_blocks',
'post comments',
'skip comment approval',
));