"';
+ $values['author'] = $this->randomName() . '
',
+ 'value' => '' . $out); + '
' . $out); return $out; } diff --git a/core/modules/rest/src/Tests/RESTTestBase.php b/core/modules/rest/src/Tests/RESTTestBase.php index 1e19be2..92b37cd 100644 --- a/core/modules/rest/src/Tests/RESTTestBase.php +++ b/core/modules/rest/src/Tests/RESTTestBase.php @@ -150,9 +150,9 @@ protected function httpRequest($url, $method, $body = NULL, $mime_type = NULL) { $headers = implode("\n", $headers); $this->verbose($method . ' request to: ' . $url . - '
Code: ' . curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE) . - '
Response headers: ' . $headers . - '
Response body: ' . $response); + '
Code: ' . curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE) . + '
Response headers: ' . $headers . + '
Response body: ' . $response); return $response; } diff --git a/core/modules/simpletest/simpletest.js b/core/modules/simpletest/simpletest.js index 477b162..6ff98bc 100644 --- a/core/modules/simpletest/simpletest.js +++ b/core/modules/simpletest/simpletest.js @@ -31,7 +31,7 @@ $(context).find('.simpletest-group').once('simpletest-group-select-all', function () { var $group = $(this); var $cell = $group.find('.simpletest-group-select-all'); - var $groupCheckbox = $(''); + var $groupCheckbox = $(''); var $testCheckboxes = $group.nextUntil('.simpletest-group').find('input[type=checkbox]'); $cell.append($groupCheckbox); diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php index 023cf8e..b85f804 100644 --- a/core/modules/simpletest/src/TestBase.php +++ b/core/modules/simpletest/src/TestBase.php @@ -749,7 +749,7 @@ protected function verbose($message) { return; } - $message = '
ID #' . $this->verboseId . ' (Previous | Next)
' . $message; + $message = '
ID #' . $this->verboseId . ' (Previous | Next)
' . $message; $verbose_filename = $this->verboseDirectory . '/' . $this->verboseClassName . '-' . $this->verboseId . '.html'; if (file_put_contents($verbose_filename, $message, FILE_APPEND)) { $url = $this->verboseDirectoryUrl . '/' . $this->verboseClassName . '-' . $this->verboseId . '.html'; diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php index ec50d4d..126cd3e 100644 --- a/core/modules/simpletest/src/WebTestBase.php +++ b/core/modules/simpletest/src/WebTestBase.php @@ -1500,11 +1500,11 @@ protected function drupalGet($path, array $options = array(), array $headers = a } $verbose = 'GET request to: ' . $path . - '
Ending URL: ' . $this->getUrl(); + '
Ending URL: ' . $this->getUrl(); if ($this->dumpHeaders) { - $verbose .= '
Headers:
' . check_plain(var_export(array_map('trim', $this->headers), TRUE)) . '';
+ $verbose .= 'Headers:
' . check_plain(var_export(array_map('trim', $this->headers), TRUE)) . '';
}
- $verbose .= '' . $out; + $verbose .= '
' . $out; $this->verbose($verbose); return $out; @@ -1690,12 +1690,12 @@ protected function drupalPostForm($path, $edit, $submit, array $options = array( } $verbose = 'POST request to: ' . $path; - $verbose .= '
Ending URL: ' . $this->getUrl(); + $verbose .= '
Ending URL: ' . $this->getUrl(); if ($this->dumpHeaders) { - $verbose .= '
Headers:
' . check_plain(var_export(array_map('trim', $this->headers), TRUE)) . '';
+ $verbose .= 'Headers:
' . check_plain(var_export(array_map('trim', $this->headers), TRUE)) . '';
}
- $verbose .= 'Fields: ' . highlight_string('' . $out; + $verbose .= '
Fields: ' . highlight_string('' . $out; $this->verbose($verbose); return $out; @@ -1815,9 +1815,9 @@ protected function drupalPostAjaxForm($path, $edit, $triggering_element, $ajax_p } $verbose = 'AJAX POST request to: ' . $path; - $verbose .= '
AJAX controller path: ' . $ajax_path; - $verbose .= '
Ending URL: ' . $this->getUrl(); - $verbose .= '
' . $this->content; + $verbose .= '
AJAX controller path: ' . $ajax_path; + $verbose .= '
Ending URL: ' . $this->getUrl(); + $verbose .= '
' . $this->content; $this->verbose($verbose); @@ -2091,8 +2091,8 @@ protected function drupalHead($path, array $options = array(), array $headers = if ($this->dumpHeaders) { $this->verbose('GET request to: ' . $path . - '
Ending URL: ' . $this->getUrl() . - '
Headers:
' . check_plain(var_export(array_map('trim', $this->headers), TRUE)) . '');
+ 'Ending URL: ' . $this->getUrl() . + '
Headers:
' . check_plain(var_export(array_map('trim', $this->headers), TRUE)) . '');
}
return $out;
@@ -3114,9 +3114,9 @@ protected function assertNoTitle($title, $message = '', $group = 'Other') {
protected function assertThemeOutput($callback, array $variables = array(), $expected, $message = '', $group = 'Other') {
$output = _theme($callback, $variables);
$this->verbose('Variables:' . '' . check_plain(var_export($variables, TRUE)) . '' - . '
' . 'Result:' . '
' . check_plain(var_export($output, TRUE)) . '' - . '
' . 'Expected:' . '
' . check_plain(var_export($expected, TRUE)) . '' - . '
' . $output + . '
' . 'Result:' . '
' . check_plain(var_export($output, TRUE)) . '' + . '
' . 'Expected:' . '
' . check_plain(var_export($expected, TRUE)) . '' + . '
' . $output ); if (!$message) { $message = '%callback rendered correctly.'; diff --git a/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php b/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php index 1a19761..d0c1722 100644 --- a/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php +++ b/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php @@ -122,17 +122,17 @@ public function build() { if ($this->day_list) { $content['top_day'] = $this->day_list; - $content['top_day']['#suffix'] = '
'; + $content['top_day']['#suffix'] = '
'; } if ($this->all_time_list) { $content['top_all'] = $this->all_time_list; - $content['top_all']['#suffix'] = '
'; + $content['top_all']['#suffix'] = '
'; } if ($this->last_list) { $content['top_last'] = $this->last_list; - $content['top_last']['#suffix'] = '
'; + $content['top_last']['#suffix'] = '
'; } return $content; diff --git a/core/modules/statistics/statistics.module b/core/modules/statistics/statistics.module index e5828c3..f34a43c 100644 --- a/core/modules/statistics/statistics.module +++ b/core/modules/statistics/statistics.module @@ -189,7 +189,7 @@ function _statistics_link($path, $width = 35) { */ function _statistics_format_item($title, $path) { $path = ($path ? $path : '/'); - $output = ($title ? "$title
" : ''); + $output = ($title ? "$title
" : ''); $output .= _statistics_link($path); return $output; } diff --git a/core/modules/system/src/Tests/Common/RenderWebTest.php b/core/modules/system/src/Tests/Common/RenderWebTest.php index 8168b96..ed66548 100644 --- a/core/modules/system/src/Tests/Common/RenderWebTest.php +++ b/core/modules/system/src/Tests/Common/RenderWebTest.php @@ -155,7 +155,7 @@ protected function assertRenderedElement(array $element, $xpath, array $xpath_ar $this->drupalSetContent(drupal_render($element)); $this->verbose('
' . check_plain(var_export($original_element, TRUE)) . '' . '
' . check_plain(var_export($element, TRUE)) . '' - . '
' . $this->drupalGetContent() + . '
' . $this->drupalGetContent() ); // @see \Drupal\simpletest\WebTestBase::xpath() diff --git a/core/modules/system/src/Tests/Form/ProgrammaticTest.php b/core/modules/system/src/Tests/Form/ProgrammaticTest.php index a73f843..6571ddd 100644 --- a/core/modules/system/src/Tests/Form/ProgrammaticTest.php +++ b/core/modules/system/src/Tests/Form/ProgrammaticTest.php @@ -87,7 +87,7 @@ private function submitForm($values, $valid_input) { '%values' => print_r($values, TRUE), '%errors' => $valid_form ? t('None') : implode(' ', $errors), ); - $this->assertTrue($valid_input == $valid_form, format_string('Input values: %values
Validation handler errors: %errors', $args)); + $this->assertTrue($valid_input == $valid_form, format_string('Input values: %values
Validation handler errors: %errors', $args)); // We check submitted values only if we have a valid input. if ($valid_input) { diff --git a/core/modules/system/src/Tests/Mail/HtmlToTextTest.php b/core/modules/system/src/Tests/Mail/HtmlToTextTest.php index e55e0563..bd2ad65 100644 --- a/core/modules/system/src/Tests/Mail/HtmlToTextTest.php +++ b/core/modules/system/src/Tests/Mail/HtmlToTextTest.php @@ -61,12 +61,12 @@ protected function assertHtmlToText($html, $text, $message, $allowed_tags = NULL $result = drupal_html_to_text($html, $allowed_tags); $pass = $this->assertEqual($result, $text, check_plain($message)); $verbose = 'html =
' . $this->stringToHtml($html) - . '
' . 'result =
' . $this->stringToHtml($result) - . '
' . 'expected =
' . $this->stringToHtml($text) + . '
' . 'result =
' . $this->stringToHtml($result) + . '
' . 'expected =
' . $this->stringToHtml($text)
. '';
$this->verbose($verbose);
if (!$pass) {
- $this->pass("Previous test verbose info:$verbose"); + $this->pass("Previous test verbose info:
$verbose"); } } diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 6161819..817e4d7 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -313,7 +313,7 @@ function system_requirements($phase) { } $description .= ' ' . t('You can run cron manually.', array('@cron' => url('admin/reports/status/run-cron'))); - $description .= '
' . t('To run cron from outside the site, go to !cron', array('!cron' => url('cron/' . \Drupal::state()->get('system.cron_key'), array('absolute' => TRUE)))); + $description .= '
' . t('To run cron from outside the site, go to !cron', array('!cron' => url('cron/' . \Drupal::state()->get('system.cron_key'), array('absolute' => TRUE)))); $requirements['cron'] = array( 'title' => t('Cron maintenance tasks'), diff --git a/core/modules/system/templates/block--system-branding-block.html.twig b/core/modules/system/templates/block--system-branding-block.html.twig index 2a12c7a..a7b3958 100644 --- a/core/modules/system/templates/block--system-branding-block.html.twig +++ b/core/modules/system/templates/block--system-branding-block.html.twig @@ -18,7 +18,7 @@ {% block content %} {% if site_logo %} -
 }} "{{ 'sort ascending'|t }}"){kind=icon}
+
{% else -%}
-  }} "{{ 'sort descending'|t }}"){kind=icon}
+
{% endif %}
diff --git a/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc b/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
index ca1ea6f..c8c3ef8 100644
--- a/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
+++ b/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
@@ -91,7 +91,7 @@ function _batch_test_finished_helper($batch_id, $success, $results, $operations)
if (!$success) {
// A fatal error occurred during the processing.
$error_operation = reset($operations);
- $messages[] = t('An error occurred while processing @op with arguments:@args', array('@op' => $error_operation[0], '@args' => print_r($error_operation[1], TRUE))); + $messages[] = t('An error occurred while processing @op with arguments:
@args', array('@op' => $error_operation[0], '@args' => print_r($error_operation[1], TRUE))); } drupal_set_message(implode('
', $messages)); diff --git a/core/modules/system/tests/themes/test_theme/templates/theme-test-specific-suggestions--variant--foo.html.twig b/core/modules/system/tests/themes/test_theme/templates/theme-test-specific-suggestions--variant--foo.html.twig index 7e0b485..826b43d 100644 --- a/core/modules/system/tests/themes/test_theme/templates/theme-test-specific-suggestions--variant--foo.html.twig +++ b/core/modules/system/tests/themes/test_theme/templates/theme-test-specific-suggestions--variant--foo.html.twig @@ -2,4 +2,4 @@ Template overridden based on suggestion alter hook determined by the base hook.
Theme hook suggestions:
-{{ theme_hook_suggestions|join("
") }}
") }} diff --git a/core/modules/system/tests/themes/test_theme/templates/theme-test-specific-suggestions--variant.html.twig b/core/modules/system/tests/themes/test_theme/templates/theme-test-specific-suggestions--variant.html.twig index 655db4e..c70f600 100644 --- a/core/modules/system/tests/themes/test_theme/templates/theme-test-specific-suggestions--variant.html.twig +++ b/core/modules/system/tests/themes/test_theme/templates/theme-test-specific-suggestions--variant.html.twig @@ -2,4 +2,4 @@ Template matching the specific theme call.
Theme hook suggestions:
-{{ theme_hook_suggestions|join("
") }}
") }} diff --git a/core/modules/tracker/tracker.pages.inc b/core/modules/tracker/tracker.pages.inc index 30c7915..1bbedaa 100644 --- a/core/modules/tracker/tracker.pages.inc +++ b/core/modules/tracker/tracker.pages.inc @@ -75,7 +75,7 @@ function tracker_page($account = NULL) { $comments = $node->comment_count; if ($new = comment_num_new($node->id(), 'node')) { - $comments .= '
'; + $comments .= '
'; $comments .= l(format_plural($new, '1 new', '@count new'), 'node/' . $node->id(), array('fragment' => 'new')); } } diff --git a/core/modules/user/src/RegisterForm.php b/core/modules/user/src/RegisterForm.php index 30f3018..20dcc70 100644 --- a/core/modules/user/src/RegisterForm.php +++ b/core/modules/user/src/RegisterForm.php @@ -143,7 +143,7 @@ public function save(array $form, array &$form_state) { // Administrator approval required. else { _user_mail_notify('register_pending_approval', $account); - drupal_set_message($this->t('Thank you for applying for an account. Your account is currently pending approval by the site administrator.
In the meantime, a welcome message with further instructions has been sent to your e-mail address.')); + drupal_set_message($this->t('Thank you for applying for an account. Your account is currently pending approval by the site administrator.
In the meantime, a welcome message with further instructions has been sent to your e-mail address.')); $form_state['redirect_route']['route_name'] = '
' . t('Choose the view and display that select the entities that can be referenced.
Only views with a display of type "Entity Reference" are eligible.') . '
' . t('Choose the view and display that select the entities that can be referenced.
Only views with a display of type "Entity Reference" are eligible.') . '
- 
+
Bartik
-
diff --git a/core/themes/bartik/templates/block--system-branding-block.html.twig b/core/themes/bartik/templates/block--system-branding-block.html.twig
index 5917f58..82b83d1 100644
--- a/core/themes/bartik/templates/block--system-branding-block.html.twig
+++ b/core/themes/bartik/templates/block--system-branding-block.html.twig
@@ -16,7 +16,7 @@
{% block content %}
{% if site_logo %}
-