diff --git a/core/lib/Drupal/Core/Asset/AssetResolver.php b/core/lib/Drupal/Core/Asset/AssetResolver.php
index 863f971838..9f1c4a14d5 100644
--- a/core/lib/Drupal/Core/Asset/AssetResolver.php
+++ b/core/lib/Drupal/Core/Asset/AssetResolver.php
@@ -312,7 +312,7 @@ public function getJsAssets(AttachedAssetsInterface $assets, $optimize) {
$settings = $this->getJsSettingsAssets($assets);
// Allow modules to add cached JavaScript settings.
foreach ($this->moduleHandler->getImplementations('js_settings_build') as $module) {
- $function = $module . '_' . 'js_settings_build';
+ $function = $module . '_js_settings_build';
$function($settings, $assets);
}
}
diff --git a/core/lib/Drupal/Core/Entity/EntityTypeManager.php b/core/lib/Drupal/Core/Entity/EntityTypeManager.php
index abe96a5c26..3a082e4e05 100644
--- a/core/lib/Drupal/Core/Entity/EntityTypeManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityTypeManager.php
@@ -108,7 +108,7 @@ protected function findDefinitions() {
// Directly call the hook implementations to pass the definitions to them
// by reference, so new entity types can be added.
foreach ($this->moduleHandler->getImplementations('entity_type_build') as $module) {
- $function = $module . '_' . 'entity_type_build';
+ $function = $module . '_entity_type_build';
$function($definitions);
}
foreach ($definitions as $plugin_id => $definition) {
diff --git a/core/lib/Drupal/Core/Render/theme.api.php b/core/lib/Drupal/Core/Render/theme.api.php
index db7a16165b..e064d0ae9c 100644
--- a/core/lib/Drupal/Core/Render/theme.api.php
+++ b/core/lib/Drupal/Core/Render/theme.api.php
@@ -707,7 +707,7 @@ function hook_theme_suggestions_alter(array &$suggestions, array $variables, $ho
*/
function hook_theme_suggestions_HOOK_alter(array &$suggestions, array $variables) {
if (empty($variables['header'])) {
- $suggestions[] = 'hookname__' . 'no_header';
+ $suggestions[] = 'hookname__no_header';
}
}
diff --git a/core/modules/config/config.module b/core/modules/config/config.module
index b280fe84fa..c47cf300ca 100644
--- a/core/modules/config/config.module
+++ b/core/modules/config/config.module
@@ -70,7 +70,7 @@ function config_file_download($uri) {
$date = DateTime::createFromFormat('U', $request->server->get('REQUEST_TIME'));
$date_string = $date->format('Y-m-d-H-i');
$hostname = str_replace('.', '-', $request->getHttpHost());
- $filename = 'config' . '-' . $hostname . '-' . $date_string . '.tar.gz';
+ $filename = 'config-' . $hostname . '-' . $date_string . '.tar.gz';
$disposition = 'attachment; filename="' . $filename . '"';
return [
'Content-disposition' => $disposition,
diff --git a/core/modules/system/tests/modules/theme_suggestions_test/theme_suggestions_test.module b/core/modules/system/tests/modules/theme_suggestions_test/theme_suggestions_test.module
index 50fb86d2b8..543db5b9e3 100644
--- a/core/modules/system/tests/modules/theme_suggestions_test/theme_suggestions_test.module
+++ b/core/modules/system/tests/modules/theme_suggestions_test/theme_suggestions_test.module
@@ -32,21 +32,21 @@ function theme_suggestions_test_theme_suggestions_alter(array &$suggestions, arr
*/
function theme_suggestions_test_theme_suggestions_theme_test_suggestions_alter(array &$suggestions, array $variables) {
drupal_set_message(__FUNCTION__ . '() executed.');
- $suggestions[] = 'theme_test_suggestions__' . 'module_override';
+ $suggestions[] = 'theme_test_suggestions__module_override';
}
/**
* Implements hook_theme_suggestions_HOOK_alter().
*/
function theme_suggestions_test_theme_suggestions_theme_test_function_suggestions_alter(array &$suggestions, array $variables) {
- $suggestions[] = 'theme_test_function_suggestions__' . 'module_override';
+ $suggestions[] = 'theme_test_function_suggestions__module_override';
}
/**
* Implements hook_theme_suggestions_HOOK_alter().
*/
function theme_suggestions_test_theme_suggestions_theme_test_specific_suggestions_alter(array &$suggestions, array $variables) {
- $suggestions[] = 'theme_test_specific_suggestions__' . 'variant__foo';
+ $suggestions[] = 'theme_test_specific_suggestions__variant__foo';
}
/**
diff --git a/core/modules/system/tests/modules/theme_test/theme_test.module b/core/modules/system/tests/modules/theme_test/theme_test.module
index 6a701abee9..cd2f6ddbfa 100644
--- a/core/modules/system/tests/modules/theme_test/theme_test.module
+++ b/core/modules/system/tests/modules/theme_test/theme_test.module
@@ -167,7 +167,7 @@ function theme_theme_test_function_suggestions($variables) {
* Implements hook_theme_suggestions_HOOK().
*/
function theme_test_theme_suggestions_theme_test_suggestion_provided(array $variables) {
- return ['theme_test_suggestion_provided__' . 'foo'];
+ return ['theme_test_suggestion_provided__foo'];
}
/**
diff --git a/core/modules/user/src/Plugin/views/field/Roles.php b/core/modules/user/src/Plugin/views/field/Roles.php
index e7d9495bca..fd507eacd8 100644
--- a/core/modules/user/src/Plugin/views/field/Roles.php
+++ b/core/modules/user/src/Plugin/views/field/Roles.php
@@ -101,8 +101,8 @@ protected function documentSelfTokens(&$tokens) {
protected function addSelfTokens(&$tokens, $item) {
if (!empty($item['role'])) {
- $tokens['{{ ' . $this->options['id'] . '__role' . ' }}'] = $item['role'];
- $tokens['{{ ' . $this->options['id'] . '__rid' . ' }}'] = $item['rid'];
+ $tokens['{{ ' . $this->options['id'] . '__role }}'] = $item['role'];
+ $tokens['{{ ' . $this->options['id'] . '__rid }}'] = $item['rid'];
}
}
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index a593e62c7d..0145ce430a 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -90,6 +90,7 @@
+