Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2493989 by Antti J. Salminen, lauriii, slashrsm: template_preprocess() and other preprocess functions are called even for theme hooks implemented as functions

8.0.x
Nathaniel Catchpole 2015-09-07 11:19:02 +01:00
parent 44892524cd
commit 47295c18bc
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/lib/Drupal/Core/Theme/Registry.php
View File

@ -472,12 +472,14 @@ class Registry implements DestructableInterface {
// A template file is the default implementation for a theme hook, but // A template file is the default implementation for a theme hook, but
// if the theme hook specifies a function callback instead, check to // if the theme hook specifies a function callback instead, check to
// ensure the function actually exists. // ensure the function actually exists.
if (isset($info['function']) && !function_exists($info['function'])) { if (isset($info['function'])) {
throw new \BadFunctionCallException(sprintf( if (!function_exists($info['function'])) {
'Theme hook "%s" refers to a theme function callback that does not exist: "%s"', throw new \BadFunctionCallException(sprintf(
$hook, 'Theme hook "%s" refers to a theme function callback that does not exist: "%s"',
$info['function'] $hook,
)); $info['function']
));
}
} }
// Provide a default naming convention for 'template' based on the // Provide a default naming convention for 'template' based on the
// hook used. If the template does not exist, the theme engine used // hook used. If the template does not exist, the theme engine used

5
core/modules/system/src/Tests/Theme/RegistryTest.php
View File

@ -100,6 +100,11 @@ class RegistryTest extends KernelTestBase {
'test_basetheme_preprocess_theme_test_template_test', 'test_basetheme_preprocess_theme_test_template_test',
], $preprocess_functions); ], $preprocess_functions);
$preprocess_functions = $registry_base_theme->get()['theme_test_function_suggestions']['preprocess functions'];
$this->assertIdentical([
'template_preprocess_theme_test_function_suggestions',
'test_basetheme_preprocess_theme_test_function_suggestions',
], $preprocess_functions, "Theme functions don't have template_preprocess but do have template_preprocess_HOOK");
} }
/** /**

6
core/modules/system/tests/modules/theme_test/theme_test.module
View File

@ -81,6 +81,12 @@ function theme_test_page_bottom(array &$page_bottom) {
$page_bottom['theme_test_page_bottom'] = array('#markup' => 'theme test page bottom markup'); $page_bottom['theme_test_page_bottom'] = array('#markup' => 'theme test page bottom markup');
} }
/**
* Implements template_preprocess_HOOK() for theme_test_function_suggestions theme functions.
*/
function template_preprocess_theme_test_function_suggestions(&$variables) {
}
/** /**
* Theme function for testing _theme('theme_test_foo'). * Theme function for testing _theme('theme_test_foo').
*/ */

6
core/modules/system/tests/themes/test_basetheme/test_basetheme.theme
View File

@ -28,3 +28,9 @@ function test_basetheme_views_post_render(ViewExecutable $view, &$output, CacheP
*/ */
function test_basetheme_preprocess_theme_test_template_test(&$variables) { function test_basetheme_preprocess_theme_test_template_test(&$variables) {
} }
/**
* Implements hook_preprocess_HOOK() for theme_test_function_suggestions theme functions.
*/
function test_basetheme_preprocess_theme_test_function_suggestions(&$variables) {
}