From 2ae1c01866dfc6366ebb24c3791d715547db0692 Mon Sep 17 00:00:00 2001
From: nod_ <nod_@598310.no-reply.drupal.org>
Date: Thu, 24 Oct 2024 12:03:50 +0200
Subject: [PATCH] Issue #3474499 by quietone, nicxvan: Fix spelling of 3 'base'
words
---
core/.phpstan-baseline.php | 24 ---------------
core/includes/theme.inc | 4 +--
core/lib/Drupal/Core/Asset/CssOptimizer.php | 20 ++++++-------
core/misc/cspell/dictionary.txt | 3 --
.../src/Kernel/NewDefaultThemeBlocksTest.php | 4 +--
.../src/Functional/ConfigImportUITest.php | 4 +--
core/modules/media/src/MediaSourceBase.php | 2 +-
....php => EntityTestMultiValueBaseField.php} | 4 ++-
.../tests/src/Functional/System/ThemeTest.php | 4 +--
.../src/Functional/Theme/ThemeInfoTest.php | 4 +--
.../tests/src/Kernel/Theme/ThemeTest.php | 6 ++--
.../config/install/core.date_format.fancy.yml | 2 +-
.../install/test_base_theme.settings.yml} | 0
.../config/schema/test_base_theme.schema.yml} | 2 +-
.../test_base_theme.info.yml} | 4 +--
.../test_base_theme.libraries.yml} | 0
.../test_base_theme.theme} | 8 ++---
.../test_invalid_base_theme.info.yml} | 2 +-
.../test_invalid_base_theme_sub.info.yml} | 2 +-
.../test_subsubtheme.info.yml | 2 +-
.../test_subtheme/test_subtheme.info.yml | 6 ++--
...xml => update_test_base_theme.1_1-sec.xml} | 16 +++++-----
.../src/Functional/UpdateContribTest.php | 30 +++++++++----------
.../update_test_base_theme.info.yml} | 0
.../update_test_subtheme.info.yml | 4 +--
....view.test_entity_multivalue_basefield.yml | 1 +
.../src/Functional/ViewsEscapingTest.php | 2 +-
.../Functional/ViewsThemeIntegrationTest.php | 18 +++++------
...ntityViewsWithMultivalueBaseFieldTest.php} | 10 ++++---
.../Asset/LibraryDiscoveryIntegrationTest.php | 10 +++----
.../Core/Config/ConfigImporterTest.php | 10 +++----
.../Core/Entity/FieldSqlStorageTest.php | 2 ++
.../Core/Recipe/RecipeRunnerTest.php | 2 +-
.../Core/Theme/MaintenanceThemeTest.php | 2 +-
.../KernelTests/Core/Theme/RegistryTest.php | 10 +++----
.../Core/Theme/ThemeInstallerTest.php | 12 ++++----
.../Core/Theme/ThemeSettingsTest.php | 2 +-
.../RedirectResponseSubscriberTest.php | 4 +--
.../Core/Extension/ThemeExtensionListTest.php | 18 +++++------
.../Drupal/Tests/PerformanceTestTrait.php | 4 +--
40 files changed, 122 insertions(+), 142 deletions(-)
rename core/modules/system/tests/modules/entity_test/src/Entity/{EntityTestMultiValueBasefield.php => EntityTestMultiValueBaseField.php} (91%)
rename core/modules/system/tests/themes/{test_basetheme => test_base_theme}/config/install/core.date_format.fancy.yml (92%)
rename core/modules/system/tests/themes/{test_basetheme/config/install/test_basetheme.settings.yml => test_base_theme/config/install/test_base_theme.settings.yml} (100%)
rename core/modules/system/tests/themes/{test_basetheme/config/schema/test_basetheme.schema.yml => test_base_theme/config/schema/test_base_theme.schema.yml} (89%)
rename core/modules/system/tests/themes/{test_basetheme/test_basetheme.info.yml => test_base_theme/test_base_theme.info.yml} (87%)
rename core/modules/system/tests/themes/{test_basetheme/test_basetheme.libraries.yml => test_base_theme/test_base_theme.libraries.yml} (100%)
rename core/modules/system/tests/themes/{test_basetheme/test_basetheme.theme => test_base_theme/test_base_theme.theme} (67%)
rename core/modules/system/tests/themes/{test_invalid_basetheme/test_invalid_basetheme.info.yml => test_invalid_base_theme/test_invalid_base_theme.info.yml} (78%)
rename core/modules/system/tests/themes/{test_invalid_basetheme_sub/test_invalid_basetheme_sub.info.yml => test_invalid_base_theme_sub/test_invalid_base_theme_sub.info.yml} (83%)
rename core/modules/update/tests/fixtures/release-history/{update_test_basetheme.1_1-sec.xml => update_test_base_theme.1_1-sec.xml} (64%)
rename core/modules/update/tests/themes/{update_test_basetheme/update_test_basetheme.info.yml => update_test_base_theme/update_test_base_theme.info.yml} (100%)
rename core/modules/views/tests/src/Kernel/Entity/{EntityViewsWithMultivalueBasefieldTest.php => EntityViewsWithMultivalueBaseFieldTest.php} (81%)
diff --git a/core/.phpstan-baseline.php b/core/.phpstan-baseline.php
index 3dc557598693..b0e07347ca85 100644
--- a/core/.phpstan-baseline.php
+++ b/core/.phpstan-baseline.php
@@ -47967,30 +47967,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/tests/themes/engines/nyan_cat/nyan_cat.engine',
];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Function test_basetheme_preprocess_theme_test_function_suggestions\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/themes/test_basetheme/test_basetheme.theme',
-];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Function test_basetheme_preprocess_theme_test_template_test\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/themes/test_basetheme/test_basetheme.theme',
-];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Function test_basetheme_views_post_render\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/themes/test_basetheme/test_basetheme.theme',
-];
-$ignoreErrors[] = [
- // identifier: missingType.return
- 'message' => '#^Function test_basetheme_views_pre_render\\(\\) has no return type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/themes/test_basetheme/test_basetheme.theme',
-];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Function test_subsubtheme_preprocess_theme_test_template_test\\(\\) has no return type specified\\.$#',
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index a79870057c34..e26638fb6fc0 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -103,10 +103,10 @@ function drupal_find_theme_templates($cache, $extension, $path) {
$theme_paths[$theme_info->base_theme][$theme_info->getName()] = $theme_info->getPath();
}
}
- foreach ($theme_paths as $basetheme => $subthemes) {
+ foreach ($theme_paths as $base_theme => $subthemes) {
foreach ($subthemes as $subtheme => $subtheme_path) {
if (isset($theme_paths[$subtheme])) {
- $theme_paths[$basetheme] = array_merge($theme_paths[$basetheme], $theme_paths[$subtheme]);
+ $theme_paths[$base_theme] = array_merge($theme_paths[$base_theme], $theme_paths[$subtheme]);
}
}
}
diff --git a/core/lib/Drupal/Core/Asset/CssOptimizer.php b/core/lib/Drupal/Core/Asset/CssOptimizer.php
index f075666a8d19..8f2d910250cd 100644
--- a/core/lib/Drupal/Core/Asset/CssOptimizer.php
+++ b/core/lib/Drupal/Core/Asset/CssOptimizer.php
@@ -113,17 +113,17 @@ protected function processFile($css_asset) {
* Name of the stylesheet to be processed.
* @param $optimize
* Defines if CSS contents should be compressed or not.
- * @param $reset_basepath
+ * @param $reset_base_path
* Used internally to facilitate recursive resolution of @import commands.
*
* @return string
* Contents of the stylesheet, including any resolved @import commands.
*/
- public function loadFile($file, $optimize = NULL, $reset_basepath = TRUE) {
+ public function loadFile($file, $optimize = NULL, $reset_base_path = TRUE) {
// These statics are not cache variables, so we don't use drupal_static().
- static $_optimize, $basepath;
- if ($reset_basepath) {
- $basepath = '';
+ static $_optimize, $base_path;
+ if ($reset_base_path) {
+ $base_path = '';
}
// Store the value of $optimize for preg_replace_callback with nested
// @import loops.
@@ -133,13 +133,13 @@ public function loadFile($file, $optimize = NULL, $reset_basepath = TRUE) {
// Stylesheets are relative one to each other. Start by adding a base path
// prefix provided by the parent stylesheet (if necessary).
- if ($basepath && !StreamWrapperManager::getScheme($file)) {
- $file = $basepath . '/' . $file;
+ if ($base_path && !StreamWrapperManager::getScheme($file)) {
+ $file = $base_path . '/' . $file;
}
// Store the parent base path to restore it later.
- $parent_base_path = $basepath;
+ $parent_base_path = $base_path;
// Set the current base path to process possible child imports.
- $basepath = dirname($file);
+ $base_path = dirname($file);
// Load the CSS stylesheet. We suppress errors because themes may specify
// stylesheets in their .info.yml file that don't exist in the theme's path,
@@ -164,7 +164,7 @@ public function loadFile($file, $optimize = NULL, $reset_basepath = TRUE) {
}
// Restore the parent base path as the file and its children are processed.
- $basepath = $parent_base_path;
+ $base_path = $parent_base_path;
return $content;
}
diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt
index 13cbc4e61866..a7dbf87ecd74 100644
--- a/core/misc/cspell/dictionary.txt
+++ b/core/misc/cspell/dictionary.txt
@@ -40,9 +40,6 @@ backporting
backports
bakeware
barchart
-basefield
-basepath
-basetheme
beatle
bebebe
beforeclose
diff --git a/core/modules/block/tests/src/Kernel/NewDefaultThemeBlocksTest.php b/core/modules/block/tests/src/Kernel/NewDefaultThemeBlocksTest.php
index 51be75bc9459..f4d0013f6163 100644
--- a/core/modules/block/tests/src/Kernel/NewDefaultThemeBlocksTest.php
+++ b/core/modules/block/tests/src/Kernel/NewDefaultThemeBlocksTest.php
@@ -103,7 +103,7 @@ public function testNewDefaultThemeBlocks(): void {
$this->assertEmpty($new_blocks);
// Install a hidden base theme and ensure blocks are not copied.
- $base_theme = 'test_basetheme';
+ $base_theme = 'test_base_theme';
$theme_installer->install([$base_theme]);
$new_blocks = $block_storage->getQuery()
->accessCheck(FALSE)
@@ -171,7 +171,7 @@ public function testBlockCollision(): void {
$this->assertEmpty($new_blocks);
// Install a hidden base theme and ensure blocks are not copied.
- $base_theme = 'test_basetheme';
+ $base_theme = 'test_base_theme';
$theme_installer->install([$base_theme]);
$new_blocks = $block_storage->getQuery()
->accessCheck(FALSE)
diff --git a/core/modules/config/tests/src/Functional/ConfigImportUITest.php b/core/modules/config/tests/src/Functional/ConfigImportUITest.php
index 4a92ef2414a6..b5486e86e557 100644
--- a/core/modules/config/tests/src/Functional/ConfigImportUITest.php
+++ b/core/modules/config/tests/src/Functional/ConfigImportUITest.php
@@ -515,9 +515,9 @@ public function testExtensionValidation(): void {
unset($core['module']['text']);
$module_data = $this->container->get('extension.list.module')->getList();
$this->assertTrue(isset($module_data['node']->requires['text']), 'The Node module depends on the Text module.');
- unset($core['theme']['test_basetheme']);
+ unset($core['theme']['test_base_theme']);
$theme_data = \Drupal::service('extension.list.theme')->reset()->getList();
- $this->assertTrue(isset($theme_data['test_subtheme']->requires['test_basetheme']), 'The Test Subtheme theme depends on the Test Basetheme theme.');
+ $this->assertTrue(isset($theme_data['test_subtheme']->requires['test_base_theme']), 'The Test Subtheme theme depends on the Test Base_theme theme.');
// This module does not exist.
$core['module']['does_not_exist'] = 0;
// This theme does not exist.
diff --git a/core/modules/media/src/MediaSourceBase.php b/core/modules/media/src/MediaSourceBase.php
index 58f98cda2f1f..a07dcc9f59cb 100644
--- a/core/modules/media/src/MediaSourceBase.php
+++ b/core/modules/media/src/MediaSourceBase.php
@@ -357,7 +357,7 @@ public function prepareViewDisplay(MediaTypeInterface $type, EntityViewDisplayIn
* {@inheritdoc}
*/
public function prepareFormDisplay(MediaTypeInterface $type, EntityFormDisplayInterface $display) {
- // Make sure the source field is placed just after the "name" basefield.
+ // Make sure the source field is placed just after the "name" base field.
$name_component = $display->getComponent('name');
$source_field_weight = ($name_component && isset($name_component['weight'])) ? $name_component['weight'] + 5 : -50;
$display->setComponent($this->getSourceFieldDefinition($type)->getName(), [
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMultiValueBasefield.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMultiValueBaseField.php
similarity index 91%
rename from core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMultiValueBasefield.php
rename to core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMultiValueBaseField.php
index 466f45fc4c8d..3c741cb8e884 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMultiValueBasefield.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMultiValueBaseField.php
@@ -6,6 +6,8 @@
use Drupal\Core\Entity\EntityTypeInterface;
+// cspell:ignore basefield
+
/**
* Defines an entity type with a multivalue base field.
*
@@ -26,7 +28,7 @@
* }
* )
*/
-class EntityTestMultiValueBasefield extends EntityTest {
+class EntityTestMultiValueBaseField extends EntityTest {
/**
* {@inheritdoc}
diff --git a/core/modules/system/tests/src/Functional/System/ThemeTest.php b/core/modules/system/tests/src/Functional/System/ThemeTest.php
index 4c5d5aad3430..0d6d4aff5e69 100644
--- a/core/modules/system/tests/src/Functional/System/ThemeTest.php
+++ b/core/modules/system/tests/src/Functional/System/ThemeTest.php
@@ -463,8 +463,8 @@ public function testInvalidTheme(): void {
// Clear the system_list() and theme listing cache to pick up the change.
$this->container->get('theme_handler')->reset();
$this->drupalGet('admin/appearance');
- $this->assertSession()->pageTextContains('This theme requires the base theme not_real_test_basetheme to operate correctly.');
- $this->assertSession()->pageTextContains('This theme requires the base theme test_invalid_basetheme to operate correctly.');
+ $this->assertSession()->pageTextContains('This theme requires the base theme not_real_test_base_theme to operate correctly.');
+ $this->assertSession()->pageTextContains('This theme requires the base theme test_invalid_base_theme to operate correctly.');
$this->assertSession()->pageTextContains('This theme requires the theme engine not_real_engine to operate correctly.');
// Check for the error text of a theme with the wrong core version
// using 7.x and ^7.
diff --git a/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php b/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php
index b92e189948e3..736fb6975b9d 100644
--- a/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php
+++ b/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php
@@ -59,12 +59,12 @@ protected function setUp(): void {
* Tests libraries-override.
*/
public function testStylesheets(): void {
- $this->themeInstaller->install(['test_basetheme', 'test_subtheme']);
+ $this->themeInstaller->install(['test_base_theme', 'test_subtheme']);
$this->config('system.theme')
->set('default', 'test_subtheme')
->save();
- $base = $this->getThemePath('test_basetheme');
+ $base = $this->getThemePath('test_base_theme');
$sub = $this->getThemePath('test_subtheme') . '/css';
// All removals are expected to be based on a file's path and name and
diff --git a/core/modules/system/tests/src/Kernel/Theme/ThemeTest.php b/core/modules/system/tests/src/Kernel/Theme/ThemeTest.php
index 21bfbe5d43e0..0e98f2bfdf4d 100644
--- a/core/modules/system/tests/src/Kernel/Theme/ThemeTest.php
+++ b/core/modules/system/tests/src/Kernel/Theme/ThemeTest.php
@@ -114,15 +114,15 @@ public function testListThemes(): void {
// Check if ThemeHandlerInterface::listInfo() returns disabled themes.
// Check for base theme and subtheme lists.
- $base_theme_list = ['test_basetheme' => 'Theme test base theme'];
+ $base_theme_list = ['test_base_theme' => 'Theme test base theme'];
$sub_theme_list = ['test_subsubtheme' => 'Theme test subsubtheme', 'test_subtheme' => 'Theme test subtheme'];
- $this->assertSame($sub_theme_list, $themes['test_basetheme']->sub_themes, 'Base theme\'s object includes list of subthemes.');
+ $this->assertSame($sub_theme_list, $themes['test_base_theme']->sub_themes, 'Base theme\'s object includes list of subthemes.');
$this->assertSame($base_theme_list, $themes['test_subtheme']->base_themes, 'Subtheme\'s object includes list of base themes.');
// Check for theme engine in subtheme.
$this->assertSame('twig', $themes['test_subtheme']->engine, 'Subtheme\'s object includes the theme engine.');
// Check for theme engine prefix.
- $this->assertSame('twig', $themes['test_basetheme']->prefix, 'Base theme\'s object includes the theme engine prefix.');
+ $this->assertSame('twig', $themes['test_base_theme']->prefix, 'Base theme\'s object includes the theme engine prefix.');
$this->assertSame('twig', $themes['test_subtheme']->prefix, 'Subtheme\'s object includes the theme engine prefix.');
}
diff --git a/core/modules/system/tests/themes/test_basetheme/config/install/core.date_format.fancy.yml b/core/modules/system/tests/themes/test_base_theme/config/install/core.date_format.fancy.yml
similarity index 92%
rename from core/modules/system/tests/themes/test_basetheme/config/install/core.date_format.fancy.yml
rename to core/modules/system/tests/themes/test_base_theme/config/install/core.date_format.fancy.yml
index ca93fc041024..a482a382d3d5 100644
--- a/core/modules/system/tests/themes/test_basetheme/config/install/core.date_format.fancy.yml
+++ b/core/modules/system/tests/themes/test_base_theme/config/install/core.date_format.fancy.yml
@@ -6,7 +6,7 @@ status: true
dependencies:
enforced:
theme:
- - test_basetheme
+ - test_base_theme
id: fancy
label: 'Fancy date'
locked: false
diff --git a/core/modules/system/tests/themes/test_basetheme/config/install/test_basetheme.settings.yml b/core/modules/system/tests/themes/test_base_theme/config/install/test_base_theme.settings.yml
similarity index 100%
rename from core/modules/system/tests/themes/test_basetheme/config/install/test_basetheme.settings.yml
rename to core/modules/system/tests/themes/test_base_theme/config/install/test_base_theme.settings.yml
diff --git a/core/modules/system/tests/themes/test_basetheme/config/schema/test_basetheme.schema.yml b/core/modules/system/tests/themes/test_base_theme/config/schema/test_base_theme.schema.yml
similarity index 89%
rename from core/modules/system/tests/themes/test_basetheme/config/schema/test_basetheme.schema.yml
rename to core/modules/system/tests/themes/test_base_theme/config/schema/test_base_theme.schema.yml
index e22c3c5be753..7bef087bb58b 100644
--- a/core/modules/system/tests/themes/test_basetheme/config/schema/test_basetheme.schema.yml
+++ b/core/modules/system/tests/themes/test_base_theme/config/schema/test_base_theme.schema.yml
@@ -1,4 +1,4 @@
-test_basetheme.settings:
+test_base_theme.settings:
type: theme_settings
label: 'Test base theme settings'
mapping:
diff --git a/core/modules/system/tests/themes/test_basetheme/test_basetheme.info.yml b/core/modules/system/tests/themes/test_base_theme/test_base_theme.info.yml
similarity index 87%
rename from core/modules/system/tests/themes/test_basetheme/test_basetheme.info.yml
rename to core/modules/system/tests/themes/test_base_theme/test_base_theme.info.yml
index ad03c934e9f6..8c6468a79493 100644
--- a/core/modules/system/tests/themes/test_basetheme/test_basetheme.info.yml
+++ b/core/modules/system/tests/themes/test_base_theme/test_base_theme.info.yml
@@ -6,7 +6,7 @@ base theme: false
hidden: true
libraries:
- - test_basetheme/global-styling
+ - test_base_theme/global-styling
libraries-override:
core/drupal.dialog:
js:
@@ -21,4 +21,4 @@ libraries-override:
libraries-extend:
starterkit_theme/base:
- - test_basetheme/global-styling
+ - test_base_theme/global-styling
diff --git a/core/modules/system/tests/themes/test_basetheme/test_basetheme.libraries.yml b/core/modules/system/tests/themes/test_base_theme/test_base_theme.libraries.yml
similarity index 100%
rename from core/modules/system/tests/themes/test_basetheme/test_basetheme.libraries.yml
rename to core/modules/system/tests/themes/test_base_theme/test_base_theme.libraries.yml
diff --git a/core/modules/system/tests/themes/test_basetheme/test_basetheme.theme b/core/modules/system/tests/themes/test_base_theme/test_base_theme.theme
similarity index 67%
rename from core/modules/system/tests/themes/test_basetheme/test_basetheme.theme
rename to core/modules/system/tests/themes/test_base_theme/test_base_theme.theme
index 1276117096f8..c6eab50d0ebf 100644
--- a/core/modules/system/tests/themes/test_basetheme/test_basetheme.theme
+++ b/core/modules/system/tests/themes/test_base_theme/test_base_theme.theme
@@ -13,7 +13,7 @@
/**
* Implements hook_views_pre_render().
*/
-function test_basetheme_views_pre_render(ViewExecutable $view) {
+function test_base_theme_views_pre_render(ViewExecutable $view): void {
// We append the function name to the title for test to check for.
$view->setTitle($view->getTitle() . ":" . __FUNCTION__);
}
@@ -21,7 +21,7 @@ function test_basetheme_views_pre_render(ViewExecutable $view) {
/**
* Implements hook_views_post_render().
*/
-function test_basetheme_views_post_render(ViewExecutable $view, &$output, CachePluginBase $cache) {
+function test_base_theme_views_post_render(ViewExecutable $view, &$output, CachePluginBase $cache): void {
// We append the function name to the title for test to check for.
$view->setTitle($view->getTitle() . ":" . __FUNCTION__);
}
@@ -29,11 +29,11 @@ function test_basetheme_views_post_render(ViewExecutable $view, &$output, CacheP
/**
* Implements hook_preprocess_HOOK() for theme_test_template_test templates.
*/
-function test_basetheme_preprocess_theme_test_template_test(&$variables) {
+function test_base_theme_preprocess_theme_test_template_test(&$variables): void {
}
/**
* Implements hook_preprocess_HOOK() for theme_test_function_suggestions theme functions.
*/
-function test_basetheme_preprocess_theme_test_function_suggestions(&$variables) {
+function test_base_theme_preprocess_theme_test_function_suggestions(&$variables): void {
}
diff --git a/core/modules/system/tests/themes/test_invalid_basetheme/test_invalid_basetheme.info.yml b/core/modules/system/tests/themes/test_invalid_base_theme/test_invalid_base_theme.info.yml
similarity index 78%
rename from core/modules/system/tests/themes/test_invalid_basetheme/test_invalid_basetheme.info.yml
rename to core/modules/system/tests/themes/test_invalid_base_theme/test_invalid_base_theme.info.yml
index 7d7d22960a62..ae8ca8b93f53 100644
--- a/core/modules/system/tests/themes/test_invalid_basetheme/test_invalid_basetheme.info.yml
+++ b/core/modules/system/tests/themes/test_invalid_base_theme/test_invalid_base_theme.info.yml
@@ -2,4 +2,4 @@ name: 'Theme test with invalid base theme'
type: theme
description: 'Test theme which has a non-existent base theme.'
version: VERSION
-base theme: not_real_test_basetheme
+base theme: not_real_test_base_theme
diff --git a/core/modules/system/tests/themes/test_invalid_basetheme_sub/test_invalid_basetheme_sub.info.yml b/core/modules/system/tests/themes/test_invalid_base_theme_sub/test_invalid_base_theme_sub.info.yml
similarity index 83%
rename from core/modules/system/tests/themes/test_invalid_basetheme_sub/test_invalid_basetheme_sub.info.yml
rename to core/modules/system/tests/themes/test_invalid_base_theme_sub/test_invalid_base_theme_sub.info.yml
index 3df3931014f0..92bade24b41f 100644
--- a/core/modules/system/tests/themes/test_invalid_basetheme_sub/test_invalid_basetheme_sub.info.yml
+++ b/core/modules/system/tests/themes/test_invalid_base_theme_sub/test_invalid_base_theme_sub.info.yml
@@ -2,4 +2,4 @@ name: 'Theme test with valid base theme but no grandparent base theme'
type: theme
description: 'Test theme which has a non-existent base theme in the base chain.'
version: VERSION
-base theme: test_invalid_basetheme
+base theme: test_invalid_base_theme
diff --git a/core/modules/system/tests/themes/test_subsubtheme/test_subsubtheme.info.yml b/core/modules/system/tests/themes/test_subsubtheme/test_subsubtheme.info.yml
index c512f2319d42..9435165b682a 100644
--- a/core/modules/system/tests/themes/test_subsubtheme/test_subsubtheme.info.yml
+++ b/core/modules/system/tests/themes/test_subsubtheme/test_subsubtheme.info.yml
@@ -4,7 +4,7 @@ description: 'Test theme which uses test_subtheme as the base theme.'
version: VERSION
base theme: test_subtheme
libraries-override:
- test_basetheme/global-styling:
+ test_base_theme/global-styling:
css:
base:
css/sub-sub-last-override.css: false
diff --git a/core/modules/system/tests/themes/test_subtheme/test_subtheme.info.yml b/core/modules/system/tests/themes/test_subtheme/test_subtheme.info.yml
index 919436f472c6..12de766ba9cd 100644
--- a/core/modules/system/tests/themes/test_subtheme/test_subtheme.info.yml
+++ b/core/modules/system/tests/themes/test_subtheme/test_subtheme.info.yml
@@ -1,8 +1,8 @@
name: 'Theme test subtheme'
type: theme
-description: 'Test theme which uses test_basetheme as the base theme.'
+description: 'Test theme which uses test_base_theme as the base theme.'
version: VERSION
-base theme: test_basetheme
+base theme: test_base_theme
libraries:
- test_subtheme/global-styling
libraries-override:
@@ -10,7 +10,7 @@ libraries-override:
css:
base:
css/sub-remove.css: false
- test_basetheme/global-styling:
+ test_base_theme/global-styling:
css:
base:
base-add.sub-remove.css: false
diff --git a/core/modules/update/tests/fixtures/release-history/update_test_basetheme.1_1-sec.xml b/core/modules/update/tests/fixtures/release-history/update_test_base_theme.1_1-sec.xml
similarity index 64%
rename from core/modules/update/tests/fixtures/release-history/update_test_basetheme.1_1-sec.xml
rename to core/modules/update/tests/fixtures/release-history/update_test_base_theme.1_1-sec.xml
index 96fc287fccc9..efa4f940ea25 100644
--- a/core/modules/update/tests/fixtures/release-history/update_test_basetheme.1_1-sec.xml
+++ b/core/modules/update/tests/fixtures/release-history/update_test_base_theme.1_1-sec.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<project xmlns:dc="http://purl.org/dc/elements/1.1/">
<title>Update test base theme</title>
-<short_name>update_test_basetheme</short_name>
+<short_name>update_test_base_theme</short_name>
<dc:creator>Drupal</dc:creator>
<supported_branches>8.x-1.</supported_branches>
<project_status>published</project_status>
-<link>http://example.com/project/update_test_basetheme</link>
+<link>http://example.com/project/update_test_base_theme</link>
<terms>
<term><name>Projects</name><value>Themes</value></term>
</terms>
<releases>
<release>
- <name>update_test_basetheme 8.x-1.1</name>
+ <name>update_test_base_theme 8.x-1.1</name>
<version>8.x-1.1</version>
<status>published</status>
- <release_link>http://example.com/update_test_basetheme-8-x-1-1-release</release_link>
- <download_link>http://example.com/update_test_basetheme-8.x-1.1.tar.gz</download_link>
+ <release_link>http://example.com/update_test_base_theme-8-x-1-1-release</release_link>
+ <download_link>http://example.com/update_test_base_theme-8.x-1.1.tar.gz</download_link>
<date>1250624521</date>
<terms>
<term><name>Release type</name><value>Security update</value></term>
@@ -24,11 +24,11 @@
</terms>
</release>
<release>
- <name>update_test_basetheme 8.x-1.0</name>
+ <name>update_test_base_theme 8.x-1.0</name>
<version>8.x-1.0</version>
<status>published</status>
- <release_link>http://example.com/update_test_basetheme-8-x-1-0-release</release_link>
- <download_link>http://example.com/update_test_basetheme-8.x-1.0.tar.gz</download_link>
+ <release_link>http://example.com/update_test_base_theme-8-x-1-0-release</release_link>
+ <download_link>http://example.com/update_test_base_theme-8.x-1.0.tar.gz</download_link>
<date>1250524521</date>
<terms>
<term><name>Release type</name><value>New features</value></term>
diff --git a/core/modules/update/tests/src/Functional/UpdateContribTest.php b/core/modules/update/tests/src/Functional/UpdateContribTest.php
index a6b7415aa8bc..dd64cda62923 100644
--- a/core/modules/update/tests/src/Functional/UpdateContribTest.php
+++ b/core/modules/update/tests/src/Functional/UpdateContribTest.php
@@ -216,9 +216,9 @@ public function testUpdateBaseThemeSecurityUpdate(): void {
// Define the initial state for core and the subtheme.
$this->mockInstalledExtensionsInfo([
- // Show the update_test_basetheme.
- 'update_test_basetheme' => [
- 'project' => 'update_test_basetheme',
+ // Show the update_test_base_theme.
+ 'update_test_base_theme' => [
+ 'project' => 'update_test_base_theme',
'version' => '8.x-1.0',
'hidden' => FALSE,
],
@@ -232,11 +232,11 @@ public function testUpdateBaseThemeSecurityUpdate(): void {
$xml_mapping = [
'drupal' => '8.0.0',
'update_test_subtheme' => '1_0',
- 'update_test_basetheme' => '1_1-sec',
+ 'update_test_base_theme' => '1_1-sec',
];
$this->refreshUpdateStatus($xml_mapping);
$this->assertSession()->pageTextContains('Security update required!');
- $this->updateProject = 'update_test_basetheme';
+ $this->updateProject = 'update_test_base_theme';
$this->assertVersionUpdateLinks('Security update', '8.x-1.1');
}
@@ -351,9 +351,9 @@ public function testUpdateShowDisabledThemes(): void {
// Define the initial state for core and the test contrib themes.
$this->mockInstalledExtensionsInfo([
- // The update_test_basetheme should be visible and up to date.
- 'update_test_basetheme' => [
- 'project' => 'update_test_basetheme',
+ // The update_test_base_theme should be visible and up to date.
+ 'update_test_base_theme' => [
+ 'project' => 'update_test_base_theme',
'version' => '8.x-1.1',
'hidden' => FALSE,
],
@@ -372,7 +372,7 @@ public function testUpdateShowDisabledThemes(): void {
$xml_mapping = [
'drupal' => '8.0.0',
'update_test_subtheme' => '1_0',
- 'update_test_basetheme' => '1_1-sec',
+ 'update_test_base_theme' => '1_1-sec',
];
foreach ([TRUE, FALSE] as $check_disabled) {
$update_settings->set('check.disabled_extensions', $check_disabled)->save();
@@ -384,14 +384,14 @@ public function testUpdateShowDisabledThemes(): void {
if ($check_disabled) {
$this->assertSession()->pageTextContains('Uninstalled themes');
$this->assertSession()->linkExists('Update test base theme');
- $this->assertSession()->linkByHrefExists('http://example.com/project/update_test_basetheme');
+ $this->assertSession()->linkByHrefExists('http://example.com/project/update_test_base_theme');
$this->assertSession()->linkExists('Update test subtheme');
$this->assertSession()->linkByHrefExists('http://example.com/project/update_test_subtheme');
}
else {
$this->assertSession()->pageTextNotContains('Uninstalled themes');
$this->assertSession()->linkNotExists('Update test base theme');
- $this->assertSession()->linkByHrefNotExists('http://example.com/project/update_test_basetheme');
+ $this->assertSession()->linkByHrefNotExists('http://example.com/project/update_test_base_theme');
$this->assertSession()->linkNotExists('Update test subtheme');
$this->assertSession()->linkByHrefNotExists('http://example.com/project/update_test_subtheme');
}
@@ -409,9 +409,9 @@ public function testUpdateHiddenBaseTheme(): void {
// Add a project and initial state for base theme and subtheme.
$this->mockInstalledExtensionsInfo([
- // Hide the update_test_basetheme.
- 'update_test_basetheme' => [
- 'project' => 'update_test_basetheme',
+ // Hide the update_test_base_theme.
+ 'update_test_base_theme' => [
+ 'project' => 'update_test_base_theme',
'hidden' => TRUE,
],
// Show the update_test_subtheme.
@@ -425,7 +425,7 @@ public function testUpdateHiddenBaseTheme(): void {
$project_info = new ProjectInfo();
$project_info->processInfoList($projects, $theme_data, 'theme', TRUE);
- $this->assertNotEmpty($projects['update_test_basetheme'], 'Valid base theme (update_test_basetheme) was found.');
+ $this->assertNotEmpty($projects['update_test_base_theme'], 'Valid base theme (update_test_base_theme) was found.');
}
/**
diff --git a/core/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info.yml b/core/modules/update/tests/themes/update_test_base_theme/update_test_base_theme.info.yml
similarity index 100%
rename from core/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info.yml
rename to core/modules/update/tests/themes/update_test_base_theme/update_test_base_theme.info.yml
diff --git a/core/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info.yml b/core/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info.yml
index 28a6540866a8..c169260f2daa 100644
--- a/core/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info.yml
+++ b/core/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info.yml
@@ -1,5 +1,5 @@
name: 'Update test subtheme'
type: theme
-description: 'Test theme which uses update_test_basetheme as the base theme.'
+description: 'Test theme which uses update_test_base_theme as the base theme.'
version: VERSION
-base theme: update_test_basetheme
+base theme: update_test_base_theme
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_multivalue_basefield.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_multivalue_basefield.yml
index 3fb24ce48a43..c9a3150010a1 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_multivalue_basefield.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_multivalue_basefield.yml
@@ -1,3 +1,4 @@
+# cspell:ignore basefield
langcode: en
status: true
dependencies:
diff --git a/core/modules/views/tests/src/Functional/ViewsEscapingTest.php b/core/modules/views/tests/src/Functional/ViewsEscapingTest.php
index 9c3d45a467e2..f74019779600 100644
--- a/core/modules/views/tests/src/Functional/ViewsEscapingTest.php
+++ b/core/modules/views/tests/src/Functional/ViewsEscapingTest.php
@@ -26,7 +26,7 @@ class ViewsEscapingTest extends ViewTestBase {
/**
* {@inheritdoc}
*
- * We need theme_test for testing against test_basetheme and test_subtheme.
+ * We need theme_test for testing against test_base_theme and test_subtheme.
*
* @var array
*
diff --git a/core/modules/views/tests/src/Functional/ViewsThemeIntegrationTest.php b/core/modules/views/tests/src/Functional/ViewsThemeIntegrationTest.php
index 0111f34e936c..bca85f6d955e 100644
--- a/core/modules/views/tests/src/Functional/ViewsThemeIntegrationTest.php
+++ b/core/modules/views/tests/src/Functional/ViewsThemeIntegrationTest.php
@@ -7,7 +7,7 @@
/**
* Tests the Views theme integration.
*
- * We test against test_basetheme and test_subtheme provided by theme_test
+ * We test against test_base_theme and test_subtheme provided by theme_test
*
* @group views
*/
@@ -29,7 +29,7 @@ class ViewsThemeIntegrationTest extends ViewTestBase {
/**
* {@inheritdoc}
*
- * We need theme_test for testing against test_basetheme and test_subtheme.
+ * We need theme_test for testing against test_base_theme and test_subtheme.
*
* @var array
*
@@ -51,19 +51,19 @@ protected function setUp($import_test_views = TRUE, $modules = ['views_test_conf
*/
public function testThemedViewPage(): void {
- \Drupal::service('theme_installer')->install(['test_basetheme', 'test_subtheme']);
+ \Drupal::service('theme_installer')->install(['test_base_theme', 'test_subtheme']);
// Make base theme default then test for hook invocations.
$this->config('system.theme')
- ->set('default', 'test_basetheme')
+ ->set('default', 'test_base_theme')
->save();
- $this->assertEquals('test_basetheme', $this->config('system.theme')->get('default'));
+ $this->assertEquals('test_base_theme', $this->config('system.theme')->get('default'));
// Make sure a views rendered page is touched.
$this->drupalGet('test_page_display_200');
- $this->assertSession()->responseContains("test_basetheme_views_pre_render");
- $this->assertSession()->responseContains("test_basetheme_views_post_render");
+ $this->assertSession()->responseContains("test_base_theme_views_pre_render");
+ $this->assertSession()->responseContains("test_base_theme_views_post_render");
// Make sub theme default to test for hook invocation
// from both sub and base theme.
@@ -78,8 +78,8 @@ public function testThemedViewPage(): void {
$this->assertSession()->responseContains("test_subtheme_views_pre_render");
$this->assertSession()->responseContains("test_subtheme_views_post_render");
- $this->assertSession()->responseContains("test_basetheme_views_pre_render");
- $this->assertSession()->responseContains("test_basetheme_views_post_render");
+ $this->assertSession()->responseContains("test_base_theme_views_pre_render");
+ $this->assertSession()->responseContains("test_base_theme_views_post_render");
// Verify that the views group title is added.
$this->assertSession()->responseContains('<em class="placeholder">' . count($this->dataSet()) . '</em> items found.');
diff --git a/core/modules/views/tests/src/Kernel/Entity/EntityViewsWithMultivalueBasefieldTest.php b/core/modules/views/tests/src/Kernel/Entity/EntityViewsWithMultivalueBaseFieldTest.php
similarity index 81%
rename from core/modules/views/tests/src/Kernel/Entity/EntityViewsWithMultivalueBasefieldTest.php
rename to core/modules/views/tests/src/Kernel/Entity/EntityViewsWithMultivalueBaseFieldTest.php
index 30e001a85c53..de43c56a62b8 100644
--- a/core/modules/views/tests/src/Kernel/Entity/EntityViewsWithMultivalueBasefieldTest.php
+++ b/core/modules/views/tests/src/Kernel/Entity/EntityViewsWithMultivalueBaseFieldTest.php
@@ -4,16 +4,18 @@
namespace Drupal\Tests\views\Kernel\Entity;
-use Drupal\entity_test\Entity\EntityTestMultiValueBasefield;
+use Drupal\entity_test\Entity\EntityTestMultiValueBaseField;
use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
use Drupal\views\Views;
+// cspell:ignore basefield
+
/**
* Tests entity views with multivalue base fields.
*
* @group views
*/
-class EntityViewsWithMultivalueBasefieldTest extends ViewsKernelTestBase {
+class EntityViewsWithMultivalueBaseFieldTest extends ViewsKernelTestBase {
/**
* {@inheritdoc}
@@ -38,10 +40,10 @@ protected function setUp($import_test_views = TRUE): void {
* Tests entity views with multivalue base fields.
*/
public function testView(): void {
- EntityTestMultiValueBasefield::create([
+ EntityTestMultiValueBaseField::create([
'name' => 'test',
])->save();
- EntityTestMultiValueBasefield::create([
+ EntityTestMultiValueBaseField::create([
'name' => ['test2', 'test3'],
])->save();
diff --git a/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php b/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php
index c8212ff05a4b..8b17c5fd7d65 100644
--- a/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php
@@ -135,7 +135,7 @@ public function testLibrariesOverrideMalformedAsset(): void {
public function testLibrariesOverridesMultiple(): void {
/** @var \Drupal\Core\Extension\ThemeInstallerInterface $theme_installer */
$theme_installer = $this->container->get('theme_installer');
- $theme_installer->install(['test_basetheme']);
+ $theme_installer->install(['test_base_theme']);
$theme_installer->install(['test_subtheme']);
$theme_installer->install(['test_subsubtheme']);
@@ -145,7 +145,7 @@ public function testLibrariesOverridesMultiple(): void {
$libraries_override = $active_theme->getLibrariesOverride();
$expected_order = [
- 'core/modules/system/tests/themes/test_basetheme',
+ 'core/modules/system/tests/themes/test_base_theme',
'core/modules/system/tests/themes/test_subtheme',
'core/modules/system/tests/themes/test_subsubtheme',
];
@@ -183,7 +183,7 @@ public function testBaseThemeLibrariesOverrideInSubTheme(): void {
// Assert that libraries-override specified in the base theme still applies
// in the sub theme.
$this->assertNoAssetInLibrary('core/misc/dialog/dialog.js', 'core', 'drupal.dialog', 'js');
- $this->assertAssetInLibrary('core/modules/system/tests/themes/test_basetheme/js/loadjs.min.js', 'core', 'loadjs', 'js');
+ $this->assertAssetInLibrary('core/modules/system/tests/themes/test_base_theme/js/loadjs.min.js', 'core', 'loadjs', 'js');
}
/**
@@ -218,10 +218,10 @@ public function testLibrariesExtend(): void {
// Activate a sub theme and confirm that it inherits the library assets
// extended in the base theme as well as its own.
- $this->assertNoAssetInLibrary('core/modules/system/tests/themes/test_basetheme/css/base-libraries-extend.css', 'starterkit_theme', 'base', 'css');
+ $this->assertNoAssetInLibrary('core/modules/system/tests/themes/test_base_theme/css/base-libraries-extend.css', 'starterkit_theme', 'base', 'css');
$this->assertNoAssetInLibrary('core/modules/system/tests/themes/test_subtheme/css/sub-libraries-extend.css', 'starterkit_theme', 'base', 'css');
$this->activateTheme('test_subtheme');
- $this->assertAssetInLibrary('core/modules/system/tests/themes/test_basetheme/css/base-libraries-extend.css', 'starterkit_theme', 'base', 'css');
+ $this->assertAssetInLibrary('core/modules/system/tests/themes/test_base_theme/css/base-libraries-extend.css', 'starterkit_theme', 'base', 'css');
$this->assertAssetInLibrary('core/modules/system/tests/themes/test_subtheme/css/sub-libraries-extend.css', 'starterkit_theme', 'base', 'css');
// Activate test theme that extends with a non-existent library. An
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
index 1f71c65aeec0..41ceb1fcfaef 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
@@ -696,25 +696,25 @@ public function testRequiredModuleValidation(): void {
public function testInstallBaseAndSubThemes(): void {
$sync = $this->container->get('config.storage.sync');
$extensions = $sync->read('core.extension');
- $extensions['theme']['test_basetheme'] = 0;
+ $extensions['theme']['test_base_theme'] = 0;
$extensions['theme']['test_subtheme'] = 0;
$extensions['theme']['test_subsubtheme'] = 0;
$sync->write('core.extension', $extensions);
$config_importer = $this->configImporter();
$config_importer->import();
- $this->assertTrue($this->container->get('theme_handler')->themeExists('test_basetheme'));
+ $this->assertTrue($this->container->get('theme_handler')->themeExists('test_base_theme'));
$this->assertTrue($this->container->get('theme_handler')->themeExists('test_subsubtheme'));
$this->assertTrue($this->container->get('theme_handler')->themeExists('test_subtheme'));
// Test uninstalling them.
$extensions = $sync->read('core.extension');
- unset($extensions['theme']['test_basetheme']);
+ unset($extensions['theme']['test_base_theme']);
unset($extensions['theme']['test_subsubtheme']);
unset($extensions['theme']['test_subtheme']);
$sync->write('core.extension', $extensions);
$config_importer = $this->configImporter();
$config_importer->import();
- $this->assertFalse($this->container->get('theme_handler')->themeExists('test_basetheme'));
+ $this->assertFalse($this->container->get('theme_handler')->themeExists('test_base_theme'));
$this->assertFalse($this->container->get('theme_handler')->themeExists('test_subsubtheme'));
$this->assertFalse($this->container->get('theme_handler')->themeExists('test_subtheme'));
}
@@ -909,7 +909,7 @@ public function testCustomStep(): void {
public function testUninstallThemeIncrementsCount(): void {
$theme_installer = $this->container->get('theme_installer');
// Install our theme.
- $theme = 'test_basetheme';
+ $theme = 'test_base_theme';
$theme_installer->install([$theme]);
$this->assertTrue($this->container->get('theme_handler')->themeExists($theme));
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php b/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php
index e26b7b7c92da..77ffe920d8fd 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php
@@ -9,6 +9,8 @@
use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig;
+// cspell:ignore basefield
+
/**
* Tests Field SQL Storage .
*
diff --git a/core/tests/Drupal/KernelTests/Core/Recipe/RecipeRunnerTest.php b/core/tests/Drupal/KernelTests/Core/Recipe/RecipeRunnerTest.php
index 871b040527d7..04cc130035f7 100644
--- a/core/tests/Drupal/KernelTests/Core/Recipe/RecipeRunnerTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Recipe/RecipeRunnerTest.php
@@ -47,7 +47,7 @@ public function testModuleAndThemeInstall(): void {
// Test the state after applying the recipe.
$this->assertTrue($this->container->get('module_handler')->moduleExists('views'), 'The views module is installed');
$this->assertTrue($this->container->get('module_handler')->moduleExists('node'), 'The node module is installed');
- $this->assertTrue($this->container->get('theme_handler')->themeExists('test_basetheme'), 'The test_basetheme theme is installed');
+ $this->assertTrue($this->container->get('theme_handler')->themeExists('test_base_theme'), 'The test_base_theme theme is installed');
$this->assertTrue($this->container->get('theme_handler')->themeExists('test_subtheme'), 'The test_subtheme theme is installed');
$this->assertTrue($this->container->get('theme_handler')->themeExists('test_subsubtheme'), 'The test_subsubtheme theme is installed');
$this->assertTrue($this->container->get('config.storage')->exists('node.settings'), 'The node.settings configuration has been created');
diff --git a/core/tests/Drupal/KernelTests/Core/Theme/MaintenanceThemeTest.php b/core/tests/Drupal/KernelTests/Core/Theme/MaintenanceThemeTest.php
index 2a7f8412d345..ad98558e2199 100644
--- a/core/tests/Drupal/KernelTests/Core/Theme/MaintenanceThemeTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Theme/MaintenanceThemeTest.php
@@ -29,7 +29,7 @@ public function testMaintenanceTheme(): void {
$base_themes = $active_theme->getBaseThemeExtensions();
$base_theme_names = array_keys($base_themes);
- $this->assertSame(['test_basetheme'], $base_theme_names);
+ $this->assertSame(['test_base_theme'], $base_theme_names);
}
}
diff --git a/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php b/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
index a9b272711fbb..1cdca5c5dc09 100644
--- a/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
@@ -69,7 +69,7 @@ public function testRaceCondition(): void {
*/
public function testMultipleSubThemes(): void {
$theme_handler = \Drupal::service('theme_handler');
- \Drupal::service('theme_installer')->install(['test_basetheme', 'test_subtheme', 'test_subsubtheme']);
+ \Drupal::service('theme_installer')->install(['test_base_theme', 'test_subtheme', 'test_subsubtheme']);
$module_list = $this->container->get('extension.list.module');
assert($module_list instanceof ModuleExtensionList);
@@ -78,13 +78,13 @@ public function testMultipleSubThemes(): void {
$registry_subsub_theme->setThemeManager(\Drupal::theme());
$registry_sub_theme = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), \Drupal::service('cache.bootstrap'), $module_list, \Drupal::service('kernel'), 'test_subtheme',);
$registry_sub_theme->setThemeManager(\Drupal::theme());
- $registry_base_theme = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), \Drupal::service('cache.bootstrap'), $module_list, \Drupal::service('kernel'), 'test_basetheme');
+ $registry_base_theme = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), \Drupal::service('cache.bootstrap'), $module_list, \Drupal::service('kernel'), 'test_base_theme');
$registry_base_theme->setThemeManager(\Drupal::theme());
$preprocess_functions = $registry_subsub_theme->get()['theme_test_template_test']['preprocess functions'];
$this->assertSame([
'template_preprocess',
- 'test_basetheme_preprocess_theme_test_template_test',
+ 'test_base_theme_preprocess_theme_test_template_test',
'test_subtheme_preprocess_theme_test_template_test',
'test_subsubtheme_preprocess_theme_test_template_test',
], $preprocess_functions);
@@ -92,14 +92,14 @@ public function testMultipleSubThemes(): void {
$preprocess_functions = $registry_sub_theme->get()['theme_test_template_test']['preprocess functions'];
$this->assertSame([
'template_preprocess',
- 'test_basetheme_preprocess_theme_test_template_test',
+ 'test_base_theme_preprocess_theme_test_template_test',
'test_subtheme_preprocess_theme_test_template_test',
], $preprocess_functions);
$preprocess_functions = $registry_base_theme->get()['theme_test_template_test']['preprocess functions'];
$this->assertSame([
'template_preprocess',
- 'test_basetheme_preprocess_theme_test_template_test',
+ 'test_base_theme_preprocess_theme_test_template_test',
], $preprocess_functions);
}
diff --git a/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php b/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php
index 1a939760dc4f..3ef3ec815dd4 100644
--- a/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php
@@ -64,7 +64,7 @@ public function testEmpty(): void {
* Tests installing a theme.
*/
public function testInstall(): void {
- $name = 'test_basetheme';
+ $name = 'test_base_theme';
$themes = $this->themeHandler()->listInfo();
$this->assertFalse(isset($themes[$name]));
@@ -77,7 +77,7 @@ public function testInstall(): void {
$this->assertTrue(isset($themes[$name]));
$this->assertEquals($name, $themes[$name]->getName());
- // Verify that test_basetheme.settings is active.
+ // Verify that test_base_theme.settings is active.
$this->assertFalse(theme_get_setting('features.favicon', $name));
$this->assertEquals('only', theme_get_setting('base', $name));
$this->assertEquals('base', theme_get_setting('override', $name));
@@ -313,7 +313,7 @@ public function testUninstallAdmin(): void {
*/
public function testUninstallSubTheme(): void {
$name = 'test_subtheme';
- $base_name = 'test_basetheme';
+ $base_name = 'test_base_theme';
$this->themeInstaller()->install([$name]);
$this->themeInstaller()->uninstall([$name]);
@@ -327,7 +327,7 @@ public function testUninstallSubTheme(): void {
* Tests uninstalling a base theme before its sub-theme.
*/
public function testUninstallBaseBeforeSubTheme(): void {
- $name = 'test_basetheme';
+ $name = 'test_base_theme';
$sub_name = 'test_subtheme';
$this->themeInstaller()->install([$sub_name]);
@@ -370,7 +370,7 @@ public function testUninstallNonExisting(): void {
* Tests uninstalling a theme.
*/
public function testUninstall(): void {
- $name = 'test_basetheme';
+ $name = 'test_base_theme';
$this->themeInstaller()->install([$name]);
$this->assertNotEmpty($this->config("$name.settings")->get());
@@ -393,7 +393,7 @@ public function testUninstall(): void {
* Tests uninstalling a theme that is not installed.
*/
public function testUninstallNotInstalled(): void {
- $name = 'test_basetheme';
+ $name = 'test_base_theme';
$themes = $this->themeHandler()->listInfo();
$this->assertEmpty(array_keys($themes));
diff --git a/core/tests/Drupal/KernelTests/Core/Theme/ThemeSettingsTest.php b/core/tests/Drupal/KernelTests/Core/Theme/ThemeSettingsTest.php
index 1a844b19b952..569921b6167b 100644
--- a/core/tests/Drupal/KernelTests/Core/Theme/ThemeSettingsTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Theme/ThemeSettingsTest.php
@@ -45,7 +45,7 @@ protected function setUp(): void {
* Tests that $theme.settings are imported and used as default theme settings.
*/
public function testDefaultConfig(): void {
- $name = 'test_basetheme';
+ $name = 'test_base_theme';
$path = $this->availableThemes[$name]->getPath();
$this->assertFileExists("$path/" . InstallStorage::CONFIG_INSTALL_DIRECTORY . "/$name.settings.yml");
$this->container->get('theme_installer')->install([$name]);
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/RedirectResponseSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/RedirectResponseSubscriberTest.php
index 92049c110983..117739b7cc5c 100644
--- a/core/tests/Drupal/Tests/Core/EventSubscriber/RedirectResponseSubscriberTest.php
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/RedirectResponseSubscriberTest.php
@@ -166,7 +166,7 @@ public static function providerTestDestinationRedirectToExternalUrl() {
'absolute external url' => [new Request(['destination' => 'http://example.com']), 'http://example.com'],
'absolute external url with folder' => [new Request(['destination' => 'http://example.com/foobar']), 'http://example.com/foobar'],
'absolute external url with folder2' => [new Request(['destination' => 'http://example.ca/drupal']), 'http://example.ca/drupal'],
- 'path without drupal basepath' => [new Request(['destination' => '/test']), 'http://example.com/test'],
+ 'path without drupal base path' => [new Request(['destination' => '/test']), 'http://example.com/test'],
'path with URL' => [new Request(['destination' => '/example.com']), 'http://example.com/example.com'],
'path with URL and two slashes' => [new Request(['destination' => '//example.com']), 'http://example.com//example.com'],
];
@@ -196,7 +196,7 @@ public static function providerTestDestinationRedirectWithInvalidUrl() {
$data[] = [new Request(['destination' => '//example:com/test'])];
$data['absolute external url'] = [new Request(['destination' => 'http://example.com'])];
$data['absolute external url with folder'] = [new Request(['destination' => 'http://example.ca/drupal'])];
- $data['path without drupal basepath'] = [new Request(['destination' => '/test'])];
+ $data['path without drupal base path'] = [new Request(['destination' => '/test'])];
$data['path with URL'] = [new Request(['destination' => '/example.com'])];
$data['path with URL and two slashes'] = [new Request(['destination' => '//example.com'])];
diff --git a/core/tests/Drupal/Tests/Core/Extension/ThemeExtensionListTest.php b/core/tests/Drupal/Tests/Core/Extension/ThemeExtensionListTest.php
index e58a86b1a090..95aa36036fde 100644
--- a/core/tests/Drupal/Tests/Core/Extension/ThemeExtensionListTest.php
+++ b/core/tests/Drupal/Tests/Core/Extension/ThemeExtensionListTest.php
@@ -33,7 +33,7 @@ public function testRebuildThemeDataWithThemeParents(): void {
->scan('theme')
->willReturn([
'test_subtheme' => new Extension($this->root, 'theme', 'core/modules/system/tests/themes/test_subtheme/test_subtheme.info.yml', 'test_subtheme.info.yml'),
- 'test_basetheme' => new Extension($this->root, 'theme', 'core/modules/system/tests/themes/test_basetheme/test_basetheme.info.yml', 'test_basetheme.info.yml'),
+ 'test_base_theme' => new Extension($this->root, 'theme', 'core/modules/system/tests/themes/test_base_theme/test_base_theme.info.yml', 'test_base_theme.info.yml'),
]);
$extension_discovery
->scan('theme_engine')
@@ -45,7 +45,7 @@ public function testRebuildThemeDataWithThemeParents(): void {
$argument_condition = function ($path) {
return in_array($path, [
'core/modules/system/tests/themes/test_subtheme/test_subtheme.info.yml',
- 'core/modules/system/tests/themes/test_basetheme/test_basetheme.info.yml',
+ 'core/modules/system/tests/themes/test_base_theme/test_base_theme.info.yml',
'core/themes/engines/twig/twig.info.yml',
], TRUE);
};
@@ -88,21 +88,21 @@ public function testRebuildThemeDataWithThemeParents(): void {
$theme_data = $theme_list->reset()->getList();
$this->assertCount(2, $theme_data);
- $info_basetheme = $theme_data['test_basetheme'];
+ $info_base_theme = $theme_data['test_base_theme'];
$info_subtheme = $theme_data['test_subtheme'];
// Ensure some basic properties.
- $this->assertInstanceOf('Drupal\Core\Extension\Extension', $info_basetheme);
- $this->assertEquals('test_basetheme', $info_basetheme->getName());
+ $this->assertInstanceOf('Drupal\Core\Extension\Extension', $info_base_theme);
+ $this->assertEquals('test_base_theme', $info_base_theme->getName());
$this->assertInstanceOf('Drupal\Core\Extension\Extension', $info_subtheme);
$this->assertEquals('test_subtheme', $info_subtheme->getName());
// Test the parent/child-theme properties.
- $info_subtheme->info['base theme'] = 'test_basetheme';
- $info_basetheme->sub_themes = ['test_subtheme'];
+ $info_subtheme->info['base theme'] = 'test_base_theme';
+ $info_base_theme->sub_themes = ['test_subtheme'];
- $this->assertEquals('core/themes/engines/twig/twig.engine', $info_basetheme->owner);
- $this->assertEquals('twig', $info_basetheme->prefix);
+ $this->assertEquals('core/themes/engines/twig/twig.engine', $info_base_theme->owner);
+ $this->assertEquals('twig', $info_base_theme->prefix);
$this->assertEquals('core/themes/engines/twig/twig.engine', $info_subtheme->owner);
$this->assertEquals('twig', $info_subtheme->prefix);
}
diff --git a/core/tests/Drupal/Tests/PerformanceTestTrait.php b/core/tests/Drupal/Tests/PerformanceTestTrait.php
index 958a316f40cb..b722ebde8d76 100644
--- a/core/tests/Drupal/Tests/PerformanceTestTrait.php
+++ b/core/tests/Drupal/Tests/PerformanceTestTrait.php
@@ -375,7 +375,7 @@ private function collectNetworkData(array $messages, PerformanceData $performanc
// 'encodedDataLength' for network requests, however in the case that the
// file has already been requested by the browser, this will be the length
// of a HEAD response for 304 not modified or similar. Additionally, core's
- // aggregation adds the basepath to CSS aggregates, resulting in slightly
+ // aggregation adds the base path to CSS aggregates, resulting in slightly
// different file sizes depending on whether tests run in a subdirectory or
// not.
foreach ($stylesheet_urls as $url) {
@@ -386,7 +386,7 @@ private function collectNetworkData(array $messages, PerformanceData $performanc
}
else {
$filename = str_replace($GLOBALS['base_path'], '', parse_url($url, PHP_URL_PATH));
- // Strip the basepath from the contents of the file so that tests
+ // Strip the base path from the contents of the file so that tests
// running in a subdirectory get the same results.
$stylesheet_bytes += strlen(str_replace($GLOBALS['base_path'], '/', file_get_contents($filename)));
}
--
GitLab