diff --git a/core/includes/batch.inc b/core/includes/batch.inc index f84c01b..01133ba 100644 --- a/core/includes/batch.inc +++ b/core/includes/batch.inc @@ -123,7 +123,7 @@ function _batch_progress_page() { // function), it will output whatever is in the output buffer, followed by // the error message. ob_start(); - $fallback = $current_set['error_message'] . '
' . $batch['error_message']; + $fallback = $current_set['error_message'] . '
' . $batch['error_message']; // We strip the end of the page using a marker in the template, so any // additional HTML output by PHP shows up inside the page rather than below @@ -182,7 +182,7 @@ function _batch_progress_page() { // Adds JavaScript code and settings for clients where JavaScript is enabled. 'drupalSettings' => [ 'batch' => [ - 'errorMessage' => $current_set['error_message'] . '
' . $batch['error_message'], + 'errorMessage' => $current_set['error_message'] . '
' . $batch['error_message'], 'initMessage' => $current_set['init_message'], 'uri' => $url, ], diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index f74859e..18adb58 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -594,7 +594,7 @@ function _drupal_exception_handler_additional($exception, $exception2) { if (error_displayable()) { print '

Additional uncaught exception thrown while handling exception.

'; print '

Original

' . Error::renderExceptionSafe($exception) . '

'; - print '

Additional

' . Error::renderExceptionSafe($exception2) . '

'; + print '

Additional

' . Error::renderExceptionSafe($exception2) . '

'; } } @@ -1018,7 +1018,7 @@ function _drupal_shutdown_function_handle_exception($exception) { require_once __DIR__ . '/errors.inc'; if (error_displayable()) { print '

Uncaught exception thrown in shutdown function.

'; - print '

' . Error::renderExceptionSafe($exception) . '

'; + print '

' . Error::renderExceptionSafe($exception) . '

'; } } error_log($exception); diff --git a/core/includes/errors.inc b/core/includes/errors.inc index e3ad1c8..cefe847 100644 --- a/core/includes/errors.inc +++ b/core/includes/errors.inc @@ -253,7 +253,7 @@ function _drupal_log_error($error, $fatal = FALSE) { // We fallback to a maintenance page at this point, because the page generation // itself can generate errors. // Should not translate the string to avoid errors producing more errors. - $message = 'The website encountered an unexpected error. Please try again later.' . '
' . $message; + $message = 'The website encountered an unexpected error. Please try again later.' . '
' . $message; if ($is_installer) { // install_display_output() prints the output and ends script execution. diff --git a/core/includes/form.inc b/core/includes/form.inc index b4c6a71..8964dfc 100644 --- a/core/includes/form.inc +++ b/core/includes/form.inc @@ -741,7 +741,7 @@ function batch_set($batch_definition) { // Tweak init_message to avoid the bottom of the page flickering down after // init phase. - $batch_set['init_message'] .= '
 '; + $batch_set['init_message'] .= '
 '; // The non-concurrent workflow of batch execution allows us to save // numberOfItems() queries by handling our own counter. diff --git a/core/lib/Drupal/Component/Utility/Html.php b/core/lib/Drupal/Component/Utility/Html.php index 5456cfa..e262a08 100644 --- a/core/lib/Drupal/Component/Utility/Html.php +++ b/core/lib/Drupal/Component/Utility/Html.php @@ -272,7 +272,7 @@ public static function load($html) { $document = << - + !html EOD; diff --git a/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php b/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php index 2f965e1..8a48509 100644 --- a/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php +++ b/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php @@ -176,7 +176,7 @@ public static function setLinkActiveClass($html_markup, $current_path, $is_front // Parse it into a DOMDocument so we can reliably read and modify // attributes. $dom = new \DOMDocument(); - @$dom->loadHTML('' . $tag . ''); + @$dom->loadHTML('' . $tag . ''); $node = $dom->getElementsByTagName('body')->item(0)->firstChild; // Ensure we don't set the "active" class twice on the same element. diff --git a/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php b/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php index 647463a..412e331 100644 --- a/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php +++ b/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php @@ -91,7 +91,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { * leads to the actual operation). */ $form['submit_connection'] = array( - '#prefix' => "
", + '#prefix' => "
", '#name' => 'enter_connection_settings', '#type' => 'submit', '#value' => $this->t('Enter connection settings'), diff --git a/core/lib/Drupal/Core/Render/Element/HtmlTag.php b/core/lib/Drupal/Core/Render/Element/HtmlTag.php index 1d71350..0e2c2d0 100644 --- a/core/lib/Drupal/Core/Render/Element/HtmlTag.php +++ b/core/lib/Drupal/Core/Render/Element/HtmlTag.php @@ -87,7 +87,7 @@ public static function preRenderHtmlTag($element) { $markup = '<' . $escaped_tag . $attributes; // Construct a void element. if (in_array($element['#tag'], self::$voidElements)) { - $markup .= " />\n"; + $markup .= ">\n"; } // Construct all other elements. else { diff --git a/core/lib/Drupal/Core/Session/SessionHandler.php b/core/lib/Drupal/Core/Session/SessionHandler.php index 50bb22f..ce4245e 100644 --- a/core/lib/Drupal/Core/Session/SessionHandler.php +++ b/core/lib/Drupal/Core/Session/SessionHandler.php @@ -90,7 +90,7 @@ public function write($sid, $value) { // further uncaught exception being thrown. if (error_displayable()) { print '

Uncaught exception thrown in session handler.

'; - print '

' . Error::renderExceptionSafe($exception) . '

'; + print '

' . Error::renderExceptionSafe($exception) . '

'; } return FALSE; } diff --git a/core/misc/tableselect.js b/core/misc/tableselect.js index 243e000..a46ab93 100644 --- a/core/misc/tableselect.js +++ b/core/misc/tableselect.js @@ -60,7 +60,7 @@ }; // Find all with class select-all, and insert the check all checkbox. - $table.find('th.select-all').prepend($('').attr('title', strings.selectAll)).on('click', function (event) { + $table.find('th.select-all').prepend($('').attr('title', strings.selectAll)).on('click', function (event) { if ($(event.target).is('input[type="checkbox"]')) { // Loop through all checkboxes and set their state to the select all // checkbox' state. diff --git a/core/modules/big_pipe/src/Tests/BigPipePlaceholderTestCases.php b/core/modules/big_pipe/src/Tests/BigPipePlaceholderTestCases.php index d2db3cb..e9ad1e2 100644 --- a/core/modules/big_pipe/src/Tests/BigPipePlaceholderTestCases.php +++ b/core/modules/big_pipe/src/Tests/BigPipePlaceholderTestCases.php @@ -104,7 +104,7 @@ public static function cases(ContainerInterface $container = NULL, AccountInterf ], [ 'command' => 'add_css', - 'data' => '' . "\n" + 'data' => '' . "\n" ], [ 'command' => 'insert', @@ -114,7 +114,7 @@ public static function cases(ContainerInterface $container = NULL, AccountInterf 'settings' => NULL, ], ]; - $status_messages->embeddedHtmlResponse = '' . "\n" . "\n" . ' ' . "\n \n"; + $status_messages->embeddedHtmlResponse = '' . "\n" . "\n" . ' ' . "\n \n"; } diff --git a/core/modules/big_pipe/src/Tests/BigPipeTest.php b/core/modules/big_pipe/src/Tests/BigPipeTest.php index a3f773e..af72756 100644 --- a/core/modules/big_pipe/src/Tests/BigPipeTest.php +++ b/core/modules/big_pipe/src/Tests/BigPipeTest.php @@ -86,7 +86,7 @@ public function testNoJsDetection() { $this->drupalLogin($this->rootUser); $this->assertSessionCookieExists(TRUE); $this->assertBigPipeNoJsCookieExists(FALSE); - $this->assertRaw(''); + $this->assertRaw(''); $this->assertNoRaw($no_js_to_js_markup); $this->assertBigPipeNoJsMetaRefreshRedirect(); $this->assertBigPipeNoJsCookieExists(TRUE); @@ -104,7 +104,7 @@ public function testNoJsDetection() { $this->drupalGet(Url::fromRoute('user.login')); $this->assertSessionCookieExists(TRUE); $this->assertBigPipeNoJsCookieExists(FALSE); - $this->assertRaw(''); + $this->assertRaw(''); $this->assertNoRaw($no_js_to_js_markup); $this->assertBigPipeNoJsMetaRefreshRedirect(); $this->assertBigPipeNoJsCookieExists(TRUE); diff --git a/core/modules/book/templates/book-export-html.html.twig b/core/modules/book/templates/book-export-html.html.twig index 5fb2e97..52bc9f2 100644 --- a/core/modules/book/templates/book-export-html.html.twig +++ b/core/modules/book/templates/book-export-html.html.twig @@ -23,8 +23,8 @@ {{ title }} {{ page.head }} - - + + {# diff --git a/core/modules/ckeditor/js/ckeditor.drupalimage.admin.js b/core/modules/ckeditor/js/ckeditor.drupalimage.admin.js index 256bb41..4b9d61e 100644 --- a/core/modules/ckeditor/js/ckeditor.drupalimage.admin.js +++ b/core/modules/ckeditor/js/ckeditor.drupalimage.admin.js @@ -35,7 +35,7 @@ var output = ''; output += Drupal.t('Uploads enabled, max size: @size @dimensions', {'@size': maxFileSize, '@dimensions': maxDimensions}); if ($scheme.length) { - output += '
' + $scheme.attr('data-label'); + output += '
' + $scheme.attr('data-label'); } return output; }); diff --git a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php index 9c4f224..a290a96 100644 --- a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php +++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php @@ -80,7 +80,7 @@ public function settingsForm(array $form, FormStateInterface $form_state, Editor '#title_display' => 'invisible', '#type' => 'textarea', '#default_value' => $config['styles'], - '#description' => $this->t('A list of classes that will be provided in the "Styles" dropdown. Enter one or more classes on each line in the format: element.classA.classB|Label. Example: h1.title|Title. Advanced example: h1.fancy.title|Fancy title.
These styles should be available in your theme\'s CSS file.'), + '#description' => $this->t('A list of classes that will be provided in the "Styles" dropdown. Enter one or more classes on each line in the format: element.classA.classB|Label. Example: h1.title|Title. Advanced example: h1.fancy.title|Fancy title.
These styles should be available in your theme\'s CSS file.'), '#attached' => array( 'library' => array('ckeditor/drupal.ckeditor.stylescombo.admin'), ), diff --git a/core/modules/comment/src/Tests/CommentInterfaceTest.php b/core/modules/comment/src/Tests/CommentInterfaceTest.php index ba43224..869c4ef 100644 --- a/core/modules/comment/src/Tests/CommentInterfaceTest.php +++ b/core/modules/comment/src/Tests/CommentInterfaceTest.php @@ -277,7 +277,7 @@ public function testAutoFilledHtmlSubject() { $this->drupalGet('node/' . $this->node->id()); // HTML should not be included in the character count. - $body_text1 = ' Hello World
'; + $body_text1 = ' Hello World
'; $edit1 = array( 'comment_body[0][value]' => $body_text1, 'comment_body[0][format]' => 'filtered_html', @@ -286,7 +286,7 @@ public function testAutoFilledHtmlSubject() { $this->assertEqual('Hello World', Comment::load(1)->getSubject()); // If there's nothing other than HTML, the subject should be '(No subject)'. - $body_text2 = '
'; + $body_text2 = '
'; $edit2 = array( 'comment_body[0][value]' => $body_text2, 'comment_body[0][format]' => 'filtered_html', diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module index 70413d9..8d4864a 100644 --- a/core/modules/content_translation/content_translation.module +++ b/core/modules/content_translation/content_translation.module @@ -42,7 +42,7 @@ function content_translation_help($route_name, RouteMatchInterface $route_match) case 'language.content_settings_page': $output = ''; if (!\Drupal::languageManager()->isMultilingual()) { - $output .= '
' . t('Before you can translate content, there must be at least two languages added on the languages administration page.', array(':url' => \Drupal::url('entity.configurable_language.collection'))); + $output .= '
' . t('Before you can translate content, there must be at least two languages added on the languages administration page.', array(':url' => \Drupal::url('entity.configurable_language.collection'))); } return $output; } diff --git a/core/modules/editor/src/Form/EditorImageDialog.php b/core/modules/editor/src/Form/EditorImageDialog.php index 6f18546..c3d34da 100644 --- a/core/modules/editor/src/Form/EditorImageDialog.php +++ b/core/modules/editor/src/Form/EditorImageDialog.php @@ -142,7 +142,7 @@ public function buildForm(array $form, FormStateInterface $form_state, Editor $e '#placeholder' => $this->t('Short description for the visually impaired'), '#type' => 'textfield', '#required' => TRUE, - '#required_error' => $this->t('Alternative text is required.
(Only in rare cases should this be left empty. To create empty alternative text, enter "" — two double quotes without any content).'), + '#required_error' => $this->t('Alternative text is required.
(Only in rare cases should this be left empty. To create empty alternative text, enter "" — two double quotes without any content).'), '#default_value' => $alt, '#maxlength' => 2048, ); diff --git a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php index 8908f65..037a6ff 100644 --- a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php +++ b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php @@ -413,7 +413,7 @@ protected function buildFieldRow(FieldDefinitionInterface $field_definition, arr if (!empty($summary)) { $field_row['settings_summary'] = array( '#type' => 'inline_template', - '#template' => '
{{ summary|safe_join("
") }}
', + '#template' => '
{{ summary|safe_join("
") }}
', '#context' => array('summary' => $summary), '#cell_attributes' => array('class' => array('field-plugin-summary-cell')), ); diff --git a/core/modules/field_ui/src/Form/FieldConfigEditForm.php b/core/modules/field_ui/src/Form/FieldConfigEditForm.php index ff6d157..9a20f76 100644 --- a/core/modules/field_ui/src/Form/FieldConfigEditForm.php +++ b/core/modules/field_ui/src/Form/FieldConfigEditForm.php @@ -60,7 +60,7 @@ public function form(array $form, FormStateInterface $form_state) { '#title' => $this->t('Help text'), '#default_value' => $this->entity->getDescription(), '#rows' => 5, - '#description' => $this->t('Instructions to present to the user below this field on the editing form.
Allowed HTML tags: @tags', array('@tags' => FieldFilteredMarkup::displayAllowedTags())) . '
' . $this->t('This field supports tokens.'), + '#description' => $this->t('Instructions to present to the user below this field on the editing form.
Allowed HTML tags: @tags', array('@tags' => FieldFilteredMarkup::displayAllowedTags())) . '
' . $this->t('This field supports tokens.'), '#weight' => -10, ); diff --git a/core/modules/field_ui/src/Tests/ManageDisplayTest.php b/core/modules/field_ui/src/Tests/ManageDisplayTest.php index 902a193..6c8c574 100644 --- a/core/modules/field_ui/src/Tests/ManageDisplayTest.php +++ b/core/modules/field_ui/src/Tests/ManageDisplayTest.php @@ -514,7 +514,7 @@ function assertNodeViewTextHelper(EntityInterface $node, $view_mode, $text, $mes $clone = clone $node; $element = node_view($clone, $view_mode); $output = \Drupal::service('renderer')->renderRoot($element); - $this->verbose(t('Rendered node - view mode: @view_mode', array('@view_mode' => $view_mode)) . '
' . $output); + $this->verbose(t('Rendered node - view mode: @view_mode', array('@view_mode' => $view_mode)) . '
' . $output); // Assign content so that WebTestBase functions can be used. $this->setRawContent($output); diff --git a/core/modules/field_ui/src/Tests/ManageFieldsTest.php b/core/modules/field_ui/src/Tests/ManageFieldsTest.php index cbe9f53..5f0e927 100644 --- a/core/modules/field_ui/src/Tests/ManageFieldsTest.php +++ b/core/modules/field_ui/src/Tests/ManageFieldsTest.php @@ -347,7 +347,7 @@ protected function addPersistentFieldStorage() { $this->assertRaw(t('Re-use an existing field'), '"Re-use existing field" was found.'); // Ensure that we test with a label that contains HTML. - $label = $this->randomString(4) . '
' . $this->randomString(4); + $label = $this->randomString(4) . '
' . $this->randomString(4); // Add a new field for the orphaned storage. $this->fieldUIAddExistingField("admin/structure/types/manage/page", $this->fieldName, $label); } diff --git a/core/modules/file/templates/file-upload-help.html.twig b/core/modules/file/templates/file-upload-help.html.twig index 8fa6b3e..07be817 100644 --- a/core/modules/file/templates/file-upload-help.html.twig +++ b/core/modules/file/templates/file-upload-help.html.twig @@ -11,4 +11,4 @@ * @ingroup themeable */ #} -{{ descriptions|safe_join('
') }} +{{ descriptions|safe_join('
') }} diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module index 8d4a9f4..9461277 100644 --- a/core/modules/forum/forum.module +++ b/core/modules/forum/forum.module @@ -499,7 +499,7 @@ function template_preprocess_forums(&$variables) { else { $new_replies = ''; if ($topic->new_replies) { - $new_replies = '
' . $topic->new_text . ''; + $new_replies = '
' . $topic->new_text . ''; } $row[] = array( diff --git a/core/modules/forum/templates/forum-list.html.twig b/core/modules/forum/templates/forum-list.html.twig index c2e5567..003f6ea 100644 --- a/core/modules/forum/templates/forum-list.html.twig +++ b/core/modules/forum/templates/forum-list.html.twig @@ -64,7 +64,7 @@ {{ forum.num_topics }} {% if forum.new_topics == true %} -
+
{{ forum.new_text }} {% endif %} diff --git a/core/modules/image/js/theme.js b/core/modules/image/js/theme.js index cba8f7b..acd86d4 100644 --- a/core/modules/image/js/theme.js +++ b/core/modules/image/js/theme.js @@ -69,13 +69,13 @@ if (settings.alt_field) { html += '
' + ' ' + - ' ' + + ' ' + '
'; } if (settings.title_field) { html += '
' + ' ' + - ' ' + + ' ' + '
'; } html += ''; diff --git a/core/modules/image/src/Tests/ImageDimensionsTest.php b/core/modules/image/src/Tests/ImageDimensionsTest.php index 6f73042..01f7d8b 100644 --- a/core/modules/image/src/Tests/ImageDimensionsTest.php +++ b/core/modules/image/src/Tests/ImageDimensionsTest.php @@ -63,7 +63,7 @@ function testImageDimensions() { $style->addImageEffect($effect); $style->save(); - $this->assertEqual($this->getImageTag($variables), ''); + $this->assertEqual($this->getImageTag($variables), ''); $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.'); $this->drupalGet($this->getAbsoluteUrl($url)); $this->assertResponse(200, 'Image was generated at the URL.'); @@ -84,7 +84,7 @@ function testImageDimensions() { $style->addImageEffect($effect); $style->save(); - $this->assertEqual($this->getImageTag($variables), ''); + $this->assertEqual($this->getImageTag($variables), ''); $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.'); $this->drupalGet($this->getAbsoluteUrl($url)); $this->assertResponse(200, 'Image was generated at the URL.'); @@ -106,7 +106,7 @@ function testImageDimensions() { $style->addImageEffect($effect); $style->save(); - $this->assertEqual($this->getImageTag($variables), ''); + $this->assertEqual($this->getImageTag($variables), ''); $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.'); $this->drupalGet($this->getAbsoluteUrl($url)); $this->assertResponse(200, 'Image was generated at the URL.'); @@ -128,7 +128,7 @@ function testImageDimensions() { $style->addImageEffect($effect); $style->save(); - $this->assertEqual($this->getImageTag($variables), ''); + $this->assertEqual($this->getImageTag($variables), ''); $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.'); $this->drupalGet($this->getAbsoluteUrl($url)); $this->assertResponse(200, 'Image was generated at the URL.'); @@ -146,7 +146,7 @@ function testImageDimensions() { $style->addImageEffect($effect); $style->save(); - $this->assertEqual($this->getImageTag($variables), ''); + $this->assertEqual($this->getImageTag($variables), ''); $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.'); $this->drupalGet($this->getAbsoluteUrl($url)); $this->assertResponse(200, 'Image was generated at the URL.'); @@ -167,7 +167,7 @@ function testImageDimensions() { $style->addImageEffect($effect); $style->save(); - $this->assertEqual($this->getImageTag($variables), ''); + $this->assertEqual($this->getImageTag($variables), ''); $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.'); $this->drupalGet($this->getAbsoluteUrl($url)); $this->assertResponse(200, 'Image was generated at the URL.'); @@ -187,7 +187,7 @@ function testImageDimensions() { $style->addImageEffect($effect); $style->save(); - $this->assertEqual($this->getImageTag($variables), ''); + $this->assertEqual($this->getImageTag($variables), ''); $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.'); $this->drupalGet($this->getAbsoluteUrl($url)); $this->assertResponse(200, 'Image was generated at the URL.'); @@ -208,7 +208,7 @@ function testImageDimensions() { $effect_id = $style->addImageEffect($effect); $style->save(); - $this->assertEqual($this->getImageTag($variables), ''); + $this->assertEqual($this->getImageTag($variables), ''); $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.'); $this->drupalGet($this->getAbsoluteUrl($url)); $this->assertResponse(200, 'Image was generated at the URL.'); @@ -229,7 +229,7 @@ function testImageDimensions() { $style->addImageEffect($effect); $style->save(); - $this->assertEqual($this->getImageTag($variables), ''); + $this->assertEqual($this->getImageTag($variables), ''); // Test URI dependent image effect. $style = ImageStyle::create(['name' => 'test_uri', 'label' => 'Test URI']); @@ -250,7 +250,7 @@ function testImageDimensions() { // PNG original image. Should be resized to 100x100. $generated_uri = 'public://styles/test_uri/public/' . \Drupal::service('file_system')->basename($original_uri); $url = file_url_transform_relative($style->buildUrl($original_uri)); - $this->assertEqual($this->getImageTag($variables), ''); + $this->assertEqual($this->getImageTag($variables), ''); $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.'); $this->drupalGet($this->getAbsoluteUrl($url)); $this->assertResponse(200, 'Image was generated at the URL.'); @@ -264,7 +264,7 @@ function testImageDimensions() { $generated_uri = 'public://styles/test_uri/public/' . \Drupal::service('file_system')->basename($original_uri); $url = file_url_transform_relative($style->buildUrl($original_uri)); $variables['#uri'] = $original_uri; - $this->assertEqual($this->getImageTag($variables), ''); + $this->assertEqual($this->getImageTag($variables), ''); $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.'); $this->drupalGet($this->getAbsoluteUrl($url)); $this->assertResponse(200, 'Image was generated at the URL.'); diff --git a/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageTest.php b/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageTest.php index 12e43e7..564be5b 100644 --- a/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageTest.php +++ b/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageTest.php @@ -135,7 +135,7 @@ public function testUpload() { // Our headless browser can't drag+drop files, but we can mock the event. // Append a hidden upload element to the DOM. - $script = 'jQuery("").appendTo("body")'; + $script = 'jQuery("").appendTo("body")'; $this->getSession()->executeScript($script); // Find the element, and set its value to our new image. diff --git a/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php b/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php index ec06ca6..f159497 100644 --- a/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php +++ b/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php @@ -80,16 +80,16 @@ public function testLinkViewsTokens() { $this->drupalGet('test_link_tokens'); foreach ($uris as $uri => $title) { - // Formatted link: {{ field_link }}
+ // Formatted link: {{ field_link }}
$this->assertRaw("Formated: $title"); - // Raw uri: {{ field_link__uri }}
+ // Raw uri: {{ field_link__uri }}
$this->assertRaw("Raw uri: $uri"); - // Raw title: {{ field_link__title }}
+ // Raw title: {{ field_link__title }}
$this->assertRaw("Raw title: $title"); - // Raw options: {{ field_link__options }}
+ // Raw options: {{ field_link__options }}
// Options is an array and should return empty after token replace. $this->assertRaw("Raw options: ."); } diff --git a/core/modules/link/tests/modules/link_test_views/test_views/views.view.test_link_tokens.yml b/core/modules/link/tests/modules/link_test_views/test_views/views.view.test_link_tokens.yml index 8f3ee26..81e9d0c 100644 --- a/core/modules/link/tests/modules/link_test_views/test_views/views.view.test_link_tokens.yml +++ b/core/modules/link/tests/modules/link_test_views/test_views/views.view.test_link_tokens.yml @@ -89,7 +89,7 @@ display: exclude: false alter: alter_text: true - text: "Formated: {{ field_link }}
\nRaw uri: {{ field_link__uri }}
\nRaw title: {{ field_link__title }}
\nRaw options: {{ field_link__options }}." + text: "Formated: {{ field_link }}
\nRaw uri: {{ field_link__uri }}
\nRaw title: {{ field_link__title }}
\nRaw options: {{ field_link__options }}." make_link: false path: '{{ field_link__uri }}' absolute: false diff --git a/core/modules/locale/tests/src/Kernel/LocaleStringIsSafeTest.php b/core/modules/locale/tests/src/Kernel/LocaleStringIsSafeTest.php index 4129cdc..cbf4fd5 100644 --- a/core/modules/locale/tests/src/Kernel/LocaleStringIsSafeTest.php +++ b/core/modules/locale/tests/src/Kernel/LocaleStringIsSafeTest.php @@ -34,7 +34,7 @@ public function testLocaleStringIsSafe() { // Check an untranslatable string which includes untrustable HTML (according // to the locale_string_is_safe() function definition). - $string = 'Hello world!'; + $string = 'Hello world!'; $result = locale_string_is_safe($string); $this->assertFalse($result); diff --git a/core/modules/menu_ui/src/Tests/MenuNodeTest.php b/core/modules/menu_ui/src/Tests/MenuNodeTest.php index 3fc8423..baf5d20 100644 --- a/core/modules/menu_ui/src/Tests/MenuNodeTest.php +++ b/core/modules/menu_ui/src/Tests/MenuNodeTest.php @@ -65,7 +65,7 @@ function testMenuNodeFormWidget() { // Verify that the menu link title has the correct maxlength. $max_length = \Drupal::entityManager()->getBaseFieldDefinitions('menu_link_content')['title']->getSetting('max_length'); $this->drupalGet('node/add/page'); - $this->assertPattern('//', 'Menu link title field has correct maxlength in node add form.'); + $this->assertPattern('//', 'Menu link title field has correct maxlength in node add form.'); // Disable the default main menu, so that no menus are enabled. $edit = array( @@ -177,7 +177,7 @@ function testMenuNodeFormWidget() { $this->drupalGet('node/' . $node->id() . '/edit'); $this->assertFieldById('edit-menu-weight', 17, 'Menu weight correct in edit form'); - $this->assertPattern('//', 'Menu link title field has correct maxlength in node edit form.'); + $this->assertPattern('//', 'Menu link title field has correct maxlength in node edit form.'); // Disable the menu link, then edit the node--the link should stay disabled. $link_id = menu_ui_get_menu_link_defaults($node)['entity_id']; diff --git a/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php b/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php index 8d9fd8f..27982ae 100644 --- a/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php +++ b/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php @@ -180,7 +180,7 @@ public static function run($initial_ids, $config, &$context) { $message_count = count($context['sandbox']['messages']); $context['message'] = ''; for ($index = max(0, $message_count - self::MESSAGE_LENGTH); $index < $message_count; $index++) { - $context['message'] = $context['sandbox']['messages'][$index] . "
\n" . $context['message']; + $context['message'] = $context['sandbox']['messages'][$index] . "
\n" . $context['message']; } if ($message_count > self::MESSAGE_LENGTH) { // Indicate there are earlier messages not displayed. @@ -196,7 +196,7 @@ public static function run($initial_ids, $config, &$context) { '@migration' => $migration_name, '@current' => $context['sandbox']['current'], '@max' => $context['sandbox']['max'], - ]) . "
\n" . $context['message']; + ]) . "
\n" . $context['message']; } } else { diff --git a/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php b/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php index 9c12446..2531fc4 100644 --- a/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php +++ b/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php @@ -46,16 +46,16 @@ public function testViewsTokenReplacement() { $this->drupalGet('test_node_tokens'); - // Body: {{ body }}
+ // Body: {{ body }}
$this->assertRaw("Body:

$body

"); - // Raw value: {{ body__value }}
+ // Raw value: {{ body__value }}
$this->assertRaw("Raw value: $body"); - // Raw summary: {{ body__summary }}
+ // Raw summary: {{ body__summary }}
$this->assertRaw("Raw summary: $summary"); - // Raw format: {{ body__format }}
+ // Raw format: {{ body__format }}
$this->assertRaw("Raw format: plain_text"); } diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_tokens.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_tokens.yml index 26517fc..7ae2fc2 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_tokens.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_tokens.yml @@ -94,7 +94,7 @@ display: exclude: false alter: alter_text: true - text: "Body: {{ body }}
\nRaw value: {{ body__value }}
\nRaw summary: {{ body__summary }}
\nRaw format: {{ body__format }}" + text: "Body: {{ body }}
\nRaw value: {{ body__value }}
\nRaw summary: {{ body__summary }}
\nRaw format: {{ body__format }}" make_link: false path: '' absolute: false diff --git a/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php b/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php index 254207d..be5c6c2 100644 --- a/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php +++ b/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php @@ -51,9 +51,9 @@ public static function schema(FieldStorageDefinitionInterface $field_definition) */ protected function allowedValuesDescription() { $description = '

' . t('The possible values this field can contain. Enter one value per line, in the format key|label.'); - $description .= '
' . t('The key is the stored value, and must be numeric. The label will be used in displayed values and edit forms.'); - $description .= '
' . t('The label is optional: if a line contains a single number, it will be used as key and label.'); - $description .= '
' . t('Lists of labels are also accepted (one label per line), only if the field does not hold any values yet. Numeric keys will be automatically generated from the positions in the list.'); + $description .= '
' . t('The key is the stored value, and must be numeric. The label will be used in displayed values and edit forms.'); + $description .= '
' . t('The label is optional: if a line contains a single number, it will be used as key and label.'); + $description .= '
' . t('Lists of labels are also accepted (one label per line), only if the field does not hold any values yet. Numeric keys will be automatically generated from the positions in the list.'); $description .= '

'; $description .= '

' . t('Allowed HTML tags in labels: @tags', array('@tags' => $this->displayAllowedTags())) . '

'; return $description; diff --git a/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php b/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php index 719ae48..f80850c 100644 --- a/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php +++ b/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php @@ -51,9 +51,9 @@ public static function schema(FieldStorageDefinitionInterface $field_definition) */ protected function allowedValuesDescription() { $description = '

' . t('The possible values this field can contain. Enter one value per line, in the format key|label.'); - $description .= '
' . t('The key is the stored value, and must be numeric. The label will be used in displayed values and edit forms.'); - $description .= '
' . t('The label is optional: if a line contains a single number, it will be used as key and label.'); - $description .= '
' . t('Lists of labels are also accepted (one label per line), only if the field does not hold any values yet. Numeric keys will be automatically generated from the positions in the list.'); + $description .= '
' . t('The key is the stored value, and must be numeric. The label will be used in displayed values and edit forms.'); + $description .= '
' . t('The label is optional: if a line contains a single number, it will be used as key and label.'); + $description .= '
' . t('Lists of labels are also accepted (one label per line), only if the field does not hold any values yet. Numeric keys will be automatically generated from the positions in the list.'); $description .= '

'; $description .= '

' . t('Allowed HTML tags in labels: @tags', array('@tags' => $this->displayAllowedTags())) . '

'; return $description; diff --git a/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php b/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php index f5440ab..fa71eab 100644 --- a/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php +++ b/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php @@ -54,8 +54,8 @@ public static function schema(FieldStorageDefinitionInterface $field_definition) */ protected function allowedValuesDescription() { $description = '

' . t('The possible values this field can contain. Enter one value per line, in the format key|label.'); - $description .= '
' . t('The key is the stored value. The label will be used in displayed values and edit forms.'); - $description .= '
' . t('The label is optional: if a line contains a single string, it will be used as key and label.'); + $description .= '
' . t('The key is the stored value. The label will be used in displayed values and edit forms.'); + $description .= '
' . t('The label is optional: if a line contains a single string, it will be used as key and label.'); $description .= '

'; $description .= '

' . t('Allowed HTML tags in labels: @tags', array('@tags' => $this->displayAllowedTags())) . '

'; return $description; diff --git a/core/modules/responsive_image/responsive_image.module b/core/modules/responsive_image/responsive_image.module index d654c81..d7b2216 100644 --- a/core/modules/responsive_image/responsive_image.module +++ b/core/modules/responsive_image/responsive_image.module @@ -284,9 +284,9 @@ function responsive_image_build_source_attributes(ImageInterface $image, array $ * The above responsive image style will result in a tag like this: * @code * - * - * - * + * + * + * * * @endcode * @@ -298,14 +298,14 @@ function responsive_image_build_source_attributes(ImageInterface $image, array $ * For example: * A tag can contain multiple images: * @code - * + * * @endcode * In the above example we can add the 'mime-type' attribute ('image/jpeg') * since all images in the 'srcset' attribute of the tag have the same * MIME type. * If a tag were to look like this: * @code - * + * * @endcode * We can't add the 'mime-type' attribute ('image/jpeg' vs 'image/webp'). So in * order to add the 'mime-type' attribute to the tag all images in the @@ -313,9 +313,9 @@ function responsive_image_build_source_attributes(ImageInterface $image, array $ * way, a tag could look like this: * @code * - * - * - * + * + * + * * * @endcode * This way a browser can decide which tag is preferred based on the @@ -326,7 +326,7 @@ function responsive_image_build_source_attributes(ImageInterface $image, array $ * For image style mappings of the type 'sizes', a width descriptor is added to * each source. For example: * @code - * + * * @endcode * The width descriptor here is "100w". This way the browser knows this image is * 100px wide without having to load it. According to the spec, a multiplier can @@ -334,21 +334,21 @@ function responsive_image_build_source_attributes(ImageInterface $image, array $ * For example: * Valid: * @code - * + * * @endcode * Invalid: * @code - * + * * @endcode * * Note: Since the specs do not allow width descriptors and multipliers combined * inside one 'srcset' attribute, we either have to use something like * @code - * + * * @endcode * to support multipliers or * @code - * + * * @endcode * to support the 'sizes' attribute. * @@ -357,12 +357,12 @@ function responsive_image_build_source_attributes(ImageInterface $image, array $ * and breakpointA.2x. If we would output those we will end up with something * like * @code - * + * * @endcode * which is illegal. So the solution is to merge both arrays into one and * disregard the multiplier. Which, in this case, would output * @code - * + * * @endcode * See http://www.w3.org/html/wg/drafts/html/master/embedded-content.html#image-candidate-string * for further information. diff --git a/core/modules/responsive_image/templates/responsive-image.html.twig b/core/modules/responsive_image/templates/responsive-image.html.twig index 99fca6b..9f3849e 100644 --- a/core/modules/responsive_image/templates/responsive-image.html.twig +++ b/core/modules/responsive_image/templates/responsive-image.html.twig @@ -26,7 +26,7 @@ #} {% for source_attributes in sources %} - + {% endfor %} {% endif %} diff --git a/core/modules/rest/src/Tests/RESTTestBase.php b/core/modules/rest/src/Tests/RESTTestBase.php index 271df51..6b445f6 100644 --- a/core/modules/rest/src/Tests/RESTTestBase.php +++ b/core/modules/rest/src/Tests/RESTTestBase.php @@ -229,11 +229,11 @@ protected function httpRequest($url, $method, $body = NULL, $mime_type = NULL, $ $this->refreshVariables(); $this->verbose($method . ' request to: ' . $url . - '
Code: ' . $this->response->getStatusCode() . - (isset($options['headers']) ? '
Request headers: ' . nl2br(print_r($options['headers'], TRUE)) : '') . - (isset($options['body']) ? '
Request body: ' . nl2br(print_r($options['body'], TRUE)) : '') . - '
Response headers: ' . nl2br(print_r($response->getHeaders(), TRUE)) . - '
Response body: ' . $this->responseBody); + '
Code: ' . $this->response->getStatusCode() . + (isset($options['headers']) ? '
Request headers: ' . nl2br(print_r($options['headers'], TRUE)) : '') . + (isset($options['body']) ? '
Request body: ' . nl2br(print_r($options['body'], TRUE)) : '') . + '
Response headers: ' . nl2br(print_r($response->getHeaders(), TRUE)) . + '
Response body: ' . $this->responseBody); return $this->responseBody; } diff --git a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php index 4c004fc..012e5ee 100644 --- a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php +++ b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php @@ -96,9 +96,9 @@ public function testRestViewsAuthentication() { $headers = $response->getHeaders(); $this->verbose('GET request to: ' . $url . - '
Code: ' . curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE) . - '
Response headers: ' . nl2br(print_r($headers, TRUE)) . - '
Response body: ' . (string) $response->getBody()); + '
Code: ' . curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE) . + '
Response headers: ' . nl2br(print_r($headers, TRUE)) . + '
Response body: ' . (string) $response->getBody()); $this->assertResponse(200); } diff --git a/core/modules/simpletest/simpletest.js b/core/modules/simpletest/simpletest.js index ba54cbf..0b30c38 100644 --- a/core/modules/simpletest/simpletest.js +++ b/core/modules/simpletest/simpletest.js @@ -46,7 +46,7 @@ $(context).find('.simpletest-group').once('simpletest-group-select-all').each(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/AssertContentTrait.php b/core/modules/simpletest/src/AssertContentTrait.php index e19f319..fc52db2 100644 --- a/core/modules/simpletest/src/AssertContentTrait.php +++ b/core/modules/simpletest/src/AssertContentTrait.php @@ -878,9 +878,9 @@ protected function assertThemeOutput($callback, array $variables = array(), $exp return \Drupal::theme()->render($callback, $variables); }); $this->verbose( - '
' . 'Result:' . '
' . Html::escape(var_export($output, TRUE)) . '
' - . '
' . 'Expected:' . '
' . Html::escape(var_export($expected, TRUE)) . '
' - . '
' . $output + '
' . 'Result:' . '
' . Html::escape(var_export($output, TRUE)) . '
' + . '
' . 'Expected:' . '
' . Html::escape(var_export($expected, TRUE)) . '
' + . '
' . $output ); if (!$message) { $message = '%callback rendered correctly.'; diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php index 2574008..263fc79 100644 --- a/core/modules/simpletest/src/TestBase.php +++ b/core/modules/simpletest/src/TestBase.php @@ -935,7 +935,7 @@ protected function verbose($message) { return; } - $message = '
ID #' . $this->verboseId . ' (Previous | Next)
' . $message; + $message = '
ID #' . $this->verboseId . ' (Previous | Next)
' . $message; $verbose_filename = $this->verboseClassName . '-' . $this->verboseId . '-' . $this->testId . '.html'; if (file_put_contents($this->verboseDirectory . '/' . $verbose_filename, $message)) { $url = $this->verboseDirectoryUrl . '/' . $verbose_filename; diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php index 9d2bf6a..6db5a34 100644 --- a/core/modules/simpletest/src/WebTestBase.php +++ b/core/modules/simpletest/src/WebTestBase.php @@ -1291,11 +1291,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: 
' . Html::escape(var_export(array_map('trim', $this->headers), TRUE)) . '
'; + $verbose .= '
Headers: 
' . Html::escape(var_export(array_map('trim', $this->headers), TRUE)) . '
'; } - $verbose .= '
' . $out; + $verbose .= '
' . $out; $this->verbose($verbose); return $out; @@ -1542,12 +1542,12 @@ protected function drupalPostForm($path, $edit, $submit, array $options = array( $path = $path->toString(); } $verbose = 'POST request to: ' . $path; - $verbose .= '
Ending URL: ' . $this->getUrl(); + $verbose .= '
Ending URL: ' . $this->getUrl(); if ($this->dumpHeaders) { - $verbose .= '
Headers: 
' . Html::escape(var_export(array_map('trim', $this->headers), TRUE)) . '
'; + $verbose .= '
Headers: 
' . Html::escape(var_export(array_map('trim', $this->headers), TRUE)) . '
'; } - $verbose .= '
Fields: ' . highlight_string('' . $out; + $verbose .= '
Fields: ' . highlight_string('' . $out; $this->verbose($verbose); return $out; @@ -1692,9 +1692,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); @@ -2006,8 +2006,8 @@ protected function drupalHead($path, array $options = array(), array $headers = if ($this->dumpHeaders) { $this->verbose('GET request to: ' . $path . - '
Ending URL: ' . $this->getUrl() . - '
Headers: 
' . Html::escape(var_export(array_map('trim', $this->headers), TRUE)) . '
'); + '
Ending URL: ' . $this->getUrl() . + '
Headers: 
' . Html::escape(var_export(array_map('trim', $this->headers), TRUE)) . '
'); } return $out; diff --git a/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php b/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php index 8bd84b2..9b414fd 100644 --- a/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php +++ b/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php @@ -156,7 +156,7 @@ public function build() { $nids = $this->statisticsStorage->fetchAll('daycount', $this->configuration['top_day_num']); if ($nids) { $content['top_day'] = $this->nodeTitleList($nids, $this->t("Today's:")); - $content['top_day']['#suffix'] = '
'; + $content['top_day']['#suffix'] = '
'; } } @@ -164,14 +164,14 @@ public function build() { $nids = $this->statisticsStorage->fetchAll('totalcount', $this->configuration['top_all_num']); if ($nids) { $content['top_all'] = $this->nodeTitleList($nids, $this->t('All time:')); - $content['top_all']['#suffix'] = '
'; + $content['top_all']['#suffix'] = '
'; } } if ($this->configuration['top_last_num'] > 0) { $nids = $this->statisticsStorage->fetchAll('timestamp', $this->configuration['top_last_num']); $content['top_last'] = $this->nodeTitleList($nids, $this->t('Last viewed:')); - $content['top_last']['#suffix'] = '
'; + $content['top_last']['#suffix'] = '
'; } return $content; diff --git a/core/modules/system/src/Form/PrepareModulesEntityUninstallForm.php b/core/modules/system/src/Form/PrepareModulesEntityUninstallForm.php index 858364f..b701aef 100644 --- a/core/modules/system/src/Form/PrepareModulesEntityUninstallForm.php +++ b/core/modules/system/src/Form/PrepareModulesEntityUninstallForm.php @@ -68,7 +68,7 @@ public function getQuestion() { * {@inheritdoc} */ public function getDescription() { - return $this->t('This action cannot be undone.
Make a backup of your database if you want to be able to restore these items.'); + return $this->t('This action cannot be undone.
Make a backup of your database if you want to be able to restore these items.'); } /** diff --git a/core/modules/system/src/Tests/Batch/PageTest.php b/core/modules/system/src/Tests/Batch/PageTest.php index f9948ed..39d6bfb 100644 --- a/core/modules/system/src/Tests/Batch/PageTest.php +++ b/core/modules/system/src/Tests/Batch/PageTest.php @@ -63,7 +63,7 @@ function testBatchProgressMessages() { // Go to the initial step only. $this->maximumMetaRefreshCount = 0; $this->drupalGet('batch-test/test-title'); - $this->assertRaw('
Initializing.
 
', 'Initial progress message appears correctly.'); + $this->assertRaw('
Initializing.
 
', 'Initial progress message appears correctly.'); $this->assertNoRaw('&nbsp;', 'Initial progress message is not double escaped.'); // Now also go to the next step. $this->maximumMetaRefreshCount = 1; diff --git a/core/modules/system/src/Tests/Common/AddFeedTest.php b/core/modules/system/src/Tests/Common/AddFeedTest.php index b539281..8c2c57d 100644 --- a/core/modules/system/src/Tests/Common/AddFeedTest.php +++ b/core/modules/system/src/Tests/Common/AddFeedTest.php @@ -73,7 +73,7 @@ function testBasicFeedAddNoTitle() { function urlToRSSLinkPattern($url, $title = '') { // Escape any regular expression characters in the URL ('?' is the worst). $url = preg_replace('/([+?.*])/', '[$0]', $url); - $generated_pattern = '%%'; + $generated_pattern = '%%'; return $generated_pattern; } diff --git a/core/modules/system/src/Tests/Common/RenderWebTest.php b/core/modules/system/src/Tests/Common/RenderWebTest.php index fde7fa6..97c48c7 100644 --- a/core/modules/system/src/Tests/Common/RenderWebTest.php +++ b/core/modules/system/src/Tests/Common/RenderWebTest.php @@ -164,7 +164,7 @@ function testDrupalRenderFormElements() { protected function assertRenderedElement(array $element, $xpath, array $xpath_args = array()) { $original_element = $element; $this->setRawContent(drupal_render_root($element)); - $this->verbose('
' . $this->getRawContent()); + $this->verbose('
' . $this->getRawContent()); // @see \Drupal\simpletest\WebTestBase::xpath() $xpath = $this->buildXPathQuery($xpath, $xpath_args); diff --git a/core/modules/system/src/Tests/Form/ProgrammaticTest.php b/core/modules/system/src/Tests/Form/ProgrammaticTest.php index 5fbefb5..a768f77 100644 --- a/core/modules/system/src/Tests/Form/ProgrammaticTest.php +++ b/core/modules/system/src/Tests/Form/ProgrammaticTest.php @@ -77,7 +77,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/Installer/InstallerTest.php b/core/modules/system/src/Tests/Installer/InstallerTest.php index 7a145f8..9602868 100644 --- a/core/modules/system/src/Tests/Installer/InstallerTest.php +++ b/core/modules/system/src/Tests/Installer/InstallerTest.php @@ -34,7 +34,7 @@ protected function setUpLanguage() { // Test that \Drupal\Core\Render\BareHtmlPageRenderer adds assets and // metatags as expected to the first page of the installer. $this->assertRaw('core/themes/seven/css/components/buttons.css'); - $this->assertRaw(''); + $this->assertRaw(''); // Assert that the expected title is present. $this->assertEqual('Choose language', $this->cssSelect('main h2')[0]); diff --git a/core/modules/system/src/Tests/Mail/HtmlToTextTest.php b/core/modules/system/src/Tests/Mail/HtmlToTextTest.php index f396acd..123ebb9 100644 --- a/core/modules/system/src/Tests/Mail/HtmlToTextTest.php +++ b/core/modules/system/src/Tests/Mail/HtmlToTextTest.php @@ -54,12 +54,12 @@ protected function assertHtmlToText($html, $text, $message, $allowed_tags = NULL $result = MailFormatHelper::htmlToText($html, $allowed_tags); $pass = $this->assertEqual($result, $text, Html::escape($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/src/Tests/System/AdminMetaTagTest.php b/core/modules/system/src/Tests/System/AdminMetaTagTest.php index ea92bd9..5d25f04 100644 --- a/core/modules/system/src/Tests/System/AdminMetaTagTest.php +++ b/core/modules/system/src/Tests/System/AdminMetaTagTest.php @@ -15,7 +15,7 @@ class AdminMetaTagTest extends WebTestBase { */ public function testMetaTag() { list($version, ) = explode('.', \Drupal::VERSION); - $string = ''; + $string = ''; $this->drupalGet('node'); $this->assertRaw($string, 'Fingerprinting meta tag generated correctly.', 'System'); } diff --git a/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php b/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php index 98d82d3..262542f 100644 --- a/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php +++ b/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php @@ -21,7 +21,7 @@ class DefaultMobileMetaTagsTest extends WebTestBase { protected function setUp() { parent::setUp(); $this->defaultMetaTags = array( - 'viewport' => '', + 'viewport' => '', ); } diff --git a/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php b/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php index 08f741d..6af0c61 100644 --- a/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php +++ b/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php @@ -57,7 +57,7 @@ public function testConfigForm() { '%values' => print_r($values, TRUE), '%errors' => $valid_form ? t('None') : implode(' ', $errors), ); - $this->assertTrue($valid_form, format_string('Input values: %values
Validation handler errors: %errors', $args)); + $this->assertTrue($valid_form, format_string('Input values: %values
Validation handler errors: %errors', $args)); foreach ($this->values as $data) { $this->assertEqual($data['#value'], $this->config($data['#config_name'])->get($data['#config_key'])); diff --git a/core/modules/system/src/Tests/Theme/FunctionsTest.php b/core/modules/system/src/Tests/Theme/FunctionsTest.php index fa5a2ac..85615de 100644 --- a/core/modules/system/src/Tests/Theme/FunctionsTest.php +++ b/core/modules/system/src/Tests/Theme/FunctionsTest.php @@ -511,7 +511,7 @@ function testImage() { $variables = array(); $variables['uri'] = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg=='; $variables['alt'] = 'Data URI image of a red dot'; - $expected = 'Data URI image of a red dot' . "\n"; + $expected = 'Data URI image of a red dot' . "\n"; $this->assertThemeOutput('image', $variables, $expected); } diff --git a/core/modules/system/src/Tests/Theme/TwigExtensionTest.php b/core/modules/system/src/Tests/Theme/TwigExtensionTest.php index 4be1f73..0b4ba45 100644 --- a/core/modules/system/src/Tests/Theme/TwigExtensionTest.php +++ b/core/modules/system/src/Tests/Theme/TwigExtensionTest.php @@ -43,7 +43,7 @@ function testTwigExtensionFilter() { $this->drupalGet('twig-extension-test/filter'); $this->assertText('Every plant is not a mineral.', 'Success: String filtered.'); // Test safe_join filter. - $this->assertRaw('<em>will be escaped</em>
will be markup
will be rendered'); + $this->assertRaw('<em>will be escaped</em>
will be markup
will be rendered'); } /** diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 6dc2663..38b916e 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -541,7 +541,7 @@ function system_requirements($phase) { '#markup' => t('You can run cron manually.', [':cron' => \Drupal::url('system.run_cron')]), ], [ - '#prefix' => '
', + '#prefix' => '
', '#markup' => t('To run cron from outside the site, go to @cron', [':url' => $cron_url, '@cron' => $cron_url]), ], ]; 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 2a98687..dc1ee2e 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 %} - {{ 'Home'|t }} + {{ 'Home'|t }} {% endif %} {% if site_name %} diff --git a/core/modules/system/templates/image.html.twig b/core/modules/system/templates/image.html.twig index 6411eaa..cc96359 100644 --- a/core/modules/system/templates/image.html.twig +++ b/core/modules/system/templates/image.html.twig @@ -12,4 +12,4 @@ * @ingroup themeable */ #} - + diff --git a/core/modules/system/templates/input.html.twig b/core/modules/system/templates/input.html.twig index 1409c25..175aa82 100644 --- a/core/modules/system/templates/input.html.twig +++ b/core/modules/system/templates/input.html.twig @@ -12,4 +12,4 @@ * @ingroup themeable */ #} -{{ children }} +{{ children }} diff --git a/core/modules/system/templates/maintenance-page.html.twig b/core/modules/system/templates/maintenance-page.html.twig index 748ed5a..216483b 100644 --- a/core/modules/system/templates/maintenance-page.html.twig +++ b/core/modules/system/templates/maintenance-page.html.twig @@ -14,7 +14,7 @@
{% if logo %} - {{ 'Home'|t }} + {{ 'Home'|t }} {% endif %} diff --git a/core/modules/system/templates/table.html.twig b/core/modules/system/templates/table.html.twig index 4436570..e20fd7a 100644 --- a/core/modules/system/templates/table.html.twig +++ b/core/modules/system/templates/table.html.twig @@ -50,11 +50,11 @@ {% if colgroup.cols %} {% for col in colgroup.cols %} - + {% endfor %} {% else %} - + {% endif %} {% endfor %} 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 4a271b0..1f97666 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 @@ -100,7 +100,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))); } // Use item list template to render the messages. diff --git a/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMultiStepForm.php b/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMultiStepForm.php index 260941f..f0e494d 100644 --- a/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMultiStepForm.php +++ b/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMultiStepForm.php @@ -28,7 +28,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { } $form['step_display'] = array( - '#markup' => 'step ' . $step . '
', + '#markup' => 'step ' . $step . '
', ); $form['submit'] = array( '#type' => 'submit', diff --git a/core/modules/system/tests/modules/twig_extension_test/templates/twig_extension_test.filter.html.twig b/core/modules/system/tests/modules/twig_extension_test/templates/twig_extension_test.filter.html.twig index 981874f..0532af7 100644 --- a/core/modules/system/tests/modules/twig_extension_test/templates/twig_extension_test.filter.html.twig +++ b/core/modules/system/tests/modules/twig_extension_test/templates/twig_extension_test.filter.html.twig @@ -2,5 +2,5 @@ {{ message|testfilter }}
- {{ safe_join_items|safe_join('
') }} + {{ safe_join_items|safe_join('
') }}
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 a464e47..820cf1d 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|safe_join("
") }}

+{{ theme_hook_suggestions|safe_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 8ac8cd2..e586cf8 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|safe_join("
") }}

+{{ theme_hook_suggestions|safe_join("
") }}

diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_all_terms_test.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_all_terms_test.yml index 4f1467b..4a0df21 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_all_terms_test.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_all_terms_test.yml @@ -201,7 +201,7 @@ display: exclude: false alter: alter_text: true - text: "Term: {{ term_node_tid }}
\nThe taxonomy term ID for the term: {{ term_node_tid__tid }}
\nThe taxonomy term name for the term: {{ term_node_tid__name }}
\nThe machine name for the vocabulary the term belongs to: {{ term_node_tid__vocabulary_vid }}
\nThe name for the vocabulary the term belongs to: {{ term_node_tid__vocabulary }}
" + text: "Term: {{ term_node_tid }}
\nThe taxonomy term ID for the term: {{ term_node_tid__tid }}
\nThe taxonomy term name for the term: {{ term_node_tid__name }}
\nThe machine name for the vocabulary the term belongs to: {{ term_node_tid__vocabulary_vid }}
\nThe name for the vocabulary the term belongs to: {{ term_node_tid__vocabulary }}
" make_link: false path: '' absolute: false @@ -239,7 +239,7 @@ display: empty_zero: false hide_alter_empty: true type: separator - separator: '
' + separator: '
' link_to_taxonomy: false limit: false vids: diff --git a/core/modules/tracker/js/tracker-history.js b/core/modules/tracker/js/tracker-history.js index 877a9ca..af8788b 100644 --- a/core/modules/tracker/js/tracker-history.js +++ b/core/modules/tracker/js/tracker-history.js @@ -112,7 +112,7 @@ if (results.hasOwnProperty(nodeID) && placeholdersToUpdate.hasOwnProperty(nodeID)) { var url = results[nodeID].first_new_comment_link; var text = Drupal.formatPlural(results[nodeID].new_comment_count, '1 new', '@count new'); - $(placeholdersToUpdate[nodeID]).append('
' + text + ''); + $(placeholdersToUpdate[nodeID]).append('
' + text + ''); } } } diff --git a/core/modules/user/src/RegisterForm.php b/core/modules/user/src/RegisterForm.php index 9bc047b..aee4ff0 100644 --- a/core/modules/user/src/RegisterForm.php +++ b/core/modules/user/src/RegisterForm.php @@ -131,7 +131,7 @@ public function save(array $form, FormStateInterface $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 email 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 email address.')); $form_state->setRedirect(''); } } diff --git a/core/modules/user/user.permissions.js b/core/modules/user/user.permissions.js index c3dc24f..cb6eab5 100644 --- a/core/modules/user/user.permissions.js +++ b/core/modules/user/user.permissions.js @@ -42,7 +42,7 @@ // submitted form. If we'd automatically check existing checkboxes, the // permission table would be polluted with redundant entries. This // is deliberate, but desirable when we automatically check them. - var $dummy = $('') + var $dummy = $('') .attr('title', Drupal.t('This permission is inherited from the authenticated user role.')) .hide(); diff --git a/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php b/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php index db19052..fe4ac8a 100644 --- a/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php +++ b/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php @@ -128,7 +128,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta '#required' => TRUE, '#options' => $options, '#default_value' => $default, - '#description' => '

' . $this->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.') . '

', + '#description' => '

' . $this->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.') . '

', ); $default = !empty($view_settings['arguments']) ? implode(', ', $view_settings['arguments']) : ''; diff --git a/core/modules/views/src/Plugin/views/row/EntityReference.php b/core/modules/views/src/Plugin/views/row/EntityReference.php index 4ca79ba..17b3739 100644 --- a/core/modules/views/src/Plugin/views/row/EntityReference.php +++ b/core/modules/views/src/Plugin/views/row/EntityReference.php @@ -37,7 +37,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); // Expand the description of the 'Inline field' checkboxes. - $form['inline']['#description'] .= '
' . $this->t("Note: In 'Entity Reference' displays, all fields will be displayed inline unless an explicit selection of inline fields is made here." ); + $form['inline']['#description'] .= '
' . $this->t("Note: In 'Entity Reference' displays, all fields will be displayed inline unless an explicit selection of inline fields is made here." ); } /** diff --git a/core/profiles/standard/tests/src/Functional/StandardTest.php b/core/profiles/standard/tests/src/Functional/StandardTest.php index 6416368..dbda74c 100644 --- a/core/profiles/standard/tests/src/Functional/StandardTest.php +++ b/core/profiles/standard/tests/src/Functional/StandardTest.php @@ -84,7 +84,7 @@ function testStandard() { 'title' => 'Foobar', 'promote' => 1, 'status' => 1, - 'body' => array(array('value' => 'Then she picked out two somebodies,
Sally and me', 'format' => 'basic_html')), + 'body' => array(array('value' => 'Then she picked out two somebodies,
Sally and me', 'format' => 'basic_html')), )); // Add a comment. diff --git a/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php b/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php index 72e7b6f..2350477 100644 --- a/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php +++ b/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php @@ -90,7 +90,7 @@ function testAddFiles() { $rendered_css = $this->renderer->renderPlain($css_render_array); $rendered_js = $this->renderer->renderPlain($js_render_array); $query_string = $this->container->get('state')->get('system.css_js_query_string') ?: '0'; - $this->assertNotIdentical(strpos($rendered_css, ''), FALSE, 'Rendering an external CSS file.'); + $this->assertNotIdentical(strpos($rendered_css, ''), FALSE, 'Rendering an external CSS file.'); $this->assertNotIdentical(strpos($rendered_js, ''), FALSE, 'Rendering an external JavaScript file.'); } @@ -129,7 +129,7 @@ function testAddExternalFiles() { $js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js); $rendered_css = $this->renderer->renderPlain($css_render_array); $rendered_js = $this->renderer->renderPlain($js_render_array); - $this->assertNotIdentical(strpos($rendered_css, ''), FALSE, 'Rendering an external CSS file.'); + $this->assertNotIdentical(strpos($rendered_css, ''), FALSE, 'Rendering an external CSS file.'); $this->assertNotIdentical(strpos($rendered_js, ''), FALSE, 'Rendering an external JavaScript file.'); } @@ -473,7 +473,7 @@ function testAddJsFileWithQueryString() { $js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js); $rendered_js = $this->renderer->renderPlain($js_render_array); $query_string = $this->container->get('state')->get('system.css_js_query_string') ?: '0'; - $this->assertNotIdentical(strpos($rendered_css, ''), FALSE, 'CSS file with query string gets version query string correctly appended..'); + $this->assertNotIdentical(strpos($rendered_css, ''), FALSE, 'CSS file with query string gets version query string correctly appended..'); $this->assertNotIdentical(strpos($rendered_js, ''), FALSE, 'JavaScript file with query string gets version query string correctly appended.'); } diff --git a/core/tests/Drupal/KernelTests/Core/Render/Element/RenderElementTypesTest.php b/core/tests/Drupal/KernelTests/Core/Render/Element/RenderElementTypesTest.php index 3e11695..0d9f81f 100644 --- a/core/tests/Drupal/KernelTests/Core/Render/Element/RenderElementTypesTest.php +++ b/core/tests/Drupal/KernelTests/Core/Render/Element/RenderElementTypesTest.php @@ -89,7 +89,7 @@ function testHtmlTag() { 'name' => 'description', 'content' => 'Drupal test', ), - ), '' . "\n", "#type 'html_tag', void element renders properly"); + ), '' . "\n", "#type 'html_tag', void element renders properly"); // Test non-void element. $this->assertElements(array( @@ -105,7 +105,7 @@ function testHtmlTag() { $this->assertElements(array( '#type' => 'html_tag', '#tag' => 'link', - ), "\n", "#type 'html_tag' empty void element renders properly"); + ), "\n", "#type 'html_tag' empty void element renders properly"); // Test empty non-void element tag. $this->assertElements(array( diff --git a/core/tests/Drupal/KernelTests/Core/Theme/ThemeRenderAndAutoescapeTest.php b/core/tests/Drupal/KernelTests/Core/Theme/ThemeRenderAndAutoescapeTest.php index 98423ca..58bf60e 100644 --- a/core/tests/Drupal/KernelTests/Core/Theme/ThemeRenderAndAutoescapeTest.php +++ b/core/tests/Drupal/KernelTests/Core/Theme/ThemeRenderAndAutoescapeTest.php @@ -76,7 +76,7 @@ public function providerTestThemeRenderAndAutoescape() { Html::escape('') ], 'type plain_text render array EM tag is escaped' => [['#plain_text' => 'hi'], Html::escape('hi')], - 'type hidden render array is rendered' => [['#type' => 'hidden', '#name' => 'foo', '#value' => 'bar'], "\n"], + 'type hidden render array is rendered' => [['#type' => 'hidden', '#name' => 'foo', '#value' => 'bar'], "\n"], ]; } diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php index 1ab59b6..d823480 100644 --- a/core/tests/Drupal/Tests/BrowserTestBase.php +++ b/core/tests/Drupal/Tests/BrowserTestBase.php @@ -440,7 +440,7 @@ protected function getResponseLogHandler() { $caller = $this->getTestMethodCaller(); $html_output = 'Called from ' . $caller['function'] . ' line ' . $caller['line']; - $html_output .= '
' . $request->getMethod() . ' request to: ' . $request->getUri(); + $html_output .= '
' . $request->getMethod() . ' request to: ' . $request->getUri(); // On redirect responses (status code starting with '3') we need // to remove the meta tag that would do a browser refresh. We @@ -449,9 +449,9 @@ protected function getResponseLogHandler() { $body = $response->getBody(); $status_code = (string) $response->getStatusCode(); if ($status_code[0] === '3') { - $body = preg_replace('##', '', $body, 1); + $body = preg_replace('##', '', $body, 1); } - $html_output .= '
' . $body; + $html_output .= '
' . $body; $html_output .= $this->formatHtmlOutputHeaders($response->getHeaders()); $this->htmlOutput($html_output); @@ -737,8 +737,8 @@ protected function drupalGet($path, array $options = array(), array $headers = a // ::getResponseLogHandler. if ($this->htmlOutputEnabled && !($this->getSession()->getDriver() instanceof GoutteDriver)) { $html_output = 'GET request to: ' . $url . - '
Ending URL: ' . $this->getSession()->getCurrentUrl(); - $html_output .= '
' . $out; + '
Ending URL: ' . $this->getSession()->getCurrentUrl(); + $html_output .= '
' . $out; $html_output .= $this->getHtmlOutputHeaders(); $this->htmlOutput($html_output); } @@ -911,8 +911,8 @@ protected function submitForm(array $edit, $submit, $form_html_id = NULL) { if ($this->htmlOutputEnabled && !($this->getSession()->getDriver() instanceof GoutteDriver)) { $out = $this->getSession()->getPage()->getContent(); $html_output = 'POST request to: ' . $action . - '
Ending URL: ' . $this->getSession()->getCurrentUrl(); - $html_output .= '
' . $out; + '
Ending URL: ' . $this->getSession()->getCurrentUrl(); + $html_output .= '
' . $out; $html_output .= $this->getHtmlOutputHeaders(); $this->htmlOutput($html_output); } @@ -1602,7 +1602,7 @@ protected function htmlOutput($message) { if (!$this->htmlOutputEnabled) { return; } - $message = '
ID #' . $this->htmlOutputCounter . ' (Previous | Next)
' . $message; + $message = '
ID #' . $this->htmlOutputCounter . ' (Previous | Next)
' . $message; $html_output_filename = $this->htmlOutputClassName . '-' . $this->htmlOutputCounter . '-' . $this->htmlOutputTestId . '.html'; file_put_contents($this->htmlOutputDirectory . '/' . $html_output_filename, $message); file_put_contents($this->htmlOutputCounterStorage, $this->htmlOutputCounter++); @@ -1637,7 +1637,7 @@ protected function formatHtmlOutputHeaders(array $headers) { return $header; } }, $headers); - return '
Headers: 
' . Html::escape(var_export($flattened_headers, TRUE)) . '
'; + return '
Headers: 
' . Html::escape(var_export($flattened_headers, TRUE)) . '
'; } /** diff --git a/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php b/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php index bef5cef..ba238c9 100644 --- a/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php +++ b/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php @@ -57,7 +57,7 @@ public function providerPreRenderHtmlTag() { $element = array( '#tag' => 'br', ); - $tags[] = array($element, "
\n"); + $tags[] = array($element, "
\n"); // Attributes. $element = array( diff --git a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php index 396b2f9..d52836b 100644 --- a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php +++ b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php @@ -222,8 +222,8 @@ public function testSafeJoin() { $markup, ['#markup' => 'will be rendered'], ]; - $result = $this->systemUnderTest->safeJoin($twig_environment, $items, '
'); - $this->assertEquals('<em>will be escaped</em>
will be markup
will be rendered', $result); + $result = $this->systemUnderTest->safeJoin($twig_environment, $items, '
'); + $this->assertEquals('<em>will be escaped</em>
will be markup
will be rendered', $result); // Ensure safe_join Twig filter supports Traversable variables. $items = new \ArrayObject([ diff --git a/core/themes/bartik/color/preview.html b/core/themes/bartik/color/preview.html index 7031b08..cfdfd52 100644 --- a/core/themes/bartik/color/preview.html +++ b/core/themes/bartik/color/preview.html @@ -1,7 +1,7 @@
- +
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 9bf4f3d..ada2daf 100644 --- a/core/themes/bartik/templates/block--system-branding-block.html.twig +++ b/core/themes/bartik/templates/block--system-branding-block.html.twig @@ -17,7 +17,7 @@ {% block content %} {% if site_logo %} {% endif %} {% if site_name or site_slogan %} diff --git a/core/themes/classy/templates/block/block--system-branding-block.html.twig b/core/themes/classy/templates/block/block--system-branding-block.html.twig index 7c3b7de..4281111 100644 --- a/core/themes/classy/templates/block/block--system-branding-block.html.twig +++ b/core/themes/classy/templates/block/block--system-branding-block.html.twig @@ -16,7 +16,7 @@ {% block content %} {% if site_logo %} {% endif %} {% if site_name %} diff --git a/core/themes/classy/templates/content-edit/file-upload-help.html.twig b/core/themes/classy/templates/content-edit/file-upload-help.html.twig index d05822e..7e9bffb 100644 --- a/core/themes/classy/templates/content-edit/file-upload-help.html.twig +++ b/core/themes/classy/templates/content-edit/file-upload-help.html.twig @@ -9,4 +9,4 @@ * @see template_preprocess_file_upload_help() */ #} -{{ descriptions|safe_join('
    ') }} +{{ descriptions|safe_join('
    ') }} diff --git a/core/themes/classy/templates/dataset/forum-list.html.twig b/core/themes/classy/templates/dataset/forum-list.html.twig index ce610bb..1564003 100644 --- a/core/themes/classy/templates/dataset/forum-list.html.twig +++ b/core/themes/classy/templates/dataset/forum-list.html.twig @@ -66,7 +66,7 @@ {{ forum.num_topics }} {% if forum.new_topics == true %} -
    +
    {{ forum.new_text }} {% endif %} diff --git a/core/themes/classy/templates/dataset/table.html.twig b/core/themes/classy/templates/dataset/table.html.twig index 2afa9c1..a9da369 100644 --- a/core/themes/classy/templates/dataset/table.html.twig +++ b/core/themes/classy/templates/dataset/table.html.twig @@ -48,11 +48,11 @@ {% if colgroup.cols %} {% for col in colgroup.cols %} - + {% endfor %} {% else %} - + {% endif %} {% endfor %} diff --git a/core/themes/classy/templates/field/image.html.twig b/core/themes/classy/templates/field/image.html.twig index 31f782b..348d6ec 100644 --- a/core/themes/classy/templates/field/image.html.twig +++ b/core/themes/classy/templates/field/image.html.twig @@ -15,4 +15,4 @@ set classes = [ style_name ? 'image-style-' ~ style_name|clean_class, ] %} - + diff --git a/core/themes/classy/templates/form/input.html.twig b/core/themes/classy/templates/form/input.html.twig index d5cac38..37dc7e5 100644 --- a/core/themes/classy/templates/form/input.html.twig +++ b/core/themes/classy/templates/form/input.html.twig @@ -10,4 +10,4 @@ * @see template_preprocess_input() */ #} -{{ children }} +{{ children }} diff --git a/core/themes/classy/templates/layout/book-export-html.html.twig b/core/themes/classy/templates/layout/book-export-html.html.twig index ea33648..d0cc862 100644 --- a/core/themes/classy/templates/layout/book-export-html.html.twig +++ b/core/themes/classy/templates/layout/book-export-html.html.twig @@ -21,8 +21,8 @@ {{ title }} {{ page.head }} - - + + {# diff --git a/core/themes/classy/templates/layout/maintenance-page.html.twig b/core/themes/classy/templates/layout/maintenance-page.html.twig index 7463b02..620cbc7 100644 --- a/core/themes/classy/templates/layout/maintenance-page.html.twig +++ b/core/themes/classy/templates/layout/maintenance-page.html.twig @@ -14,7 +14,7 @@
    {% if logo %} - {{ 'Home'|t }} + {{ 'Home'|t }} {% endif %} diff --git a/core/themes/stable/templates/block/block--system-branding-block.html.twig b/core/themes/stable/templates/block/block--system-branding-block.html.twig index 186b360..73735bc 100644 --- a/core/themes/stable/templates/block/block--system-branding-block.html.twig +++ b/core/themes/stable/templates/block/block--system-branding-block.html.twig @@ -16,7 +16,7 @@ {% block content %} {% if site_logo %} - {{ 'Home'|t }} + {{ 'Home'|t }} {% endif %} {% if site_name %} diff --git a/core/themes/stable/templates/content-edit/file-upload-help.html.twig b/core/themes/stable/templates/content-edit/file-upload-help.html.twig index d05822e..7e9bffb 100644 --- a/core/themes/stable/templates/content-edit/file-upload-help.html.twig +++ b/core/themes/stable/templates/content-edit/file-upload-help.html.twig @@ -9,4 +9,4 @@ * @see template_preprocess_file_upload_help() */ #} -{{ descriptions|safe_join('
    ') }} +{{ descriptions|safe_join('
    ') }} diff --git a/core/themes/stable/templates/dataset/forum-list.html.twig b/core/themes/stable/templates/dataset/forum-list.html.twig index 3de920a..227c4aa 100644 --- a/core/themes/stable/templates/dataset/forum-list.html.twig +++ b/core/themes/stable/templates/dataset/forum-list.html.twig @@ -62,7 +62,7 @@ {{ forum.num_topics }} {% if forum.new_topics == true %} -
    +
    {{ forum.new_text }} {% endif %} diff --git a/core/themes/stable/templates/dataset/table.html.twig b/core/themes/stable/templates/dataset/table.html.twig index 231ada2..940ad29 100644 --- a/core/themes/stable/templates/dataset/table.html.twig +++ b/core/themes/stable/templates/dataset/table.html.twig @@ -48,11 +48,11 @@ {% if colgroup.cols %} {% for col in colgroup.cols %} - + {% endfor %} {% else %} - + {% endif %} {% endfor %} diff --git a/core/themes/stable/templates/field/image.html.twig b/core/themes/stable/templates/field/image.html.twig index b342eee..d11a7c0 100644 --- a/core/themes/stable/templates/field/image.html.twig +++ b/core/themes/stable/templates/field/image.html.twig @@ -10,4 +10,4 @@ * @see template_preprocess_image() */ #} - + diff --git a/core/themes/stable/templates/field/responsive-image.html.twig b/core/themes/stable/templates/field/responsive-image.html.twig index ae77ffb..0a31cca 100644 --- a/core/themes/stable/templates/field/responsive-image.html.twig +++ b/core/themes/stable/templates/field/responsive-image.html.twig @@ -24,7 +24,7 @@ #} {% for source_attributes in sources %} - + {% endfor %} {% endif %} diff --git a/core/themes/stable/templates/form/input.html.twig b/core/themes/stable/templates/form/input.html.twig index d5cac38..37dc7e5 100644 --- a/core/themes/stable/templates/form/input.html.twig +++ b/core/themes/stable/templates/form/input.html.twig @@ -10,4 +10,4 @@ * @see template_preprocess_input() */ #} -{{ children }} +{{ children }} diff --git a/core/themes/stable/templates/layout/book-export-html.html.twig b/core/themes/stable/templates/layout/book-export-html.html.twig index 17ac1bc..9c8bdd5 100644 --- a/core/themes/stable/templates/layout/book-export-html.html.twig +++ b/core/themes/stable/templates/layout/book-export-html.html.twig @@ -21,8 +21,8 @@ {{ title }} {{ page.head }} - - + + {# diff --git a/core/themes/stable/templates/layout/maintenance-page.html.twig b/core/themes/stable/templates/layout/maintenance-page.html.twig index de0acaa..49edd0f 100644 --- a/core/themes/stable/templates/layout/maintenance-page.html.twig +++ b/core/themes/stable/templates/layout/maintenance-page.html.twig @@ -12,7 +12,7 @@
    {% if logo %} - {{ 'Home'|t }} + {{ 'Home'|t }} {% endif %}