Skip to content
Snippets Groups Projects
Commit 21219666 authored by catch's avatar catch
Browse files

Issue #3308987 by lauriii, Spokje, quietone, bnjmnm: Remove references to Stable

(cherry picked from commit 6c087ced)
parent 19200d5f
No related branches found
No related tags found
18 merge requests!8506Draft: Issue #3456536 by ibrahim tameme,!5646Issue #3350972 by nod_: [random test failure]...,!5600Issue #3350972 by nod_: [random test failure]...,!5343Issue #3305066 by quietone, Rename RedirectLeadingSlashesSubscriber,!3603#ISSUE 3346218 Add a different message on edit comment,!3555Issue #2473873: Views entity operations lack cacheability support, resulting in incorrect dropbuttons,!3494Issue #3327018 by Spokje, longwave, xjm, mondrake: Update PHPStan to 1.9.3 and...,!3410Issue #3340128: UserLoginForm::submitForm has some dead code,!3389Issue #3325184 by Spokje, andypost, xjm, smustgrave: $this->configFactory is...,!3381Issue #3332363: Refactor Claro's menus-and-lists stylesheet,!3307Issue #3326193: CKEditor 5 can grow past the viewport when there is a lot of content,!3236Issue #3332419: Refactor Claro's messages stylesheet,!3231Draft: Issue #3049525 by longwave, fougere, larowlan, kim.pepper, AaronBauman, Wim...,!3212Issue #3294003: Refactor Claro's entity-meta stylesheet,!3194Issue #3330981: Fix PHPStan L1 error "Relying on entity queries to check access by default is deprecated...",!3143Issue #3313342: [PHP 8.1] Deprecated function: strpos(): Passing null to parameter #1 LayoutBuilderUiCacheContext.php on line 28,!2972Issue #1845004: Replace custom password hashing library with PHP 5.5 password_hash(),!2296Issue #3100732: Allow specifying `meta` data on JSON:API objects
Showing
with 32 additions and 43 deletions
......@@ -112,13 +112,6 @@ public function getActiveThemeByName($theme_name) {
while ($ancestor && isset($themes[$ancestor]->base_theme)) {
$ancestor = $themes[$ancestor]->base_theme;
if (!$this->themeHandler->themeExists($ancestor)) {
if ($ancestor == 'stable') {
// Themes that depend on Stable will be fixed by system_update_8014().
// There is no harm in not adding it as an ancestor since at worst
// some people might experience slight visual regressions on
// update.php.
continue;
}
throw new MissingThemeDependencyException(sprintf('Base theme %s has not been installed.', $ancestor), $ancestor);
}
$base_themes[] = $themes[$ancestor];
......
name: 'BigPipe test theme'
type: theme
base theme: stable
base theme: stable9
description: 'Theme for testing BigPipe edge cases.'
version: VERSION
name: '<"Cat" & ''Mouse''>'
type: theme
base theme: stable
base theme: stable9
description: 'Theme for testing special characters in block admin.'
regions:
content: Content
......
name: 'Block test theme'
type: theme
base theme: stable
base theme: stable9
description: 'Theme for testing the block system'
version: VERSION
regions:
......
......@@ -101,8 +101,8 @@ public function testBlockDemoUiPage() {
$this->assertSession()->assertEscaped('<strong>Test theme</strong>');
// Ensure that a hidden theme cannot use the block demo page.
\Drupal::service('theme_installer')->install(['stable']);
$this->drupalGet('admin/structure/block/demo/stable');
\Drupal::service('theme_installer')->install(['stable9']);
$this->drupalGet('admin/structure/block/demo/stable9');
$this->assertSession()->statusCodeEquals(404);
}
......@@ -150,25 +150,25 @@ public function testBlockAdminUiPage() {
$this->drupalPlaceBlock('local_tasks_block', ['region' => 'header', 'theme' => 'stark']);
// We have to enable at least one extra theme that is not hidden so that
// local tasks will show up. That's why we enable test_theme_theme.
\Drupal::service('theme_installer')->install(['stable', 'test_theme_theme']);
\Drupal::service('theme_installer')->install(['stable9', 'test_theme_theme']);
$this->drupalGet('admin/structure/block');
$theme_handler = \Drupal::service('theme_handler');
$this->assertSession()->linkExists($theme_handler->getName('stark'));
$this->assertSession()->linkExists($theme_handler->getName('test_theme_theme'));
$this->assertSession()->linkNotExists($theme_handler->getName('stable'));
$this->assertSession()->linkNotExists($theme_handler->getName('stable9'));
// Ensure that a hidden theme cannot use the block demo page.
$this->drupalGet('admin/structure/block/list/stable');
$this->drupalGet('admin/structure/block/list/stable9');
$this->assertSession()->statusCodeEquals(404);
// Ensure that a hidden theme set as the admin theme can use the block demo
// page.
\Drupal::configFactory()->getEditable('system.theme')->set('admin', 'stable')->save();
\Drupal::configFactory()->getEditable('system.theme')->set('admin', 'stable9')->save();
\Drupal::service('router.builder')->rebuildIfNeeded();
$this->drupalPlaceBlock('local_tasks_block', ['region' => 'header', 'theme' => 'stable']);
$this->drupalPlaceBlock('local_tasks_block', ['region' => 'header', 'theme' => 'stable9']);
$this->drupalGet('admin/structure/block');
$this->assertSession()->linkExists($theme_handler->getName('stable'));
$this->drupalGet('admin/structure/block/list/stable');
$this->assertSession()->linkExists($theme_handler->getName('stable9'));
$this->drupalGet('admin/structure/block/list/stable9');
$this->assertSession()->statusCodeEquals(200);
}
......
name: 'Configuration Translation Test Theme'
type: theme
base theme: stable
base theme: stable9
description: 'Theme for testing the configuration translation mapper system'
version: VERSION
name: Test Help Topics
type: theme
base theme: stable
base theme: stable9
description: A theme to test help topics.
version: VERSION
name: 'Statistics test attached theme'
type: theme
base theme: stable
base theme: stable9
description: 'Theme for testing attached library'
version: VERSION
......@@ -74,8 +74,8 @@ public function testThemeSettings() {
$this->drupalGet('admin/appearance/settings/' . $this->randomMachineName());
$this->assertSession()->statusCodeEquals(404);
// Ensure a hidden theme settings form URL returns 404.
$this->assertTrue(\Drupal::service('theme_installer')->install(['stable']));
$this->drupalGet('admin/appearance/settings/stable');
$this->assertTrue(\Drupal::service('theme_installer')->install(['stable9']));
$this->drupalGet('admin/appearance/settings/stable9');
$this->assertSession()->statusCodeEquals(404);
// Specify a filesystem path to be used for the logo.
......@@ -210,15 +210,15 @@ public function testThemeSettings() {
$theme_handler = \Drupal::service('theme_handler');
$this->assertSession()->linkExists($theme_handler->getName('starterkit_theme'));
$this->assertSession()->linkExists($theme_handler->getName('olivero'));
$this->assertSession()->linkNotExists($theme_handler->getName('stable'));
$this->assertSession()->linkNotExists($theme_handler->getName('stable9'));
// If a hidden theme is an admin theme it should be viewable.
\Drupal::configFactory()->getEditable('system.theme')->set('admin', 'stable')->save();
\Drupal::configFactory()->getEditable('system.theme')->set('admin', 'stable9')->save();
\Drupal::service('router.builder')->rebuildIfNeeded();
$this->drupalPlaceBlock('local_tasks_block', ['region' => 'header', 'theme' => 'stable']);
$this->drupalPlaceBlock('local_tasks_block', ['region' => 'header', 'theme' => 'stable9']);
$this->drupalGet('admin/appearance/settings');
$this->assertSession()->linkExists($theme_handler->getName('stable'));
$this->drupalGet('admin/appearance/settings/stable');
$this->assertSession()->linkExists($theme_handler->getName('stable9'));
$this->drupalGet('admin/appearance/settings/stable9');
$this->assertSession()->statusCodeEquals(200);
// Ensure default logo and favicons are not triggering custom path
......
......@@ -109,7 +109,7 @@ protected function getOffCanvasDialog() {
* Theme names to test.
*/
protected function getTestThemes() {
return ['claro', 'olivero', 'stable', 'stark'];
return ['claro', 'olivero', 'stable9', 'stark'];
}
/**
......
name: 'Theme test with semver core version'
type: theme
base theme: stable
base theme: stable9
description: 'Test theme which has semver core version.'
version: VERSION
core_version_requirement: ^8 || ^9 || ^10
name: 'Theme test with invalid semver core version'
type: theme
base theme: stable
base theme: stable9
description: 'Test theme which has an invalid semver core version.'
version: VERSION
core_version_requirement: ^7
name: 'Theme test with missing content region'
type: theme
base theme: stable
base theme: stable9
description: 'Test theme which has a non-existent content region.'
version: VERSION
regions:
......
type: theme
base theme: stable
name: 'Test theme depending on Stable'
version: VERSION
type: theme
base theme: stable
base theme: stable9
name: 'Test theme with a too long name'
version: VERSION
name: Test features
type: theme
base theme: stable
base theme: stable9
description: 'Test theme to test theme settings with limited features.'
features:
- node_user_picture
......
name: 'Twig registry loader test'
type: theme
base theme: stable
base theme: stable9
description: 'Support module for Twig registry loader testing.'
version: VERSION
name: Test Wild West
type: theme
description: A theme that doesn't use Stable as its base. It tests the wild west instead.
description: A theme that doesn't use Stable 9 as its base. It tests the wild west instead.
version: VERSION
base theme: false
name: 'Update test base theme'
type: theme
base theme: stable
base theme: stable9
description: 'Test theme which acts as a base theme for other test subthemes.'
version: VERSION
name: 'User Test theme'
type: theme
base theme: stable
base theme: stable9
description: 'Theme for testing the available fields in user twig template'
version: VERSION
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment