Skip to content
Snippets Groups Projects
Verified Commit 1e80a22b authored by Dave Long's avatar Dave Long
Browse files

Issue #2972153 by dimitriskr, alexpott, smustgrave, andypost, kostyashupenko:...

Issue #2972153 by dimitriskr, alexpott, smustgrave, andypost, kostyashupenko: Deprecate ThemeHandlerInterface::getBaseThemes and remove usages from core
parent 0e6acad4
Branches
Tags
32 merge requests!12227Issue #3181946 by jonmcl, mglaman,!11131[10.4.x-only-DO-NOT-MERGE]: Issue ##2842525 Ajax attached to Views exposed filter form does not trigger callbacks,!9470[10.3.x-only-DO-NOT-MERGE]: #3331771 Fix file_get_contents(): Passing null to parameter,!8540Issue #3457061: Bootstrap Modal dialog Not closing after 10.3.0 Update,!8528Issue #3456871 by Tim Bozeman: Support NULL services,!8373Issue #3427374 by danflanagan8, Vighneshh: taxonomy_tid ViewsArgumentDefault...,!7526Expose roles in response,!7352Draft: Resolve #3203489 "Set filename as",!5423Draft: Resolve #3329907 "Test2",!3878Removed unused condition head title for views,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3478Issue #3337882: Deleted menus are not removed from content type config,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3133core/modules/system/css/components/hidden.module.css,!2964Issue #2865710 : Dependencies from only one instance of a widget are used in display modes,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2794Issue #3100732: Allow specifying `meta` data on JSON:API objects,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2062Issue #3246454: Add weekly granularity to views date sort,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!877Issue #2708101: Default value for link text is not saved,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493,!213Issue #2906496: Give Media a menu item under Content
Pipeline #120374 canceled
Pipeline: drupal

#120375

    ......@@ -210,8 +210,14 @@ protected function fillInSubThemeData(array &$themes, array $sub_themes) {
    * @return array
    * Returns an array of all of the theme's ancestors; the first element's
    * value will be NULL if an error occurred.
    *
    * @deprecated in drupal:10.3.0 and is removed from drupal:12.0.0. There
    * is no direct replacement.
    *
    * @see https://www.drupal.org/node/3413187
    */
    public function getBaseThemes(array $themes, $theme) {
    @trigger_error("\Drupal\Core\Extension\ThemeExtensionList::getBaseThemes() is deprecated in drupal:10.3.0 and is removed from drupal:12.0.0. There is no direct replacement. See https://www.drupal.org/node/3413187", E_USER_DEPRECATED);
    return $this->doGetBaseThemes($themes, $theme);
    }
    ......
    ......@@ -133,6 +133,7 @@ public function rebuildThemeData() {
    * {@inheritdoc}
    */
    public function getBaseThemes(array $themes, $theme) {
    @trigger_error("\Drupal\Core\Extension\ThemeHandlerInterface::getBaseThemes() is deprecated in drupal:10.3.0 and is removed from drupal:12.0.0. There is no direct replacement. See https://www.drupal.org/node/3413187", E_USER_DEPRECATED);
    return $this->themeList->getBaseThemes($themes, $theme);
    }
    ......
    ......@@ -98,6 +98,11 @@ public function rebuildThemeData();
    * @return array
    * Returns an array of all of the theme's ancestors; the first element's
    * value will be NULL if an error occurred.
    *
    * @deprecated in drupal:10.3.0 and is removed from drupal:12.0.0. There
    * is no direct replacement.
    *
    * @see https://www.drupal.org/node/3413187
    */
    public function getBaseThemes(array $themes, $theme);
    ......
    ......@@ -116,7 +116,9 @@ public function testRebuildThemeDataWithThemeParents() {
    * @param array $expected
    * The expected base themes.
    *
    * @dataProvider providerTestGetBaseThemes
    * @dataProvider providerTestDoGetBaseThemes
    *
    * @group legacy
    */
    public function testGetBaseThemes(array $themes, $theme, array $expected) {
    // Mocks and stubs.
    ......@@ -126,18 +128,45 @@ public function testGetBaseThemes(array $themes, $theme, array $expected) {
    $theme_engine_list = $this->prophesize(ThemeEngineExtensionList::class);
    $theme_listing = new ThemeExtensionList($this->root, 'theme', new NullBackend('test'), new InfoParser($this->root), $module_handler->reveal(), $state, $config_factory, $theme_engine_list->reveal(), 'test');
    $this->expectDeprecation("\Drupal\Core\Extension\ThemeExtensionList::getBaseThemes() is deprecated in drupal:10.3.0 and is removed from drupal:12.0.0. There is no direct replacement. See https://www.drupal.org/node/3413187");
    $base_themes = $theme_listing->getBaseThemes($themes, $theme);
    $this->assertEquals($expected, $base_themes);
    }
    /**
    * Provides test data for testGetBaseThemes.
    * Tests getting the base themes for a set of defined themes.
    *
    * @param array $themes
    * An array of available themes, keyed by the theme name.
    * @param string $theme
    * The theme name to find all its base themes.
    * @param array $expected
    * The expected base themes.
    *
    * @dataProvider providerTestDoGetBaseThemes
    */
    public function testDoGetBaseThemes(array $themes, $theme, array $expected): void {
    // Mocks and stubs.
    $module_handler = $this->prophesize(ModuleHandlerInterface::class);
    $state = new State(new KeyValueMemoryFactory());
    $config_factory = $this->getConfigFactoryStub([]);
    $theme_engine_list = $this->prophesize(ThemeEngineExtensionList::class);
    $theme_listing = new ThemeExtensionList($this->root, 'theme', new NullBackend('test'), new InfoParser($this->root), $module_handler->reveal(), $state, $config_factory, $theme_engine_list->reveal(), 'test');
    $method_to_test = (new \ReflectionObject($theme_listing))->getMethod('doGetBaseThemes');
    $base_themes = $method_to_test->invoke($theme_listing, $themes, $theme);
    $this->assertEquals($expected, $base_themes);
    }
    /**
    * Provides test data for testDoGetBaseThemes.
    *
    * @return array
    * An array of theme test data.
    */
    public static function providerTestGetBaseThemes() {
    public static function providerTestDoGetBaseThemes() {
    $data = [];
    // Tests a theme without any base theme.
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please to comment