From 40f818bbe6477f3082887ae971d5792b2476b090 Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Mon, 31 Mar 2014 10:37:55 -0700
Subject: [PATCH] Issue #2221755 by grom358, ianthomas_uk: Remove uses of
deprecated Element functions.
---
core/includes/authorize.inc | 4 +-
core/includes/common.inc | 20 ++++---
core/includes/form.inc | 59 ++++++++++---------
core/includes/menu.inc | 5 +-
core/includes/theme.inc | 17 +++---
.../Drupal/Component/Utility/SortArray.php | 2 +-
.../Core/Entity/EntityFormController.php | 3 +-
core/lib/Drupal/Core/Render/Element.php | 2 +-
core/modules/aggregator/aggregator.theme.inc | 3 +-
core/modules/book/book.admin.inc | 4 +-
core/modules/book/book.module | 3 +-
.../Drupal/book/Form/BookAdminEditForm.php | 3 +-
.../ckeditor/Plugin/Editor/CKEditor.php | 3 +-
core/modules/comment/comment.module | 3 +-
.../lib/Drupal/contact/MessageViewBuilder.php | 3 +-
.../content_translation.admin.inc | 7 ++-
.../ContentTranslationController.php | 5 +-
.../lib/Drupal/edit/Form/EditFieldForm.php | 3 +-
core/modules/editor/editor.module | 3 +-
.../entity_reference/entity_reference.module | 3 +-
.../Drupal/field/Plugin/views/field/Field.php | 3 +-
core/modules/field_ui/field_ui.module | 3 +-
.../lib/Drupal/field_ui/FieldOverview.php | 3 +-
.../lib/Drupal/field_ui/OverviewBase.php | 2 +-
core/modules/file/file.field.inc | 5 +-
core/modules/file/file.module | 3 +-
.../Plugin/Field/FieldWidget/FileWidget.php | 7 ++-
core/modules/filter/filter.module | 5 +-
.../forum/lib/Drupal/forum/Form/Overview.php | 3 +-
core/modules/image/image.admin.inc | 5 +-
core/modules/language/language.admin.inc | 7 ++-
.../Drupal/locale/Form/TranslateEditForm.php | 3 +-
core/modules/locale/locale.pages.inc | 3 +-
.../lib/Drupal/menu/MenuFormController.php | 3 +-
core/modules/menu/menu.admin.inc | 4 +-
core/modules/menu/menu.module | 3 +-
core/modules/node/node.module | 5 +-
.../lib/Drupal/shortcut/Form/SetCustomize.php | 3 +-
core/modules/simpletest/simpletest.module | 3 +-
core/modules/system/entity.api.php | 3 +-
.../Drupal/system/Form/ModulesListForm.php | 3 +-
.../Drupal/system/Form/ThemeSettingsForm.php | 3 +-
.../Drupal/system/Tests/Common/RenderTest.php | 9 +--
.../lib/Drupal/system/Tests/Form/FormTest.php | 5 +-
.../system/Tests/Form/ValidationTest.php | 5 +-
core/modules/system/system.admin.inc | 5 +-
core/modules/taxonomy/taxonomy.module | 3 +-
core/modules/toolbar/toolbar.module | 5 +-
.../lib/Drupal/user/AccountSettingsForm.php | 3 +-
core/modules/user/user.pages.inc | 3 +-
.../Drupal/views/Plugin/views/HandlerBase.php | 3 +-
.../Drupal/views/Plugin/views/PluginBase.php | 7 ++-
.../views/argument/ArgumentPluginBase.php | 3 +-
.../Plugin/views/filter/FilterPluginBase.php | 5 +-
core/modules/views/views.module | 3 +-
.../views_ui/ViewEditFormController.php | 3 +-
core/modules/views_ui/views_ui.theme.inc | 5 +-
57 files changed, 181 insertions(+), 123 deletions(-)
diff --git a/core/includes/authorize.inc b/core/includes/authorize.inc
index 238a3c680553..6965b7fee785 100644
--- a/core/includes/authorize.inc
+++ b/core/includes/authorize.inc
@@ -5,6 +5,8 @@
* Helper functions and form handlers used for the authorize.php script.
*/
+use Drupal\Core\Render\Element;
+
/**
* Form constructor for the file transfer authorization form.
*
@@ -180,7 +182,7 @@ function _authorize_filetransfer_connection_settings_set_defaults(&$element, $ke
// there's a subarray of settings for the form key we're currently
// processing, pass in that subarray to the recursive call. Otherwise, just
// pass on the whole $defaults array.
- foreach (element_children($element) as $child_key) {
+ foreach (Element::children($element) as $child_key) {
_authorize_filetransfer_connection_settings_set_defaults($element[$child_key], $child_key, ((isset($defaults[$key]) && is_array($defaults[$key])) ? $defaults[$key] : $defaults));
}
}
diff --git a/core/includes/common.inc b/core/includes/common.inc
index 9b3f478db6bd..44cafd148ac4 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -3318,7 +3318,7 @@ function drupal_pre_render_link($element) {
*/
function drupal_pre_render_links($element) {
$element += array('#links' => array(), '#attached' => array());
- foreach (element_children($element) as $key) {
+ foreach (Element::children($element) as $key) {
$child = &$element[$key];
// If the child has links which have not been printed yet and the user has
// access to it, merge its links in to the parent.
@@ -3493,9 +3493,10 @@ function drupal_render_page($page) {
* #pre_render functions have been called, #printed is checked a second time
* in case a #pre_render function flags the element as printed.
* - The child elements of this element are sorted by weight using uasort() in
- * element_children(). Since this is expensive, when passing already sorted
- * elements to drupal_render(), for example from a database query, set
- * $elements['#sorted'] = TRUE to avoid sorting them a second time.
+ * \Drupal\Core\Render\Element::children(). Since this is expensive, when
+ * passing already sorted elements to drupal_render(), for example from a
+ * database query, set $elements['#sorted'] = TRUE to avoid sorting them a
+ * second time.
* - The main render phase to produce #children for this element takes place:
* - If this element has #theme defined and #theme is an implemented theme
* hook/suggestion then _theme() is called and must render both the element
@@ -3777,7 +3778,8 @@ function drupal_render(&$elements, $is_recursive_call = FALSE) {
* The structured array whose children shall be rendered.
* @param array $children_keys
* (optional) If the keys of the element's children are already known, they
- * can be passed in to save another run of element_children().
+ * can be passed in to save another run of
+ * \Drupal\Core\Render\Element::children().
*
* @return string
* The rendered HTML of all children of the element.
@@ -3786,7 +3788,7 @@ function drupal_render(&$elements, $is_recursive_call = FALSE) {
*/
function drupal_render_children(&$element, $children_keys = NULL) {
if ($children_keys === NULL) {
- $children_keys = element_children($element);
+ $children_keys = Element::children($element);
}
$output = '';
foreach ($children_keys as $key) {
@@ -4154,7 +4156,7 @@ function drupal_render_collect_post_render_cache(array &$elements, array $callba
// Collect the #post_render_cache callbacks for all child elements, unless
// we've already collected them above by retrieving this element (and its
// children) from the render cache.
- if (!$retrieved_from_cache && $children = element_children($elements)) {
+ if (!$retrieved_from_cache && $children = Element::children($elements)) {
foreach ($children as $child) {
$callbacks = drupal_render_collect_post_render_cache($elements[$child], $callbacks, FALSE);
}
@@ -4186,7 +4188,7 @@ function drupal_render_collect_attached($elements, $return = FALSE) {
if (isset($elements['#attached'])) {
$attached = drupal_merge_attached($attached, $elements['#attached']);
}
- if ($children = element_children($elements)) {
+ if ($children = Element::children($elements)) {
foreach ($children as $child) {
drupal_render_collect_attached($elements[$child]);
}
@@ -4236,7 +4238,7 @@ function drupal_render_collect_cache_tags($element, $tags = array()) {
}
}
}
- if ($children = element_children($element)) {
+ if ($children = Element::children($element)) {
foreach ($children as $child) {
$tags = drupal_render_collect_cache_tags($element[$child], $tags);
}
diff --git a/core/includes/form.inc b/core/includes/form.inc
index d290b4f44951..5b292f53bf88 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -12,6 +12,7 @@
use Drupal\Component\Utility\Xss;
use Drupal\Core\Database\Database;
use Drupal\Core\Language\Language;
+use Drupal\Core\Render\Element;
use Drupal\Core\Template\Attribute;
use Drupal\Core\Utility\Color;
use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -893,7 +894,7 @@ function form_process_select($element) {
*/
function template_preprocess_select(&$variables) {
$element = $variables['element'];
- element_set_attributes($element, array('id', 'name', 'size'));
+ Element::setAttributes($element, array('id', 'name', 'size'));
_form_set_attributes($element, array('form-select'));
$variables['attributes'] = $element['#attributes'];
@@ -1014,7 +1015,7 @@ function form_get_options($element, $key) {
*/
function template_preprocess_fieldset(&$variables) {
$element = $variables['element'];
- element_set_attributes($element, array('id'));
+ Element::setAttributes($element, array('id'));
_form_set_attributes($element, array('form-wrapper'));
$variables['attributes'] = $element['#attributes'];
$variables['attributes']['class'][] = 'form-item';
@@ -1103,7 +1104,7 @@ function template_preprocess_details(&$variables) {
*/
function form_pre_render_radio($element) {
$element['#attributes']['type'] = 'radio';
- element_set_attributes($element, array('id', 'name', '#return_value' => 'value'));
+ Element::setAttributes($element, array('id', 'name', '#return_value' => 'value'));
if (isset($element['#return_value']) && $element['#value'] !== FALSE && $element['#value'] == $element['#return_value']) {
$element['#attributes']['checked'] = 'checked';
@@ -1213,7 +1214,7 @@ function theme_date($variables) {
if (empty($element['attribute']['type'])) {
$element['attribute']['type'] = 'date';
}
- element_set_attributes($element, array('id', 'name', 'type', 'min', 'max', 'step', 'value', 'size'));
+ Element::setAttributes($element, array('id', 'name', 'type', 'min', 'max', 'step', 'value', 'size'));
_form_set_attributes($element, array('form-' . $element['attribute']['type']));
return '<input' . new Attribute($element['#attributes']) . ' />';
@@ -1280,7 +1281,7 @@ function form_process_radios($element) {
*/
function form_pre_render_checkbox($element) {
$element['#attributes']['type'] = 'checkbox';
- element_set_attributes($element, array('id', 'name', '#return_value' => 'value'));
+ Element::setAttributes($element, array('id', 'name', '#return_value' => 'value'));
// Unchecked checkbox has #value of integer 0.
if (!empty($element['#checked'])) {
@@ -1459,7 +1460,7 @@ function form_process_actions($element, &$form_state) {
*/
function form_pre_render_actions_dropbutton(array $element) {
$dropbuttons = array();
- foreach (element_children($element, TRUE) as $key) {
+ foreach (Element::children($element, TRUE) as $key) {
if (isset($element[$key]['#dropbutton'])) {
$dropbutton = $element[$key]['#dropbutton'];
// If there is no dropbutton for this button group yet, create one.
@@ -1604,7 +1605,7 @@ function theme_tableselect($variables) {
$header = $element['#header'];
if (!empty($element['#options'])) {
// Generate a table row for each selectable item in #options.
- foreach (element_children($element) as $key) {
+ foreach (Element::children($element) as $key) {
$row = array();
$row['data'] = array();
@@ -1776,7 +1777,7 @@ function form_process_table($element, &$form_state) {
// Create a checkbox or radio for each row in a way that the value of the
// tableselect element behaves as if it had been of #type checkboxes or
// radios.
- foreach (element_children($element) as $key) {
+ foreach (Element::children($element) as $key) {
$row = &$element[$key];
// Prepare the element #parents for the tableselect form element.
// Their values have to be located in child keys (#tree is ignored), since
@@ -1806,7 +1807,7 @@ function form_process_table($element, &$form_state) {
$title = $row['title']['#title'];
}
else {
- foreach (element_children($row) as $column) {
+ foreach (Element::children($row) as $column) {
if (isset($row[$column]['#title'])) {
$title = $row[$column]['#title'];
break;
@@ -2076,7 +2077,7 @@ function form_process_group(&$element, &$form_state) {
* The modified element.
*/
function form_pre_render_details($element) {
- element_set_attributes($element, array('id'));
+ Element::setAttributes($element, array('id'));
// The .form-wrapper class is required for #states to treat details like
// containers.
@@ -2091,7 +2092,7 @@ function form_pre_render_details($element) {
// Do not render optional details elements if there are no children.
if (isset($element['#parents'])) {
$group = implode('][', $element['#parents']);
- if (!empty($element['#optional']) && !element_get_visible_children($element['#groups'][$group])) {
+ if (!empty($element['#optional']) && !Element::getVisibleChildren($element['#groups'][$group])) {
$element['#printed'] = TRUE;
}
}
@@ -2117,7 +2118,7 @@ function form_pre_render_group($element) {
// Inject group member elements belonging to this group.
$parents = implode('][', $element['#parents']);
- $children = element_children($element['#groups'][$parents]);
+ $children = Element::children($element['#groups'][$parents]);
if (!empty($children)) {
foreach ($children as $key) {
// Break references and indicate that the element should be rendered as
@@ -2151,7 +2152,7 @@ function form_pre_render_group($element) {
}
// Otherwise, this element belongs to a group and the group exists, so we do
// not render it.
- elseif (element_children($element['#groups'][$group])) {
+ elseif (Element::children($element['#groups'][$group])) {
$element['#printed'] = TRUE;
}
}
@@ -2218,7 +2219,7 @@ function form_process_vertical_tabs($element, &$form_state) {
function form_pre_render_vertical_tabs($element) {
// Do not render the vertical tabs element if it is empty.
$group = implode('][', $element['#parents']);
- if (!element_get_visible_children($element['group']['#groups'][$group])) {
+ if (!Element::getVisibleChildren($element['group']['#groups'][$group])) {
$element['#printed'] = TRUE;
}
return $element;
@@ -2326,7 +2327,7 @@ function theme_input($variables) {
*/
function form_pre_render_button($element) {
$element['#attributes']['type'] = 'submit';
- element_set_attributes($element, array('id', 'name', 'value'));
+ Element::setAttributes($element, array('id', 'name', 'value'));
$element['#attributes']['class'][] = 'button';
if (!empty($element['#button_type'])) {
@@ -2357,7 +2358,7 @@ function form_pre_render_button($element) {
*/
function form_pre_render_image_button($element) {
$element['#attributes']['type'] = 'image';
- element_set_attributes($element, array('id', 'name', 'value'));
+ Element::setAttributes($element, array('id', 'name', 'value'));
$element['#attributes']['src'] = file_create_url($element['#src']);
if (!empty($element['#title'])) {
@@ -2391,7 +2392,7 @@ function form_pre_render_image_button($element) {
*/
function form_pre_render_hidden($element) {
$element['#attributes']['type'] = 'hidden';
- element_set_attributes($element, array('name', 'value'));
+ Element::setAttributes($element, array('name', 'value'));
return $element;
}
@@ -2409,7 +2410,7 @@ function form_pre_render_hidden($element) {
*/
function form_pre_render_textfield($element) {
$element['#attributes']['type'] = 'text';
- element_set_attributes($element, array('id', 'name', 'value', 'size', 'maxlength', 'placeholder'));
+ Element::setAttributes($element, array('id', 'name', 'value', 'size', 'maxlength', 'placeholder'));
_form_set_attributes($element, array('form-text'));
return $element;
@@ -2428,7 +2429,7 @@ function form_pre_render_textfield($element) {
*/
function form_pre_render_email($element) {
$element['#attributes']['type'] = 'email';
- element_set_attributes($element, array('id', 'name', 'value', 'size', 'maxlength', 'placeholder'));
+ Element::setAttributes($element, array('id', 'name', 'value', 'size', 'maxlength', 'placeholder'));
_form_set_attributes($element, array('form-email'));
return $element;
@@ -2461,7 +2462,7 @@ function form_validate_email(&$element, &$form_state) {
*/
function form_pre_render_tel($element) {
$element['#attributes']['type'] = 'tel';
- element_set_attributes($element, array('id', 'name', 'value', 'size', 'maxlength', 'placeholder'));
+ Element::setAttributes($element, array('id', 'name', 'value', 'size', 'maxlength', 'placeholder'));
_form_set_attributes($element, array('form-tel'));
return $element;
@@ -2480,7 +2481,7 @@ function form_pre_render_tel($element) {
*/
function form_pre_render_number($element) {
$element['#attributes']['type'] = 'number';
- element_set_attributes($element, array('id', 'name', 'value', 'step', 'min', 'max', 'placeholder', 'size'));
+ Element::setAttributes($element, array('id', 'name', 'value', 'step', 'min', 'max', 'placeholder', 'size'));
_form_set_attributes($element, array('form-number'));
return $element;
@@ -2499,7 +2500,7 @@ function form_pre_render_number($element) {
*/
function form_pre_render_range($element) {
$element['#attributes']['type'] = 'range';
- element_set_attributes($element, array('id', 'name', 'value', 'step', 'min', 'max'));
+ Element::setAttributes($element, array('id', 'name', 'value', 'step', 'min', 'max'));
_form_set_attributes($element, array('form-range'));
return $element;
@@ -2588,7 +2589,7 @@ function form_type_range_value($element, $input = FALSE) {
*/
function form_pre_render_url($element) {
$element['#attributes']['type'] = 'url';
- element_set_attributes($element, array('id', 'name', 'value', 'size', 'maxlength', 'placeholder'));
+ Element::setAttributes($element, array('id', 'name', 'value', 'size', 'maxlength', 'placeholder'));
_form_set_attributes($element, array('form-url'));
return $element;
@@ -2607,7 +2608,7 @@ function form_pre_render_url($element) {
*/
function form_pre_render_search($element) {
$element['#attributes']['type'] = 'search';
- element_set_attributes($element, array('id', 'name', 'value', 'size', 'maxlength', 'placeholder'));
+ Element::setAttributes($element, array('id', 'name', 'value', 'size', 'maxlength', 'placeholder'));
_form_set_attributes($element, array('form-search'));
return $element;
@@ -2661,7 +2662,7 @@ function form_validate_color(&$element, &$form_state) {
*/
function form_pre_render_color($element) {
$element['#attributes']['type'] = 'color';
- element_set_attributes($element, array('id', 'name', 'value'));
+ Element::setAttributes($element, array('id', 'name', 'value'));
_form_set_attributes($element, array('form-color'));
return $element;
@@ -2682,7 +2683,7 @@ function template_preprocess_form(&$variables) {
if (isset($element['#action'])) {
$element['#attributes']['action'] = UrlHelper::stripDangerousProtocols($element['#action']);
}
- element_set_attributes($element, array('method', 'id'));
+ Element::setAttributes($element, array('method', 'id'));
if (empty($element['#attributes']['accept-charset'])) {
$element['#attributes']['accept-charset'] = "UTF-8";
}
@@ -2704,7 +2705,7 @@ function template_preprocess_form(&$variables) {
*/
function template_preprocess_textarea(&$variables) {
$element = $variables['element'];
- element_set_attributes($element, array('id', 'name', 'rows', 'cols', 'placeholder'));
+ Element::setAttributes($element, array('id', 'name', 'rows', 'cols', 'placeholder'));
_form_set_attributes($element, array('form-textarea'));
$variables['wrapper_attributes'] = new Attribute(array(
'class' => array('form-textarea-wrapper'),
@@ -2733,7 +2734,7 @@ function template_preprocess_textarea(&$variables) {
*/
function form_pre_render_password($element) {
$element['#attributes']['type'] = 'password';
- element_set_attributes($element, array('id', 'name', 'size', 'maxlength', 'placeholder'));
+ Element::setAttributes($element, array('id', 'name', 'size', 'maxlength', 'placeholder'));
_form_set_attributes($element, array('form-text'));
return $element;
@@ -2782,7 +2783,7 @@ function form_process_weight($element) {
*/
function form_pre_render_file($element) {
$element['#attributes']['type'] = 'file';
- element_set_attributes($element, array('id', 'name', 'size'));
+ Element::setAttributes($element, array('id', 'name', 'size'));
_form_set_attributes($element, array('form-file'));
return $element;
diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index 15708f8e590c..d8dab771267a 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -8,6 +8,7 @@
use Drupal\Component\Utility\String;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Language\Language;
+use Drupal\Core\Render\Element;
use Drupal\Core\Template\Attribute;
use Symfony\Cmf\Component\Routing\RouteObjectInterface;
@@ -553,7 +554,7 @@ function menu_local_tasks($level = 0) {
function menu_primary_local_tasks() {
$links = menu_local_tasks(0);
// Do not display single tabs.
- return count(element_get_visible_children($links['tabs'])) > 1 ? $links['tabs'] : '';
+ return count(Element::getVisibleChildren($links['tabs'])) > 1 ? $links['tabs'] : '';
}
/**
@@ -562,7 +563,7 @@ function menu_primary_local_tasks() {
function menu_secondary_local_tasks() {
$links = menu_local_tasks(1);
// Do not display single tabs.
- return count(element_get_visible_children($links['tabs'])) > 1 ? $links['tabs'] : '';
+ return count(Element::getVisibleChildren($links['tabs'])) > 1 ? $links['tabs'] : '';
}
/**
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 178702b2aff8..0b5aef99c301 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -1323,7 +1323,7 @@ function template_preprocess_image(&$variables) {
* @see drupal_attach_tabledrag()
*/
function drupal_pre_render_table(array $element) {
- foreach (element_children($element) as $first) {
+ foreach (Element::children($element) as $first) {
$row = array('data' => array());
// Apply attributes of first-level elements as table row attributes.
if (isset($element[$first]['#attributes'])) {
@@ -1332,7 +1332,7 @@ function drupal_pre_render_table(array $element) {
// Turn second-level elements into table row columns.
// @todo Do not render a cell for children of #type 'value'.
// @see http://drupal.org/node/1248940
- foreach (element_children($element[$first]) as $second) {
+ foreach (Element::children($element[$first]) as $second) {
// Assign the element by reference, so any potential changes to the
// original element are taken over.
$column = array('data' => &$element[$first][$second]);
@@ -1349,7 +1349,7 @@ function drupal_pre_render_table(array $element) {
}
// Take over $element['#id'] as HTML ID attribute, if not already set.
- element_set_attributes($element, array('id'));
+ Element::setAttributes($element, array('id'));
// Add sticky headers, if applicable.
@@ -1682,8 +1682,9 @@ function template_preprocess_item_list(&$variables) {
// 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 element_children(), which cannot
- // be used here, since it triggers an error on string values.
+ // This is the same condition as in
+ // \Drupal\Core\Render\Element::children(), which cannot be used
+ // here, since it triggers an error on string values.
foreach ($child as $child_key => $child_value) {
if ($child_key[0] !== '#') {
$child['#items'][$child_key] = $child_value;
@@ -2405,9 +2406,9 @@ function template_preprocess_field(&$variables, $hook) {
// We want other preprocess functions and the theme implementation to have
// fast access to the field item render arrays. The item render array keys
// (deltas) should always be numerically indexed starting from 0, and looping
- // on those keys is faster than calling element_children() or looping on all
- // keys within $element, since that requires traversal of all element
- // properties.
+ // on those keys is faster than calling
+ // \Drupal\Core\Render\Element::children() or looping on all keys within
+ // $element, since that requires traversal of all element properties.
$variables['items'] = array();
$delta = 0;
while (!empty($element[$delta])) {
diff --git a/core/lib/Drupal/Component/Utility/SortArray.php b/core/lib/Drupal/Component/Utility/SortArray.php
index 4774f88e8e24..a8d9f0009e89 100644
--- a/core/lib/Drupal/Component/Utility/SortArray.php
+++ b/core/lib/Drupal/Component/Utility/SortArray.php
@@ -39,7 +39,7 @@ public static function sortByWeightElement(array $a, array $b) {
/**
* Sorts a structured array by '#weight' property.
*
- * Callback for uasort() within element_children().
+ * Callback for uasort() within \Drupal\Core\Render\Element::children().
*
* @param array $a
* First item for comparison. The compared items should be associative
diff --git a/core/lib/Drupal/Core/Entity/EntityFormController.php b/core/lib/Drupal/Core/Entity/EntityFormController.php
index ff13761442ec..4e7f9619699a 100644
--- a/core/lib/Drupal/Core/Entity/EntityFormController.php
+++ b/core/lib/Drupal/Core/Entity/EntityFormController.php
@@ -9,6 +9,7 @@
use Drupal\Core\Form\FormBase;
use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Render\Element;
/**
* Base class for entity form controllers.
@@ -186,7 +187,7 @@ protected function actionsElement(array $form, array &$form_state) {
}
$count = 0;
- foreach (element_children($element) as $action) {
+ foreach (Element::children($element) as $action) {
$element[$action] += array(
'#type' => 'submit',
'#weight' => ++$count * 5,
diff --git a/core/lib/Drupal/Core/Render/Element.php b/core/lib/Drupal/Core/Render/Element.php
index 9a3241f8a348..501f2de43ba0 100644
--- a/core/lib/Drupal/Core/Render/Element.php
+++ b/core/lib/Drupal/Core/Render/Element.php
@@ -95,7 +95,7 @@ public static function children(array &$elements, $sort = FALSE) {
uasort($children, 'Drupal\Component\Utility\SortArray::sortByWeightProperty');
// Put the sorted children back into $elements in the correct order, to
// preserve sorting if the same element is passed through
- // element_children() twice.
+ // \Drupal\Core\Render\Element::children() twice.
foreach ($children as $key => $child) {
unset($elements[$key]);
$elements[$key] = $child;
diff --git a/core/modules/aggregator/aggregator.theme.inc b/core/modules/aggregator/aggregator.theme.inc
index 3163d05fdd16..c65a3cf834ec 100644
--- a/core/modules/aggregator/aggregator.theme.inc
+++ b/core/modules/aggregator/aggregator.theme.inc
@@ -6,6 +6,7 @@
*/
use Drupal\Component\Utility\String;
+use Drupal\Core\Render\Element;
/**
* Prepares variables for aggregator item templates.
@@ -86,7 +87,7 @@ function theme_aggregator_page_opml($variables) {
function template_preprocess_aggregator_summary_items(&$variables) {
$variables['title'] = String::checkPlain($variables['source']->label());
$summary_items = array();
- foreach (element_children($variables['summary_items']) as $key) {
+ foreach (Element::children($variables['summary_items']) as $key) {
$summary_items[] = $variables['summary_items'][$key];
}
$variables['summary_list'] = array(
diff --git a/core/modules/book/book.admin.inc b/core/modules/book/book.admin.inc
index 07d4552be9a8..4379582b07f2 100644
--- a/core/modules/book/book.admin.inc
+++ b/core/modules/book/book.admin.inc
@@ -5,6 +5,8 @@
* Administration page callbacks for the Book module.
*/
+use Drupal\Core\Render\Element;
+
/**
* Returns HTML for a book administration form.
*
@@ -23,7 +25,7 @@ function theme_book_admin_table($variables) {
$rows = array();
$destination = drupal_get_destination();
$access = \Drupal::currentUser()->hasPermission('administer nodes');
- foreach (element_children($form) as $key) {
+ foreach (Element::children($form) as $key) {
$nid = $form[$key]['nid']['#value'];
$href = \Drupal::url('node.view', array('node' => $nid));
diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index efc718bdd09d..bb86b2938eac 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -8,6 +8,7 @@
use Drupal\book\BookManagerInterface;
use Drupal\Component\Utility\String;
use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Render\Element;
use Drupal\node\NodeInterface;
use Drupal\node\NodeTypeInterface;
use Drupal\Core\Language\Language;
@@ -384,7 +385,7 @@ function template_preprocess_book_all_books_block(&$variables) {
// Remove all non-renderable elements.
$elements = $variables['book_menus'];
$variables['book_menus'] = array();
- foreach (element_children($elements) as $index) {
+ foreach (Element::children($elements) as $index) {
$variables['book_menus'][$index] = $elements[$index];
}
}
diff --git a/core/modules/book/lib/Drupal/book/Form/BookAdminEditForm.php b/core/modules/book/lib/Drupal/book/Form/BookAdminEditForm.php
index ef9ed99dcdae..a3396411fa4e 100644
--- a/core/modules/book/lib/Drupal/book/Form/BookAdminEditForm.php
+++ b/core/modules/book/lib/Drupal/book/Form/BookAdminEditForm.php
@@ -11,6 +11,7 @@
use Drupal\Component\Utility\Crypt;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Form\FormBase;
+use Drupal\Core\Render\Element;
use Drupal\node\NodeInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -97,7 +98,7 @@ public function submitForm(array &$form, array &$form_state) {
$order = array_flip(array_keys($form_state['input']['table']));
$form['table'] = array_merge($order, $form['table']);
- foreach (element_children($form['table']) as $key) {
+ foreach (Element::children($form['table']) as $key) {
if ($form['table'][$key]['#item']) {
$row = $form['table'][$key];
$values = $form_state['values']['table'][$key];
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
index 2777f6775682..f382446c615a 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
@@ -12,6 +12,7 @@
use Drupal\ckeditor\CKEditorPluginManager;
use Drupal\Core\Language\Language;
use Drupal\Core\Language\LanguageManager;
+use Drupal\Core\Render\Element;
use Drupal\editor\Plugin\EditorBase;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\editor\Entity\Editor as EditorEntity;
@@ -165,7 +166,7 @@ public function settingsForm(array $form, array &$form_state, EditorEntity $edit
),
);
$this->ckeditorPluginManager->injectPluginSettingsForm($form, $form_state, $editor);
- if (count(element_children($form['plugins'])) === 0) {
+ if (count(Element::children($form['plugins'])) === 0) {
unset($form['plugins']);
unset($form['plugin_settings']);
}
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index d9d86d41553c..3add1d1198ba 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -14,6 +14,7 @@
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Render\Element;
use Drupal\Core\Url;
use Drupal\field\FieldInstanceConfigInterface;
use Drupal\field\FieldConfigInterface;
@@ -1387,7 +1388,7 @@ function template_preprocess_comment(&$variables) {
}
// Helpful $content variable for templates.
- foreach (element_children($variables['elements']) as $key) {
+ foreach (Element::children($variables['elements']) as $key) {
$variables['content'][$key] = $variables['elements'][$key];
}
diff --git a/core/modules/contact/lib/Drupal/contact/MessageViewBuilder.php b/core/modules/contact/lib/Drupal/contact/MessageViewBuilder.php
index 5e5b6dd9b16c..f5eedb7cb926 100644
--- a/core/modules/contact/lib/Drupal/contact/MessageViewBuilder.php
+++ b/core/modules/contact/lib/Drupal/contact/MessageViewBuilder.php
@@ -10,6 +10,7 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityViewBuilder;
use Drupal\Component\Utility\String;
+use Drupal\Core\Render\Element;
/**
* Render controller for contact messages.
@@ -44,7 +45,7 @@ public function view(EntityInterface $entity, $view_mode = 'full', $langcode = N
if ($view_mode == 'mail') {
// Convert field labels into headings.
// @todo Improve drupal_html_to_text() to convert DIVs correctly.
- foreach (element_children($build) as $key) {
+ foreach (Element::children($build) as $key) {
if (isset($build[$key]['#label_display']) && $build[$key]['#label_display'] == 'above') {
$build[$key] += array('#prefix' => '');
$build[$key]['#prefix'] = $build[$key]['#title'] . ":\n";
diff --git a/core/modules/content_translation/content_translation.admin.inc b/core/modules/content_translation/content_translation.admin.inc
index d7017a90e3ea..557f06e49737 100644
--- a/core/modules/content_translation/content_translation.admin.inc
+++ b/core/modules/content_translation/content_translation.admin.inc
@@ -8,6 +8,7 @@
use Drupal\Component\Utility\String;
use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\Language\Language;
+use Drupal\Core\Render\Element;
use Drupal\field\Field as FieldService;
use Drupal\field\FieldInstanceConfigInterface;
@@ -157,8 +158,8 @@ function _content_translation_preprocess_language_content_settings_table(&$varia
array_unshift($build['#header'], array('data' => t('Translatable'), 'class' => array('translatable')));
$rows = array();
- foreach (element_children($element) as $bundle) {
- $field_names = !empty($element[$bundle]['fields']) ? element_children($element[$bundle]['fields']) : array();
+ foreach (Element::children($element) as $bundle) {
+ $field_names = !empty($element[$bundle]['fields']) ? Element::children($element[$bundle]['fields']) : array();
if (!empty($element[$bundle]['translatable'])) {
$checkbox_id = $element[$bundle]['translatable']['#id'];
}
@@ -213,7 +214,7 @@ function _content_translation_preprocess_language_content_settings_table(&$varia
if (!empty($element[$bundle]['columns'][$field_name])) {
$column_element = &$element[$bundle]['columns'][$field_name];
- foreach (element_children($column_element) as $key) {
+ foreach (Element::children($column_element) as $key) {
$column_label = $column_element[$key]['#title'];
unset($column_element[$key]['#title']);
$rows[] = array(
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php b/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php
index ce4b4cce0b4d..f691c97f681f 100644
--- a/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php
+++ b/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php
@@ -10,6 +10,7 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Language\Language;
+use Drupal\Core\Render\Element;
/**
* Base class for content translation controllers.
@@ -292,7 +293,7 @@ public function entityFormSharedElements($element, $form_state, $form) {
$ignored_types = array_flip(array('actions', 'value', 'hidden', 'vertical_tabs', 'token', 'details'));
}
- foreach (element_children($element) as $key) {
+ foreach (Element::children($element) as $key) {
if (!isset($element[$key]['#type'])) {
$this->entityFormSharedElements($element[$key], $form_state, $form);
}
@@ -345,7 +346,7 @@ protected function addTranslatabilityClue(&$element) {
$element['#title'] .= $suffix;
}
// If the current element does not have a (valid) title, try child elements.
- elseif ($children = element_children($element)) {
+ elseif ($children = Element::children($element)) {
foreach ($children as $delta) {
$this->addTranslatabilityClue($element[$delta], $suffix);
}
diff --git a/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php b/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php
index 13bf44116123..d2921078369f 100644
--- a/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php
+++ b/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php
@@ -13,6 +13,7 @@
use Drupal\Core\Entity\EntityChangedInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Form\FormBase;
+use Drupal\Core\Render\Element;
use Drupal\entity\Entity\EntityFormDisplay;
use Drupal\user\TempStoreFactory;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -214,7 +215,7 @@ protected function simplify(array &$form, array &$form_state) {
// with per-delta elements. Skip single checkboxes, because their title is
// key to their UI. Also skip widgets with multiple subelements, because in
// that case, per-element labeling is informative.
- $num_children = count(element_children($widget_element));
+ $num_children = count(Element::children($widget_element));
if ($num_children == 0 && $widget_element['#type'] != 'checkbox') {
$widget_element['#title_display'] = 'invisible';
}
diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module
index abebdb9e6fa5..abfc81fe61d1 100644
--- a/core/modules/editor/editor.module
+++ b/core/modules/editor/editor.module
@@ -7,6 +7,7 @@
use Drupal\Component\Utility\Html;
use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Render\Element;
use Drupal\editor\Entity\Editor;
use Drupal\Component\Utility\NestedArray;
use Drupal\Core\Entity\EntityInterface;
@@ -76,7 +77,7 @@ function editor_form_filter_admin_overview_alter(&$form, $form_state) {
// Then splice in the name of each text editor for each text format.
$editors = \Drupal::service('plugin.manager.editor')->getDefinitions();
- foreach (element_children($form['formats']) as $format_id) {
+ foreach (Element::children($form['formats']) as $format_id) {
$editor = editor_load($format_id);
$editor_name = ($editor && isset($editors[$editor->editor])) ? $editors[$editor->editor]['label'] : drupal_placeholder('—');
$editor_column['editor'] = array('#markup' => $editor_name);
diff --git a/core/modules/entity_reference/entity_reference.module b/core/modules/entity_reference/entity_reference.module
index 75d9dfd2b651..cce3e3f8fd4a 100644
--- a/core/modules/entity_reference/entity_reference.module
+++ b/core/modules/entity_reference/entity_reference.module
@@ -9,6 +9,7 @@
use Drupal\Core\Database\Query\AlterableInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Render\Element;
use Drupal\field\FieldConfigInterface;
/**
@@ -118,7 +119,7 @@ function _entity_reference_field_instance_settings_ajax_process_element(&$elemen
);
}
- foreach (element_children($element) as $key) {
+ foreach (Element::children($element) as $key) {
_entity_reference_field_instance_settings_ajax_process_element($element[$key], $main_form);
}
}
diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
index 6620e3f907c1..1b10358d860d 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
@@ -10,6 +10,7 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Render\Element;
use Drupal\field\Field as FieldHelper;
use Drupal\Core\Entity\ContentEntityDatabaseStorage;
use Drupal\Core\Field\FieldDefinitionInterface;
@@ -692,7 +693,7 @@ public function getItems($values) {
return array(array('rendered' => drupal_render($render_array)));
}
- foreach (element_children($render_array) as $count) {
+ foreach (Element::children($render_array) as $count) {
$items[$count]['rendered'] = $render_array[$count];
// FieldItemListInterface::view() adds an #access property to the render
// array that determines whether or not the current user is allowed to
diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module
index 24e522146213..21772e174ba6 100644
--- a/core/modules/field_ui/field_ui.module
+++ b/core/modules/field_ui/field_ui.module
@@ -6,6 +6,7 @@
*/
use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Render\Element;
use Drupal\entity\EntityViewModeInterface;
use Drupal\field_ui\FieldUI;
use Drupal\field_ui\Plugin\Derivative\FieldUiLocalTask;
@@ -274,7 +275,7 @@ function theme_field_ui_table($variables) {
}
// Render children as table cells.
- foreach (element_children($element) as $cell_key) {
+ foreach (Element::children($element) as $cell_key) {
$child = &$element[$cell_key];
// Do not render a cell for children of #type 'value'.
if (!(isset($child['#type']) && $child['#type'] == 'value')) {
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php
index 01c65ed8cfb2..51f15e94c619 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php
@@ -10,6 +10,7 @@
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Field\FieldTypePluginManagerInterface;
+use Drupal\Core\Render\Element;
use Drupal\field_ui\OverviewBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\field\Entity\FieldConfig;
@@ -289,7 +290,7 @@ public function buildForm(array $form, array &$form_state, $entity_type_id = NUL
// here instead of a #pre_render callback because this form doesn't have the
// tabledrag behavior anymore.
$table['#regions']['content']['rows_order'] = array();
- foreach (element_children($table) as $name) {
+ foreach (Element::children($table) as $name) {
$table['#regions']['content']['rows_order'][] = $name;
}
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php b/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php
index f4a955bd50ab..1de755869174 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php
@@ -184,7 +184,7 @@ public function tablePreRender($elements) {
// Add tabledrag indentation to the first row cell.
if ($depth = count($parents[$name])) {
- $children = element_children($row);
+ $children = Element::children($row);
$cell = current($children);
$indentation = array(
'#theme' => 'indentation',
diff --git a/core/modules/file/file.field.inc b/core/modules/file/file.field.inc
index 7d106aee1791..d07bf9b874c2 100644
--- a/core/modules/file/file.field.inc
+++ b/core/modules/file/file.field.inc
@@ -6,6 +6,7 @@
*/
use Drupal\Component\Utility\Html;
+use Drupal\Core\Render\Element;
use Drupal\field\FieldConfigInterface;
/**
@@ -65,7 +66,7 @@ function theme_file_widget_multiple($variables) {
// Get our list of widgets in order (needed when the form comes back after
// preview or failed validation).
$widgets = array();
- foreach (element_children($element) as $key) {
+ foreach (Element::children($element) as $key) {
$widgets[] = &$element[$key];
}
usort($widgets, '_field_sort_items_value_helper');
@@ -82,7 +83,7 @@ function theme_file_widget_multiple($variables) {
// Delay rendering of the buttons, so that they can be rendered later in the
// "operations" column.
$operations_elements = array();
- foreach (element_children($widget) as $sub_key) {
+ foreach (Element::children($widget) as $sub_key) {
if (isset($widget[$sub_key]['#type']) && $widget[$sub_key]['#type'] == 'submit') {
hide($widget[$sub_key]);
$operations_elements[] = &$widget[$sub_key];
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index 3843be9543dc..b707b57fc003 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -5,6 +5,7 @@
* Defines a "managed_file" Form API field and a "file" field for Field module.
*/
+use Drupal\Core\Render\Element;
use Drupal\file\Entity\File;
use Drupal\Component\Utility\NestedArray;
use Drupal\Component\Utility\Unicode;
@@ -1413,7 +1414,7 @@ function file_managed_file_submit($form, &$form_state) {
// Get files that will be removed.
if ($element['#multiple']) {
$remove_fids = array();
- foreach (element_children($element) as $name) {
+ foreach (Element::children($element) as $name) {
if (strpos($name, 'file_') === 0 && $element[$name]['selected']['#value']) {
$remove_fids[] = (int) substr($name, 5);
}
diff --git a/core/modules/file/lib/Drupal/file/Plugin/Field/FieldWidget/FileWidget.php b/core/modules/file/lib/Drupal/file/Plugin/Field/FieldWidget/FileWidget.php
index 460b95e87d99..6426304093da 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/Field/FieldWidget/FileWidget.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/Field/FieldWidget/FileWidget.php
@@ -11,6 +11,7 @@
use Drupal\Core\Field\WidgetBase;
use Drupal\Core\Field\FieldItemListInterface;
use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Render\Element;
use Drupal\field\Field;
/**
@@ -308,7 +309,7 @@ public static function validateMultipleCount($element, &$form_state, $form) {
$values = NestedArray::getValue($form_state['values'], $parents);
array_pop($parents);
- $current = count(element_children(NestedArray::getValue($form, $parents))) - 1;
+ $current = count(Element::children(NestedArray::getValue($form, $parents))) - 1;
$field = Field::fieldInfo()->getField($element['#entity_type'], $element['#field_name']);
$uploaded = count($values['fids']);
@@ -384,7 +385,7 @@ public static function process($element, &$form_state, $form) {
);
$field_element = NestedArray::getValue($form, $parents);
$new_wrapper = $field_element['#id'] . '-ajax-wrapper';
- foreach (element_children($element) as $key) {
+ foreach (Element::children($element) as $key) {
if (isset($element[$key]['#ajax'])) {
$element[$key]['#ajax']['path'] = $new_path;
$element[$key]['#ajax']['options'] = $new_options;
@@ -416,7 +417,7 @@ public static function process($element, &$form_state, $form) {
* method.
*/
public static function processMultiple($element, &$form_state, $form) {
- $element_children = element_children($element, TRUE);
+ $element_children = Element::children($element, TRUE);
$count = count($element_children);
foreach ($element_children as $delta => $key) {
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 475bdbb3499f..73aec622752d 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -9,6 +9,7 @@
use Drupal\Component\Utility\String;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Language\Language;
+use Drupal\Core\Render\Element;
use Drupal\Core\Session\AccountInterface;
use Drupal\Core\Template\Attribute;
use Drupal\filter\FilterFormatInterface;
@@ -471,7 +472,7 @@ function filter_process_format($element) {
);
// Move this element into sub-element 'value'.
unset($element['value']);
- foreach (element_properties($element) as $key) {
+ foreach (Element::properties($element) as $key) {
if (!in_array($key, $blacklist)) {
$element['value'][$key] = $element[$key];
}
@@ -576,7 +577,7 @@ function filter_process_format($element) {
// Hide the text format selector and any other child element (such as text
// field's summary).
- foreach (element_children($element) as $key) {
+ foreach (Element::children($element) as $key) {
if ($key != 'value') {
$element[$key]['#access'] = FALSE;
}
diff --git a/core/modules/forum/lib/Drupal/forum/Form/Overview.php b/core/modules/forum/lib/Drupal/forum/Form/Overview.php
index b2e84e79bf9b..ce666bffbccc 100644
--- a/core/modules/forum/lib/Drupal/forum/Form/Overview.php
+++ b/core/modules/forum/lib/Drupal/forum/Form/Overview.php
@@ -8,6 +8,7 @@
namespace Drupal\forum\Form;
use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Render\Element;
use Drupal\taxonomy\Form\OverviewTerms;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
@@ -70,7 +71,7 @@ public function buildForm(array $form, array &$form_state) {
// Build base taxonomy term overview.
$form = parent::buildForm($form, $form_state, $vocabulary);
- foreach (element_children($form['terms']) as $key) {
+ foreach (Element::children($form['terms']) as $key) {
if (isset($form['terms'][$key]['#term'])) {
$term = $form['terms'][$key]['#term'];
$form['terms'][$key]['term']['#href'] = 'forum/' . $term->id();
diff --git a/core/modules/image/image.admin.inc b/core/modules/image/image.admin.inc
index 1f43cf882be7..e87ec9927b32 100644
--- a/core/modules/image/image.admin.inc
+++ b/core/modules/image/image.admin.inc
@@ -5,6 +5,7 @@
* Administration pages for image settings.
*/
use Drupal\Component\Utility\String;
+use Drupal\Core\Render\Element;
/**
* Returns HTML for a listing of the effects within a specific image style.
*
@@ -18,7 +19,7 @@ function theme_image_style_effects($variables) {
$form = $variables['form'];
$rows = array();
- foreach (element_children($form) as $key) {
+ foreach (Element::children($form) as $key) {
$row = array();
$form[$key]['weight']['#attributes']['class'] = array('image-effect-order-weight');
if ($key != 'new') {
@@ -181,7 +182,7 @@ function theme_image_anchor($variables) {
$rows = array();
$row = array();
- foreach (element_children($element) as $n => $key) {
+ foreach (Element::children($element) as $n => $key) {
$element[$key]['#attributes']['title'] = $element[$key]['#title'];
unset($element[$key]['#title']);
$row[] = drupal_render($element[$key]);
diff --git a/core/modules/language/language.admin.inc b/core/modules/language/language.admin.inc
index 5a34319926c2..475eba249b00 100644
--- a/core/modules/language/language.admin.inc
+++ b/core/modules/language/language.admin.inc
@@ -7,6 +7,7 @@
use Drupal\Component\Utility\String;
use Drupal\Core\Language\LanguageManager;
+use Drupal\Core\Render\Element;
/**
* Prepare a language code list for unused predefined languages.
@@ -45,7 +46,7 @@ function theme_language_negotiation_configure_form($variables) {
foreach ($form[$type]['title'] as $id => $element) {
// Do not take form control structures.
- if (is_array($element) && element_child($id)) {
+ if (is_array($element) && Element::child($id)) {
$row = array(
'data' => array(
'<strong>' . drupal_render($form[$type]['title'][$id]) . '</strong>',
@@ -111,7 +112,7 @@ function theme_language_negotiation_configure_form($variables) {
function theme_language_negotiation_configure_browser_form_table($variables) {
$form = $variables['form'];
$rows = array();
- foreach (element_children($form, TRUE) as $key) {
+ foreach (Element::children($form, TRUE) as $key) {
$row = array();
$row[] = drupal_render($form[$key]['browser_langcode']);
$row[] = drupal_render($form[$key]['drupal_langcode']);
@@ -268,7 +269,7 @@ function template_preprocess_language_content_settings_table(&$variables) {
);
$rows = array();
- foreach (element_children($element) as $bundle) {
+ foreach (Element::children($element) as $bundle) {
$rows[$bundle] = array(
'data' => array(
array(
diff --git a/core/modules/locale/lib/Drupal/locale/Form/TranslateEditForm.php b/core/modules/locale/lib/Drupal/locale/Form/TranslateEditForm.php
index fb41d018f56f..c846026ffeb9 100644
--- a/core/modules/locale/lib/Drupal/locale/Form/TranslateEditForm.php
+++ b/core/modules/locale/lib/Drupal/locale/Form/TranslateEditForm.php
@@ -8,6 +8,7 @@
namespace Drupal\locale\Form;
use Drupal\Component\Utility\String;
+use Drupal\Core\Render\Element;
use Drupal\locale\SourceString;
/**
@@ -143,7 +144,7 @@ public function buildForm(array $form, array &$form_state) {
}
}
}
- if (count(element_children($form['strings']))) {
+ if (count(Element::children($form['strings']))) {
$form['actions'] = array('#type' => 'actions');
$form['actions']['submit'] = array(
'#type' => 'submit',
diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc
index 7ab9ce0e2a9f..c35e33a3f0a8 100644
--- a/core/modules/locale/locale.pages.inc
+++ b/core/modules/locale/locale.pages.inc
@@ -7,6 +7,7 @@
use Drupal\Component\Utility\String;
use Drupal\Core\Language\Language;
+use Drupal\Core\Render\Element;
use Drupal\locale\SourceString;
use Drupal\locale\TranslationString;
use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -282,7 +283,7 @@ function theme_locale_translate_edit_form_strings($variables) {
t('Translation for @language', array('@language' => $form['#language'])),
);
$rows = array();
- foreach (element_children($form) as $lid) {
+ foreach (Element::children($form) as $lid) {
$string = $form[$lid];
if ($string['plural']['#value']) {
$source = drupal_render($string['original_singular']) . '<br />' . drupal_render($string['original_plural']);
diff --git a/core/modules/menu/lib/Drupal/menu/MenuFormController.php b/core/modules/menu/lib/Drupal/menu/MenuFormController.php
index d92f80079e3f..de585ccd99d6 100644
--- a/core/modules/menu/lib/Drupal/menu/MenuFormController.php
+++ b/core/modules/menu/lib/Drupal/menu/MenuFormController.php
@@ -11,6 +11,7 @@
use Drupal\Core\Entity\EntityFormController;
use Drupal\Core\Entity\Query\QueryFactory;
use Drupal\Core\Language\Language;
+use Drupal\Core\Render\Element;
use Drupal\menu_link\MenuLinkStorageInterface;
use Drupal\menu_link\MenuTreeInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -387,7 +388,7 @@ protected function submitOverviewForm(array $complete_form, array &$form_state)
$updated_items = array();
$fields = array('weight', 'plid');
- foreach (element_children($form) as $mlid) {
+ foreach (Element::children($form) as $mlid) {
if (isset($form[$mlid]['#item'])) {
$element = $form[$mlid];
// Update any fields that have changed in this menu item.
diff --git a/core/modules/menu/menu.admin.inc b/core/modules/menu/menu.admin.inc
index 57bba6dd95fb..5e338116cb77 100644
--- a/core/modules/menu/menu.admin.inc
+++ b/core/modules/menu/menu.admin.inc
@@ -5,6 +5,8 @@
* Administrative page callbacks for menu module.
*/
+use Drupal\Core\Render\Element;
+
/**
* Returns HTML for the menu overview form into a table.
*
@@ -25,7 +27,7 @@ function theme_menu_overview_form($variables) {
);
$rows = array();
- foreach (element_children($form) as $mlid) {
+ foreach (Element::children($form) as $mlid) {
if (isset($form[$mlid]['hidden'])) {
$element = &$form[$mlid];
diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index 932a0edff425..55cd4a854c7c 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -13,6 +13,7 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\block\BlockPluginInterface;
+use Drupal\Core\Render\Element;
use Drupal\node\NodeTypeInterface;
use Drupal\system\Entity\Menu;
use Symfony\Component\HttpFoundation\JsonResponse;
@@ -295,7 +296,7 @@ function menu_block_view_system_menu_block_alter(array &$build, BlockPluginInter
$menus = menu_list_system_menus();
$menu_name = $block->getDerivativeId();
if (isset($menus[$menu_name]) && isset($build['content'])) {
- foreach (element_children($build['content']) as $key) {
+ foreach (Element::children($build['content']) as $key) {
$build['#contextual_links']['menu'] = array(
'route_parameters' => array('menu' => $build['content'][$key]['#original_link']['menu_name']),
);
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 66145b02c7fa..a5f0b0082579 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -9,6 +9,7 @@
*/
use Drupal\Core\Language\Language;
+use Drupal\Core\Render\Element;
use Drupal\Core\Url;
use Symfony\Component\HttpFoundation\Response;
use Drupal\Core\Cache\Cache;
@@ -653,7 +654,7 @@ function template_preprocess_node(&$variables) {
// Helpful $content variable for templates.
$variables += array('content' => array());
- foreach (element_children($variables['elements']) as $key) {
+ foreach (Element::children($variables['elements']) as $key) {
$variables['content'][$key] = $variables['elements'][$key];
}
@@ -878,7 +879,7 @@ function theme_node_search_admin($variables) {
$output = drupal_render($form['info']);
$header = array(t('Factor'), t('Influence'));
- foreach (element_children($form['factors']) as $key) {
+ foreach (Element::children($form['factors']) as $key) {
$row = array();
$row[] = $form['factors'][$key]['#title'];
$form['factors'][$key]['#title_display'] = 'invisible';
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/SetCustomize.php b/core/modules/shortcut/lib/Drupal/shortcut/Form/SetCustomize.php
index 4432a72688b6..0d427be60581 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Form/SetCustomize.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Form/SetCustomize.php
@@ -9,6 +9,7 @@
use Drupal\Core\Entity\EntityFormController;
use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Render\Element;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -86,7 +87,7 @@ protected function actions(array $form, array &$form_state) {
return array(
'submit' => array(
'#value' => t('Save changes'),
- '#access' => (bool) element_get_visible_children($form['shortcuts']['links']),
+ '#access' => (bool) Element::getVisibleChildren($form['shortcuts']['links']),
'#submit' => array(
array($this, 'submit'),
array($this, 'save'),
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index 7434bc4c8636..adc5bda03743 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -3,6 +3,7 @@
use Drupal\Core\Database\Database;
use Drupal\Core\Page\HtmlPage;
use Drupal\Core\Extension\ExtensionDiscovery;
+use Drupal\Core\Render\Element;
use Drupal\simpletest\TestBase;
use Symfony\Component\Process\PhpExecutableFinder;
@@ -304,7 +305,7 @@ function _simpletest_batch_operation($test_list_init, $test_id, &$context) {
}
$test_results[$test_class]['#name'] = $info['name'];
$items = array();
- foreach (element_children($test_results) as $class) {
+ foreach (Element::children($test_results) as $class) {
array_unshift($items, '<div class="simpletest-' . ($test_results[$class]['#fail'] + $test_results[$class]['#exception'] ? 'fail' : 'pass') . '">' . t('@name: @summary', array('@name' => $test_results[$class]['#name'], '@summary' => _simpletest_format_summary_line($test_results[$class]))) . '</div>');
}
$context['message'] = t('Processed test @num of @max - %test.', array('%test' => $info['name'], '@num' => $max - $size, '@max' => $max));
diff --git a/core/modules/system/entity.api.php b/core/modules/system/entity.api.php
index f5b5af2dfec4..8afd2d0d65cf 100644
--- a/core/modules/system/entity.api.php
+++ b/core/modules/system/entity.api.php
@@ -8,6 +8,7 @@
use Drupal\Component\Utility\String;
use Drupal\Core\Entity\ContentEntityInterface;
use Drupal\Core\Field\FieldDefinition;
+use Drupal\Core\Render\Element;
/**
* @addtogroup hooks
@@ -596,7 +597,7 @@ function hook_entity_view_display_alter(\Drupal\Core\Entity\Display\EntityViewDi
*/
function hook_entity_display_build_alter(&$build, $context) {
// Append RDF term mappings on displayed taxonomy links.
- foreach (element_children($build) as $field_name) {
+ foreach (Element::children($build) as $field_name) {
$element = &$build[$field_name];
if ($element['#field_type'] == 'entity_reference' && $element['#formatter'] == 'entity_reference_label') {
foreach ($element['#items'] as $delta => $item) {
diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php b/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php
index 2148451d3958..4cf945a42004 100644
--- a/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php
+++ b/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php
@@ -15,6 +15,7 @@
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Form\FormBase;
use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface;
+use Drupal\Core\Render\Element;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\Access\AccessManager;
@@ -142,7 +143,7 @@ public function buildForm(array $form, array &$form_state) {
}
// Add a wrapper around every package.
- foreach (element_children($form['modules']) as $package) {
+ foreach (Element::children($form['modules']) as $package) {
$form['modules'][$package] += array(
'#type' => 'details',
'#title' => $this->t($package),
diff --git a/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php b/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php
index 9459aad954a0..2cce3b8a940b 100644
--- a/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php
+++ b/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Form;
+use Drupal\Core\Render\Element;
use Drupal\Core\StreamWrapper\PublicStream;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -135,7 +136,7 @@ public function buildForm(array $form, array &$form_state, $theme = '') {
}
}
- if (!element_children($form['theme_settings'])) {
+ if (!Element::children($form['theme_settings'])) {
// If there is no element in the theme settings details then do not show
// it -- but keep it in the form if another module wants to alter.
$form['theme_settings']['#access'] = FALSE;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php
index 690bbaf99548..28528e17cada 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php
@@ -9,6 +9,7 @@
use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\Json;
+use Drupal\Core\Render\Element;
use Drupal\simpletest\DrupalUnitTestBase;
/**
@@ -305,10 +306,10 @@ function testDrupalRenderSorting() {
// Confirm that the $elements array has '#sorted' set to TRUE.
$this->assertTrue($elements['#sorted'], "'#sorted' => TRUE was added to the array");
- // Pass $elements through element_children() and ensure it remains
- // sorted in the correct order. drupal_render() will return an empty string
- // if used on the same array in the same request.
- $children = element_children($elements);
+ // Pass $elements through \Drupal\Core\Render\Element::children() and
+ // ensure it remains sorted in the correct order. drupal_render() will
+ // return an empty string if used on the same array in the same request.
+ $children = Element::children($elements);
$this->assertTrue(array_shift($children) == 'first', 'Child found in the correct order.');
$this->assertTrue(array_shift($children) == 'second', 'Child found in the correct order.');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php
index e2ef22c707fb..b0065918bf8d 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php
@@ -9,6 +9,7 @@
use Drupal\Component\Utility\Json;
use Drupal\Component\Utility\String;
+use Drupal\Core\Render\Element;
use Drupal\simpletest\WebTestBase;
class FormTest extends WebTestBase {
@@ -492,7 +493,7 @@ function testDisabledElements() {
// Build a submission that tries to hijack the form by submitting input for
// elements that are disabled.
$edit = array();
- foreach (element_children($form) as $key) {
+ foreach (Element::children($form) as $key) {
if (isset($form[$key]['#test_hijack_value'])) {
if (is_array($form[$key]['#test_hijack_value'])) {
foreach ($form[$key]['#test_hijack_value'] as $subkey => $value) {
@@ -543,7 +544,7 @@ function testDisabledElements() {
* Assert that the values submitted to a form matches the default values of the elements.
*/
function assertFormValuesDefault($values, $form) {
- foreach (element_children($form) as $key) {
+ foreach (Element::children($form) as $key) {
if (isset($form[$key]['#default_value'])) {
if (isset($form[$key]['#expected_value'])) {
$expected_value = $form[$key]['#expected_value'];
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ValidationTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/ValidationTest.php
index bda587231ff5..43f1c88353fc 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/ValidationTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/ValidationTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Form;
+use Drupal\Core\Render\Element;
use Drupal\simpletest\WebTestBase;
/**
@@ -212,7 +213,7 @@ function testCustomRequiredError() {
$edit = array();
$this->drupalPostForm('form-test/validate-required', $edit, 'Submit');
- foreach (element_children($form) as $key) {
+ foreach (Element::children($form) as $key) {
if (isset($form[$key]['#required_error'])) {
$this->assertNoText(t('!name field is required.', array('!name' => $form[$key]['#title'])));
$this->assertText($form[$key]['#required_error']);
@@ -232,7 +233,7 @@ function testCustomRequiredError() {
);
$this->drupalPostForm('form-test/validate-required', $edit, 'Submit');
- foreach (element_children($form) as $key) {
+ foreach (Element::children($form) as $key) {
if (isset($form[$key]['#required_error'])) {
$this->assertNoText(t('!name field is required.', array('!name' => $form[$key]['#title'])));
$this->assertNoText($form[$key]['#required_error']);
diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index 2ddd713599d1..8fcbcbdd211d 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -7,6 +7,7 @@
use Drupal\Core\Cache\Cache;
use Drupal\Core\Extension\Extension;
+use Drupal\Core\Render\Element;
use Drupal\Core\Template\Attribute;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
@@ -279,7 +280,7 @@ function theme_system_modules_details($variables) {
// Individual table headers.
$rows = array();
// Iterate through all the modules, which are children of this element.
- foreach (element_children($form) as $key) {
+ foreach (Element::children($form) as $key) {
// Stick the key into $module for easier access.
$module = $form[$key];
// Create the row for the table.
@@ -381,7 +382,7 @@ function theme_system_modules_uninstall($variables) {
// Display table.
$rows = array();
- foreach (element_children($form['modules']) as $module) {
+ foreach (Element::children($form['modules']) as $module) {
if (!empty($form['modules'][$module]['#required_by'])) {
$disabled_message = format_plural(count($form['modules'][$module]['#required_by']),
'To uninstall @module, the following module must be uninstalled first: @required_modules',
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 703a4a7cb7c1..d570cede4f0b 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -8,6 +8,7 @@
use Drupal\Component\Utility\Tags;
use Drupal\Core\Entity\ContentEntityDatabaseStorage;
use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Render\Element;
use Drupal\Core\Url;
use Drupal\file\FileInterface;
use Drupal\node\Entity\Node;
@@ -323,7 +324,7 @@ function template_preprocess_taxonomy_term(&$variables) {
// Helpful $content variable for templates.
$variables['content'] = array();
- foreach (element_children($variables['elements']) as $key) {
+ foreach (Element::children($variables['elements']) as $key) {
$variables['content'][$key] = $variables['elements'][$key];
}
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index 29773f1fc2cc..6e3e4e3e4414 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -7,6 +7,7 @@
use Drupal\Core\Cache\Cache;
use Drupal\Core\Language\Language;
+use Drupal\Core\Render\Element;
use Drupal\Core\Template\Attribute;
use Drupal\Component\Utility\Crypt;
use Symfony\Component\HttpFoundation\Response;
@@ -230,7 +231,7 @@ function template_preprocess_toolbar(&$variables) {
$variables['trays'] = array();
$variables['tabs'] = array();
$variables['remainder'] = array();
- foreach (element_children($element) as $key) {
+ foreach (Element::children($element) as $key) {
// Add the tray.
if (isset($element[$key]['tray'])) {
$variables['trays'][$key] = array(
@@ -259,7 +260,7 @@ function template_preprocess_toolbar(&$variables) {
// Add other non-tray, non-tab child elements to the remainder variable for
// later rendering.
- foreach (element_children($element[$key]) as $child_key) {
+ foreach (Element::children($element[$key]) as $child_key) {
if (!in_array($child_key, array('tray', 'tab'))) {
$variables['remainder'][$key][$child_key] = $element[$key][$child_key];
}
diff --git a/core/modules/user/lib/Drupal/user/AccountSettingsForm.php b/core/modules/user/lib/Drupal/user/AccountSettingsForm.php
index cc4e2557f29e..66ffaf11aa9d 100644
--- a/core/modules/user/lib/Drupal/user/AccountSettingsForm.php
+++ b/core/modules/user/lib/Drupal/user/AccountSettingsForm.php
@@ -10,6 +10,7 @@
use Drupal\Core\Form\ConfigFormBase;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Extension\ModuleHandler;
+use Drupal\Core\Render\Element;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -141,7 +142,7 @@ public function buildForm(array $form, array &$form_state) {
'#description' => $this->t('Users with the %select-cancel-method or %administer-users <a href="@permissions-url">permissions</a> can override this default method.', array('%select-cancel-method' => $this->t('Select method for cancelling account'), '%administer-users' => $this->t('Administer users'), '@permissions-url' => url('admin/people/permissions'))),
);
$form['registration_cancellation']['user_cancel_method'] += user_cancel_methods();
- foreach (element_children($form['registration_cancellation']['user_cancel_method']) as $key) {
+ foreach (Element::children($form['registration_cancellation']['user_cancel_method']) as $key) {
// All account cancellation methods that specify #access cannot be
// configured as default method.
// @see hook_user_cancel_methods_alter()
diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc
index 22d221aa0888..964323c105b3 100644
--- a/core/modules/user/user.pages.inc
+++ b/core/modules/user/user.pages.inc
@@ -5,6 +5,7 @@
* User page callback file for the user module.
*/
+use Drupal\Core\Render\Element;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
@@ -110,7 +111,7 @@ function template_preprocess_user(&$variables) {
$account = $variables['elements']['#user'];
// Helpful $content variable for templates.
- foreach (element_children($variables['elements']) as $key) {
+ foreach (Element::children($variables['elements']) as $key) {
$variables['content'][$key] = $variables['elements'][$key];
}
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
index 2b02ab0e0c1a..be0aed9037a4 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
@@ -11,6 +11,7 @@
use Drupal\Component\Utility\Unicode;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Component\Utility\Xss;
+use Drupal\Core\Render\Element;
use Drupal\Core\Session\AccountInterface;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Plugin\views\PluginBase;
@@ -449,7 +450,7 @@ public function showExposeForm(&$form, &$form_state) {
// these defaults from getting wiped out. This setting will only be TRUE
// during a 2nd pass rerender.
if (!empty($form_state['force_expose_options'])) {
- foreach (element_children($form['expose']) as $id) {
+ foreach (Element::children($form['expose']) as $id) {
if (isset($form['expose'][$id]['#default_value']) && !isset($form['expose'][$id]['#value'])) {
$form['expose'][$id]['#value'] = $form['expose'][$id]['#default_value'];
}
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/PluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/PluginBase.php
index aaae02210b46..33f53ac9755e 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/PluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/PluginBase.php
@@ -10,6 +10,7 @@
use Drupal\Component\Utility\String;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Plugin\PluginBase as ComponentPluginBase;
+use Drupal\Core\Render\Element;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ViewExecutable;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -380,7 +381,7 @@ public function globalTokenForm(&$form, &$form_state) {
* The form build array.
*/
public static function preRenderAddFieldsetMarkup(array $form) {
- foreach (element_children($form) as $key) {
+ foreach (Element::children($form) as $key) {
$element = $form[$key];
// In our form builder functions, we added an arbitrary #fieldset property
// to any element that belongs in a fieldset. If this form element has
@@ -409,10 +410,10 @@ public static function preRenderAddFieldsetMarkup(array $form) {
* The form build array.
*/
public static function preRenderFlattenData($form) {
- foreach (element_children($form) as $key) {
+ foreach (Element::children($form) as $key) {
$element = $form[$key];
if (!empty($element['#flatten'])) {
- foreach (element_children($element) as $child_key) {
+ foreach (Element::children($element) as $child_key) {
$form[$child_key] = $form[$key][$child_key];
}
// All done, remove the now-empty parent.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
index be1a69cc8c4b..e5857c548bb3 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
@@ -8,6 +8,7 @@
namespace Drupal\views\Plugin\views\argument;
use Drupal\Component\Utility\String as UtilityString;
+use Drupal\Core\Render\Element;
use Drupal\views\Plugin\views\PluginBase;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ViewExecutable;
@@ -1095,7 +1096,7 @@ public static function processContainerRadios($element) {
* to the 'default_options' fieldset.
*/
public static function preRenderMoveArgumentOptions($form) {
- foreach (element_children($form) as $key) {
+ foreach (Element::children($form) as $key) {
$element = $form[$key];
if (!empty($element['#argument_option'])) {
$container_name = $element['#argument_option'] . '_options';
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
index eb0271a6e8df..51c21f28012d 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
@@ -7,6 +7,7 @@
namespace Drupal\views\Plugin\views\filter;
+use Drupal\Core\Render\Element;
use Drupal\views\Plugin\views\HandlerBase;
use Drupal\Component\Utility\String as UtilityString;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
@@ -355,7 +356,7 @@ public function showBuildGroupForm(&$form, &$form_state) {
// these defaults from getting wiped out. This setting will only be TRUE
// during a 2nd pass rerender.
if (!empty($form_state['force_build_group_options'])) {
- foreach (element_children($form['group_info']) as $id) {
+ foreach (Element::children($form['group_info']) as $id) {
if (isset($form['group_info'][$id]['#default_value']) && !isset($form['group_info'][$id]['#value'])) {
$form['group_info'][$id]['#value'] = $form['group_info'][$id]['#default_value'];
}
@@ -969,7 +970,7 @@ protected function buildExposedFiltersGroupForm(&$form, &$form_state) {
// from to 'Between', 'Not Between', etc, and two or more widgets
// are displayed.
$without_children = TRUE;
- foreach (element_children($row['value']) as $children) {
+ foreach (Element::children($row['value']) as $children) {
$has_state = FALSE;
$states = array();
foreach ($row['value'][$children]['#states']['visible'] as $key => $state) {
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 806ba9de0a65..dfb4e454bcbb 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -13,6 +13,7 @@
use Drupal\Core\Cache\Cache;
use Drupal\Core\Database\Query\AlterableInterface;
use Drupal\Core\Language\Language;
+use Drupal\Core\Render\Element;
use Drupal\views\Plugin\Derivative\ViewsLocalTask;
use Drupal\Core\Template\AttributeArray;
use Drupal\views\ViewExecutable;
@@ -902,7 +903,7 @@ function views_pre_render_views_form_views_form($element) {
$element['output']['#markup'] = str_replace($search, $replace, $element['output']['#markup']);
// Sort, render and add remaining form fields.
- $children = element_children($element, TRUE);
+ $children = Element::children($element, TRUE);
$element['#children'] = drupal_render_children($element, $children);
return $element;
}
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
index cfa791d6b7ea..dfd8f6d24b90 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
@@ -12,6 +12,7 @@
use Drupal\Core\Ajax\ReplaceCommand;
use Drupal\Component\Utility\NestedArray;
use Drupal\Component\Utility\String;
+use Drupal\Core\Render\Element;
use Drupal\user\TempStoreFactory;
use Drupal\views\Views;
use Symfony\Component\HttpFoundation\Request;
@@ -1114,7 +1115,7 @@ public function getFormBucket(ViewUI $view, $type, $display) {
*/
public static function addMicroweights(&$build) {
$count = 0;
- foreach (element_children($build) as $key) {
+ foreach (Element::children($build) as $key) {
if (!isset($build[$key]['#weight'])) {
$build[$key]['#weight'] = $count/1000;
}
diff --git a/core/modules/views_ui/views_ui.theme.inc b/core/modules/views_ui/views_ui.theme.inc
index b224dca383a2..be0a6a0f3f88 100644
--- a/core/modules/views_ui/views_ui.theme.inc
+++ b/core/modules/views_ui/views_ui.theme.inc
@@ -5,6 +5,7 @@
* Preprocessors and theme functions for the Views UI.
*/
+use Drupal\Core\Render\Element;
use Drupal\Core\Template\Attribute;
/**
@@ -182,7 +183,7 @@ function theme_views_ui_build_group_filter_form($variables) {
),
);
- foreach (element_children($form['group_items']) as $group_id) {
+ foreach (Element::children($form['group_items']) as $group_id) {
$form['group_items'][$group_id]['value']['#title'] = '';
$data = array(
'default' => drupal_render($form['default_group'][$group_id]) . drupal_render($form['default_group_multiple'][$group_id]),
@@ -382,7 +383,7 @@ function template_preprocess_views_ui_style_plugin_table(&$variables) {
),
);
$rows = array();
- foreach (element_children($form['columns']) as $id) {
+ foreach (Element::children($form['columns']) as $id) {
$row = array();
$row[]['data'] = $form['info'][$id]['name'];
$row[]['data'] = $form['columns'][$id];
--
GitLab