commit c14c1d3c43a0e7e909e3d30711a5fe9d0e6e2423 Author: Joel Pittet Date: Tue Dec 2 20:03:07 2014 -0800 input and space and item list leftovers diff --git a/core/lib/Drupal/Core/Entity/Query/QueryInterface.php b/core/lib/Drupal/Core/Entity/Query/QueryInterface.php index 372f5b5..caadc37 100644 --- a/core/lib/Drupal/Core/Entity/Query/QueryInterface.php +++ b/core/lib/Drupal/Core/Entity/Query/QueryInterface.php @@ -153,7 +153,7 @@ public function count(); * 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. */ diff --git a/core/lib/Drupal/Core/Render/Element/Actions.php b/core/lib/Drupal/Core/Render/Element/Actions.php index 1aab7d1..eed3d11 100644 --- a/core/lib/Drupal/Core/Render/Element/Actions.php +++ b/core/lib/Drupal/Core/Render/Element/Actions.php @@ -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( diff --git a/core/lib/Drupal/Core/Render/Element/Button.php b/core/lib/Drupal/Core/Render/Element/Button.php index 11a9093..c305e22 100644 --- a/core/lib/Drupal/Core/Render/Element/Button.php +++ b/core/lib/Drupal/Core/Render/Element/Button.php @@ -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'; diff --git a/core/lib/Drupal/Core/Render/Element/Checkbox.php b/core/lib/Drupal/Core/Render/Element/Checkbox.php index 6a99eca..6574685 100644 --- a/core/lib/Drupal/Core/Render/Element/Checkbox.php +++ b/core/lib/Drupal/Core/Render/Element/Checkbox.php @@ -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'; diff --git a/core/lib/Drupal/Core/Render/Element/Color.php b/core/lib/Drupal/Core/Render/Element/Color.php index fa05799..5f33bb6 100644 --- a/core/lib/Drupal/Core/Render/Element/Color.php +++ b/core/lib/Drupal/Core/Render/Element/Color.php @@ -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'; diff --git a/core/lib/Drupal/Core/Render/Element/Email.php b/core/lib/Drupal/Core/Render/Element/Email.php index c17633f..25e88c3 100644 --- a/core/lib/Drupal/Core/Render/Element/Email.php +++ b/core/lib/Drupal/Core/Render/Element/Email.php @@ -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'; diff --git a/core/lib/Drupal/Core/Render/Element/File.php b/core/lib/Drupal/Core/Render/Element/File.php index 848e401..5f72c8d 100644 --- a/core/lib/Drupal/Core/Render/Element/File.php +++ b/core/lib/Drupal/Core/Render/Element/File.php @@ -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'; diff --git a/core/lib/Drupal/Core/Render/Element/Hidden.php b/core/lib/Drupal/Core/Render/Element/Hidden.php index bb955af..0da3405 100644 --- a/core/lib/Drupal/Core/Render/Element/Hidden.php +++ b/core/lib/Drupal/Core/Render/Element/Hidden.php @@ -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'; diff --git a/core/lib/Drupal/Core/Render/Element/Number.php b/core/lib/Drupal/Core/Render/Element/Number.php index 5e39541..20cbee6 100644 --- a/core/lib/Drupal/Core/Render/Element/Number.php +++ b/core/lib/Drupal/Core/Render/Element/Number.php @@ -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'; diff --git a/core/lib/Drupal/Core/Render/Element/Password.php b/core/lib/Drupal/Core/Render/Element/Password.php index 48a20cf..03e7719 100644 --- a/core/lib/Drupal/Core/Render/Element/Password.php +++ b/core/lib/Drupal/Core/Render/Element/Password.php @@ -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'; diff --git a/core/lib/Drupal/Core/Render/Element/Radio.php b/core/lib/Drupal/Core/Render/Element/Radio.php index f106d07..3b5f144 100644 --- a/core/lib/Drupal/Core/Render/Element/Radio.php +++ b/core/lib/Drupal/Core/Render/Element/Radio.php @@ -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'; diff --git a/core/lib/Drupal/Core/Render/Element/Range.php b/core/lib/Drupal/Core/Render/Element/Range.php index 234d92f..67026aa 100644 --- a/core/lib/Drupal/Core/Render/Element/Range.php +++ b/core/lib/Drupal/Core/Render/Element/Range.php @@ -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'; diff --git a/core/lib/Drupal/Core/Render/Element/Search.php b/core/lib/Drupal/Core/Render/Element/Search.php index dfa70ed..be001c1 100644 --- a/core/lib/Drupal/Core/Render/Element/Search.php +++ b/core/lib/Drupal/Core/Render/Element/Search.php @@ -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'; diff --git a/core/lib/Drupal/Core/Render/Element/Tableselect.php b/core/lib/Drupal/Core/Render/Element/Tableselect.php index 0fa833a..6bfb0af 100644 --- a/core/lib/Drupal/Core/Render/Element/Tableselect.php +++ b/core/lib/Drupal/Core/Render/Element/Tableselect.php @@ -132,11 +132,11 @@ public static function preRenderTableselect($element) { // Render the checkbox / radio element. $row['data'][] = drupal_render($element[$key]); - // As table.html.twig 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 diff --git a/core/lib/Drupal/Core/Render/Element/Tel.php b/core/lib/Drupal/Core/Render/Element/Tel.php index 5cd4c5d..977a23b 100644 --- a/core/lib/Drupal/Core/Render/Element/Tel.php +++ b/core/lib/Drupal/Core/Render/Element/Tel.php @@ -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'; diff --git a/core/lib/Drupal/Core/Render/Element/Textfield.php b/core/lib/Drupal/Core/Render/Element/Textfield.php index 4396494..f6d9a5d 100644 --- a/core/lib/Drupal/Core/Render/Element/Textfield.php +++ b/core/lib/Drupal/Core/Render/Element/Textfield.php @@ -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'; diff --git a/core/lib/Drupal/Core/Render/Element/Url.php b/core/lib/Drupal/Core/Render/Element/Url.php index e891128..7f923af 100644 --- a/core/lib/Drupal/Core/Render/Element/Url.php +++ b/core/lib/Drupal/Core/Render/Element/Url.php @@ -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'; diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module index ae06709..50b6f36 100644 --- a/core/modules/rdf/rdf.module +++ b/core/modules/rdf/rdf.module @@ -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