Commit e55610f8 authored by alexpott's avatar alexpott

Issue #2226863 by cs_shadow, filijonka, joelpittet, pguillard: Update stale...

Issue #2226863 by cs_shadow, filijonka, joelpittet, pguillard: Update stale references to theme functions that have been converted to Twig
parent 3dcbc223
......@@ -695,7 +695,7 @@ function watchdog_exception($type, Exception $exception, $message = NULL, $varia
* If there are no messages set, the function returns NULL.
*
* @see drupal_get_messages()
* @see theme_status_messages()
* @see status-messages.html.twig
*/
function drupal_set_message($message = NULL, $type = 'status', $repeat = FALSE) {
if (isset($message)) {
......@@ -742,7 +742,7 @@ function drupal_set_message($message = NULL, $type = 'status', $repeat = FALSE)
* drupal_set_message() for the array structure of individual messages.
*
* @see drupal_set_message()
* @see theme_status_messages()
* @see status-messages.html.twig
*/
function drupal_get_messages($type = NULL, $clear_queue = TRUE) {
if ($messages = drupal_set_message()) {
......
......@@ -1968,8 +1968,8 @@ function _drupal_add_library($library_name, $every_page = NULL) {
*
* To set up a table to use drag and drop in place of weight select-lists or in
* place of a form that contains parent relationships, the form must be themed
* into a table. The table must have an ID attribute set. If using
* theme_table(), the ID may be set as follows:
* into a table. The table must have an ID attribute set and it
* may be set as follows:
* @code
* $table = array(
* '#type' => 'table',
......
......@@ -476,7 +476,7 @@ function template_preprocess_form_element(&$variables) {
*
* Form element labels include the #title and a #required marker. The label is
* associated with the element itself by the element #id. Labels may appear
* before or after elements, depending on theme_form_element() and
* before or after elements, depending on form-element.html.twig and
* #title_display.
*
* This function will not be called for elements with no labels, depending on
......
......@@ -1095,9 +1095,9 @@ function template_preprocess_item_list(&$variables) {
// If this child element does not specify how it can be rendered, then
// we need to inherit the render properties of the current list.
if (!isset($child['#type']) && !isset($child['#theme']) && !isset($child['#markup'])) {
// Since theme_item_list() supports both strings and render arrays as
// items, the items of the nested list may have been specified as the
// child elements of the nested list, instead of #items. For
// Since item-list.html.twig supports both strings and render arrays
// as items, the items of the nested list may have been specified as
// the child elements of the nested list, instead of #items. For
// convenience, we automatically move them into #items.
if (!isset($child['#items'])) {
// This is the same condition as in
......@@ -1553,7 +1553,7 @@ function theme_get_suggestions($args, $base, $delimiter = '__') {
}
/**
* Prepare variables for maintenance page templates.
* Prepares variables for maintenance page templates.
*
* Default template: maintenance-page.html.twig.
*
......
......@@ -37,7 +37,7 @@ public function __construct(SelectInterface $query, Connection $connection) {
* @return \Drupal\Core\Database\Query\SelectInterface
* The called object.
*
* @see theme_table()
* @see table.html.twig
*/
public function orderByHeader(array $header) {
$this->header = $header;
......
......@@ -184,7 +184,7 @@ public function buildOperations(EntityInterface $entity) {
/**
* {@inheritdoc}
*
* Builds the entity listing as renderable array for theme_table().
* Builds the entity listing as renderable array for table.html.twig.
*
* @todo Add a link to add a new item to the #empty text.
*/
......
......@@ -149,9 +149,11 @@ public function count();
* Enables sortable tables for this query.
*
* @param $headers
* An array of headers of the same structure as described in theme_table().
* Use a 'specifier' in place of a 'field' to specify what to sort on.
* This can be an entity or a field as described in condition().
* An array of headers of the same structure as described in
* template_preprocess_table(). Use a 'specifier' in place of a 'field' to
* specify what to sort on. This can be an entity or a field as described
* in condition().
*
* @return \Drupal\Core\Entity\Query\QueryInterface
* The called object.
*/
......
......@@ -613,9 +613,9 @@ public function prepareForm($form_id, &$form, FormStateInterface &$form_state) {
$build_info = $form_state->getBuildInfo();
// If no #theme has been set, automatically apply theme suggestions.
// theme_form() itself is in #theme_wrappers and not #theme. Therefore, the
// #theme function only has to care for rendering the inner form elements,
// not the form itself.
// The form theme hook itself, which is rendered by form.html.twig,
// is in #theme_wrappers. Therefore, the #theme function only has to care
// for rendering the inner form elements, not the form itself.
if (!isset($form['#theme'])) {
$form['#theme'] = array($form_id);
if (isset($build_info['base_form_id'])) {
......
......@@ -92,7 +92,7 @@ public static function preRenderActionsDropbutton(&$element, FormStateInterface
);
}
// Add this button to the corresponding dropbutton.
// @todo Change #type 'dropbutton' to be based on theme_item_list()
// @todo Change #type 'dropbutton' to be based on item-list.html.twig
// instead of links.html.twig to avoid this preemptive rendering.
$button = drupal_render($element[$key]);
$dropbuttons[$dropbutton]['#links'][$key] = array(
......
......@@ -56,7 +56,7 @@ public static function processButton(&$element, FormStateInterface $form_state,
}
/**
* Prepares a #type 'button' render element for theme_input().
* Prepares a #type 'button' render element for input.html.twig.
*
* @param array $element
* An associative array containing the properties of the element.
......@@ -66,7 +66,7 @@ public static function processButton(&$element, FormStateInterface $form_state,
* styles the following button_types appropriately: 'primary', 'danger'.
*
* @return array
* The $element with prepared variables ready for theme_input().
* The $element with prepared variables ready for input.html.twig.
*/
public static function preRenderButton($element) {
$element['#attributes']['type'] = 'submit';
......
......@@ -75,7 +75,7 @@ public static function valueCallback(&$element, $input, FormStateInterface $form
}
/**
* Prepares a #type 'checkbox' render element for theme_input().
* Prepares a #type 'checkbox' render element for input.html.twig.
*
* @param array $element
* An associative array containing the properties of the element.
......@@ -83,7 +83,7 @@ public static function valueCallback(&$element, $input, FormStateInterface $form
* #attributes, #checked.
*
* @return array
* The $element with prepared variables ready for theme_input().
* The $element with prepared variables ready for input.html.twig.
*/
public static function preRenderCheckbox($element) {
$element['#attributes']['type'] = 'checkbox';
......
......@@ -62,14 +62,14 @@ public static function validateColor(&$element, FormStateInterface $form_state,
}
/**
* Prepares a #type 'color' render element for theme_input().
* Prepares a #type 'color' render element for input.html.twig.
*
* @param array $element
* An associative array containing the properties of the element.
* Properties used: #title, #value, #description, #attributes.
*
* @return array
* The $element with prepared variables ready for theme_input().
* The $element with prepared variables ready for input.html.twig.
*/
public static function preRenderColor($element) {
$element['#attributes']['type'] = 'color';
......
......@@ -70,7 +70,7 @@ public static function validateEmail(&$element, FormStateInterface $form_state,
}
/**
* Prepares a #type 'email' render element for theme_input().
* Prepares a #type 'email' render element for input.html.twig.
*
* @param array $element
* An associative array containing the properties of the element.
......@@ -78,7 +78,7 @@ public static function validateEmail(&$element, FormStateInterface $form_state,
* #placeholder, #required, #attributes.
*
* @return array
* The $element with prepared variables ready for theme_input().
* The $element with prepared variables ready for input.html.twig.
*/
public static function preRenderEmail($element) {
$element['#attributes']['type'] = 'email';
......
......@@ -49,7 +49,7 @@ public static function processFile(&$element, FormStateInterface $form_state, &$
}
/**
* Prepares a #type 'file' render element for theme_input().
* Prepares a #type 'file' render element for input.html.twig.
*
* For assistance with handling the uploaded file correctly, see the API
* provided by file.inc.
......@@ -60,7 +60,7 @@ public static function processFile(&$element, FormStateInterface $form_state, &$
* #attributes.
*
* @return array
* The $element with prepared variables ready for theme_input().
* The $element with prepared variables ready for input.html.twig.
*/
public static function preRenderFile($element) {
$element['#attributes']['type'] = 'file';
......
......@@ -36,14 +36,14 @@ public function getInfo() {
}
/**
* Prepares a #type 'hidden' render element for theme_input().
* Prepares a #type 'hidden' render element for input.html.twig.
*
* @param array $element
* An associative array containing the properties of the element.
* Properties used: #name, #value, #attributes.
*
* @return array
* The $element with prepared variables ready for theme_input().
* The $element with prepared variables ready for input.html.twig.
*/
public static function preRenderHidden($element) {
$element['#attributes']['type'] = 'hidden';
......
......@@ -81,7 +81,7 @@ public static function validateNumber(&$element, FormStateInterface $form_state,
}
/**
* Prepares a #type 'number' render element for theme_input().
* Prepares a #type 'number' render element for input.html.twig.
*
* @param array $element
* An associative array containing the properties of the element.
......@@ -89,7 +89,7 @@ public static function validateNumber(&$element, FormStateInterface $form_state,
* #required, #attributes, #step, #size.
*
* @return array
* The $element with prepared variables ready for theme_input().
* The $element with prepared variables ready for input.html.twig.
*/
public static function preRenderNumber($element) {
$element['#attributes']['type'] = 'number';
......
......@@ -38,7 +38,7 @@ public function getInfo() {
}
/**
* Prepares a #type 'password' render element for theme_input().
* Prepares a #type 'password' render element for input.html.twig.
*
* @param array $element
* An associative array containing the properties of the element.
......@@ -46,7 +46,7 @@ public function getInfo() {
* #placeholder, #required, #attributes.
*
* @return array
* The $element with prepared variables ready for theme_input().
* The $element with prepared variables ready for input.html.twig.
*/
public static function preRenderPassword($element) {
$element['#attributes']['type'] = 'password';
......
......@@ -39,7 +39,7 @@ public function getInfo() {
}
/**
* Prepares a #type 'radio' render element for theme_input().
* Prepares a #type 'radio' render element for input.html.twig.
*
* @param array $element
* An associative array containing the properties of the element.
......@@ -51,7 +51,7 @@ public function getInfo() {
* all the attributes.
*
* @return array
* The $element with prepared variables ready for theme_input().
* The $element with prepared variables ready for input.html.twig.
*/
public static function preRenderRadio($element) {
$element['#attributes']['type'] = 'radio';
......
......@@ -34,7 +34,7 @@ public function getInfo() {
}
/**
* Prepares a #type 'range' render element for theme_input().
* Prepares a #type 'range' render element for input.html.twig.
*
* @param array $element
* An associative array containing the properties of the element.
......@@ -42,7 +42,7 @@ public function getInfo() {
* #step.
*
* @return array
* The $element with prepared variables ready for theme_input().
* The $element with prepared variables ready for input.html.twig.
*/
public static function preRenderRange($element) {
$element['#attributes']['type'] = 'range';
......
......@@ -43,7 +43,7 @@ public function getInfo() {
}
/**
* Prepares a #type 'search' render element for theme_input().
* Prepares a #type 'search' render element for input.html.twig.
*
* @param array $element
* An associative array containing the properties of the element.
......@@ -51,7 +51,7 @@ public function getInfo() {
* #placeholder, #required, #attributes.
*
* @return array
* The $element with prepared variables ready for theme_input().
* The $element with prepared variables ready for input.html.twig.
*/
public static function preRenderSearch($element) {
$element['#attributes']['type'] = 'search';
......
......@@ -234,10 +234,10 @@ public static function validateTable(&$element, FormStateInterface $form_state,
}
/**
* #pre_render callback to transform children of an element into #rows suitable for theme_table().
* #pre_render callback to transform children of an element of #type 'table'.
*
* This function converts sub-elements of an element of #type 'table' to be
* suitable for theme_table():
* suitable for table.html.twig:
* - The first level of sub-elements are table rows. Only the #attributes
* property is taken into account.
* - The second level of sub-elements is converted into columns for the
......@@ -294,7 +294,7 @@ public static function validateTable(&$element, FormStateInterface $form_state,
*
* @return array
*
* @see theme_table()
* @see template_preprocess_table()
* @see drupal_process_attached()
* @see drupal_attach_tabledrag()
*/
......
......@@ -132,11 +132,11 @@ public static function preRenderTableselect($element) {
// Render the checkbox / radio element.
$row['data'][] = drupal_render($element[$key]);
// As theme_table only maps header and row columns by order, create the
// correct order by iterating over the header fields.
// As table.html.twig only maps header and row columns by order, create
// the correct order by iterating over the header fields.
foreach ($element['#header'] as $fieldname => $title) {
// A row cell can span over multiple headers, which means less row cells
// than headers could be present.
// A row cell can span over multiple headers, which means less row
// cells than headers could be present.
if (isset($element['#options'][$key][$fieldname])) {
// A header can span over multiple cells and in this case the cells
// are passed in an array. The order of this array determines the
......
......@@ -40,7 +40,7 @@ public function getInfo() {
}
/**
* Prepares a #type 'tel' render element for theme_input().
* Prepares a #type 'tel' render element for input.html.twig.
*
* @param array $element
* An associative array containing the properties of the element.
......@@ -48,7 +48,7 @@ public function getInfo() {
* #placeholder, #required, #attributes.
*
* @return array
* The $element with prepared variables ready for theme_input().
* The $element with prepared variables ready for input.html.twig.
*/
public static function preRenderTel($element) {
$element['#attributes']['type'] = 'tel';
......
......@@ -54,7 +54,7 @@ public static function valueCallback(&$element, $input, FormStateInterface $form
}
/**
* Prepares a #type 'textfield' render element for theme_input().
* Prepares a #type 'textfield' render element for input.html.twig.
*
* @param array $element
* An associative array containing the properties of the element.
......@@ -62,7 +62,7 @@ public static function valueCallback(&$element, $input, FormStateInterface $form
* #placeholder, #required, #attributes.
*
* @return array
* The $element with prepared variables ready for theme_input().
* The $element with prepared variables ready for input.html.twig.
*/
public static function preRenderTextfield($element) {
$element['#attributes']['type'] = 'text';
......
......@@ -59,7 +59,7 @@ public static function validateUrl(&$element, FormStateInterface $form_state, &$
}
/**
* Prepares a #type 'url' render element for theme_input().
* Prepares a #type 'url' render element for input.html.twig.
*
* @param array $element
* An associative array containing the properties of the element.
......@@ -67,7 +67,7 @@ public static function validateUrl(&$element, FormStateInterface $form_state, &$
* #placeholder, #required, #attributes.
*
* @return array
* The $element with prepared variables ready for theme_input().
* The $element with prepared variables ready for input.html.twig.
*/
public static function preRenderUrl($element) {
$element['#attributes']['type'] = 'url';
......
......@@ -5,7 +5,7 @@
*
* This template will be used when a block edit form specifies 'block_edit_form'
* as its #theme callback. Otherwise, by default, block add/edit forms will be
* themed by theme_form().
* themed by form.html.twig.
*
* Available variables:
* - form: The block add/edit form.
......
......@@ -504,7 +504,7 @@ function template_preprocess_book_node_export_html(&$variables) {
}
/**
* Implements template_preprocess_HOOK() for theme_book_tree().
* Implements template_preprocess_HOOK() for book-tree.html.twig.
*/
function template_preprocess_book_tree(&$variables) {
$variables['tree'] = $variables['tree']['#children'];
......
......@@ -46,7 +46,7 @@ public static function create(ContainerInterface $container) {
}
/**
* Builds the mappers as a renderable array for theme_table().
* Builds the mappers as a renderable array for table.html.twig.
*
* @return array
* Renderable array with config translation mappers.
......
......@@ -7,7 +7,7 @@
*
* This template will be used when a node edit form specifies 'node_edit_form'
* as its #theme callback. Otherwise, by default, node add/edit forms will be
* themed by theme_form().
* themed by form.html.twig.
*
* Available variables:
* - form: The node add/edit form.
......
......@@ -372,7 +372,7 @@ function rdf_preprocess_user(&$variables) {
}
/**
* Implements hook_preprocess_HOOK() for theme_username().
* Implements hook_preprocess_HOOK() for username.html.twig.
*/
function rdf_preprocess_username(&$variables) {
// Because lang is set on the HTML element that wraps the page, the
......@@ -538,7 +538,7 @@ function rdf_preprocess_taxonomy_term(&$variables) {
}
/**
* Implements hook_preprocess_HOOK() for theme_image().
* Implements hook_preprocess_HOOK() for image.html.twig.
*/
function rdf_preprocess_image(&$variables) {
// Adds the RDF type for image. We cannot use the usual entity-based mapping
......
......@@ -11,7 +11,7 @@
}
/**
* Markup generated by theme_tablesort_indicator().
* Markup generated by tablesort-indicator.html.twig.
*/
th.active img {
display: inline;
......@@ -21,7 +21,7 @@ td.active {
}
/**
* Markup generated by theme_item_list().
* Markup generated by item-list.html.twig.
*/
.item-list .title {
font-weight: bold;
......@@ -398,7 +398,7 @@ ul.links a.active {
}
/**
* Markup generated by theme_breadcrumb().
* Markup generated by breadcrumb.html.twig.
*/
.breadcrumb {
padding-bottom: 0.5em;
......
......@@ -195,7 +195,7 @@ public function getBlockContents() {
* The menu item to be displayed.
*
* @return array
* An array of menu items, as expected by theme_admin_block_content().
* An array of menu items, as expected by admin-block-content.html.twig.
*/
public function getAdminBlock(MenuLinkInterface $instance) {
$content = array();
......
......@@ -28,7 +28,7 @@ class FunctionsTest extends WebTestBase {
public static $modules = array('router_test');
/**
* Tests theme_item_list().
* Tests item-list.html.twig.
*/
function testItemList() {
// Verify that empty items produce no output.
......
......@@ -29,9 +29,8 @@
* template engine extension).
* If a template file should be used, the file has to be placed in the
* module's templates folder.
* Example: theme = "mymodule_row" of module "mymodule" will implement either
* theme_mymodule_row() or mymodule-row.html.twig in the
* [..]/modules/mymodule/templates folder.
* Example: theme = "mymodule_row" of module "mymodule" will implement
* mymodule-row.html.twig in the [..]/modules/mymodule/templates folder.
* - register_theme: (optional) When set to TRUE (default) the theme is
* registered automatically. When set to FALSE the plugin reuses an existing
* theme implementation, defined by another module or views plugin.
......
......@@ -832,7 +832,7 @@ function hook_views_query_alter(ViewExecutable $view, QueryPluginBase $query) {
* The view object.
*
* @see \Drupal\views_ui\ViewUI
* @see theme_table()
* @see table.html.twig
*/
function hook_views_preview_info_alter(array &$rows, ViewExecutable $view) {
// Adds information about the tables being queried by the view to the query
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment