Issue #2441373 by twistor, vsujeetkumar, marvil07, eporama, daffie,...

Issue #2441373 by twistor, vsujeetkumar, marvil07, eporama, daffie, joseph.olstad, alvar0hurtad0, jibran, longwave, joelpittet, smustgrave, alexpott: Upgrade tests to HTML5

(cherry picked from commit 13883cc3)

core/modules/layout_discovery/tests/src/Kernel/LayoutTest.php

@@ -71,7 +71,7 @@ public function testRenderLayout($layout_id, $config, $regions, array $html) {
     $build_id_input = $this->cssSelect('input[name="form_build_id"]')[0]->asXML();
     $form_id_input = '<input data-drupal-selector="edit-the-form-id" type="hidden" name="form_id" value="the_form_id"/>';
     $html[] = 'Test suffix';
-    $html[] = $build_id_input . $form_id_input . '</form>';
+    $html[] = $build_id_input . "\n" . $form_id_input . "\n" . '</form>';
 
     // Match the HTML to the full form element.
     $this->assertSame(implode("\n", $html), $this->cssSelect('#the-form-id')[0]->asXML());

core/modules/system/tests/src/Kernel/Theme/FunctionsTest.php

@@ -480,8 +480,7 @@ public function testDrupalPreRenderLinks() {
     // it.
     $render_array = $base_array;
     $html = \Drupal::service('renderer')->renderRoot($render_array);
-    $dom = new \DOMDocument();
-    $dom->loadHTML($html);
+    $dom = Html::load($html);
     $this->assertEquals(1, $dom->getElementsByTagName('ul')->length, 'One "ul" tag found in the rendered HTML.');
     $list_elements = $dom->getElementsByTagName('li');
     $this->assertEquals(3, $list_elements->length, 'Three "li" tags found in the rendered HTML.');
@@ -498,16 +497,14 @@ public function testDrupalPreRenderLinks() {
     $child_html = \Drupal::service('renderer')->renderRoot($render_array['first_child']);
     $parent_html = \Drupal::service('renderer')->renderRoot($render_array);
     // First check the child HTML.
-    $dom = new \DOMDocument();
-    $dom->loadHTML($child_html);
+    $dom = Html::load($child_html);
     $this->assertEquals(1, $dom->getElementsByTagName('ul')->length, 'One "ul" tag found in the rendered child HTML.');
     $list_elements = $dom->getElementsByTagName('li');
     $this->assertEquals(2, $list_elements->length, 'Two "li" tags found in the rendered child HTML.');
     $this->assertEquals('Parent link copy', $list_elements->item(0)->nodeValue, 'First expected link found.');
     $this->assertEquals('First child link', $list_elements->item(1)->nodeValue, 'Second expected link found.');
     // Then check the parent HTML.
-    $dom = new \DOMDocument();
-    $dom->loadHTML($parent_html);
+    $dom = Html::load($parent_html);
     $this->assertEquals(1, $dom->getElementsByTagName('ul')->length, 'One "ul" tag found in the rendered parent HTML.');
     $list_elements = $dom->getElementsByTagName('li');
     $this->assertEquals(2, $list_elements->length, 'Two "li" tags found in the rendered parent HTML.');

core/modules/views/tests/src/Functional/Handler/FieldWebTest.php

@@ -177,8 +177,7 @@ protected function assertNotSubString(string $haystack, string $needle, string $
    *   An array containing simplexml objects.
    */
   protected function parseContent($content) {
-    $htmlDom = new \DOMDocument();
-    @$htmlDom->loadHTML('<?xml encoding="UTF-8">' . $content);
+    $htmlDom = Html::load($content);
     $elements = simplexml_import_dom($htmlDom);
 
     return $elements;

core/modules/views/tests/src/Kernel/Plugin/StyleTest.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\views\Kernel\Plugin;
 
+use Drupal\Component\Utility\Html;
 use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
 use Drupal\views\Views;
 use Drupal\views_test_data\Plugin\views\row\RowTest;
@@ -309,8 +310,7 @@ public function testCustomRowClasses() {
    *   The HTML DOM.
    */
   protected function getHtmlDom($output) {
-    $html_dom = new \DOMDocument();
-    @$html_dom->loadHTML($output);
+    $html_dom = Html::load($output);
     if ($html_dom) {
       // It's much easier to work with simplexml than DOM, luckily enough
       // we can just simply import our DOM tree.

core/modules/views/tests/src/Kernel/Plugin/StyleTestBase.php

@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\views\Kernel\Plugin;
 
+use Drupal\Component\Utility\Html;
 use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
-use Masterminds\HTML5;
 
 /**
  * Tests some general style plugin related functionality.
@@ -21,8 +21,7 @@ abstract class StyleTestBase extends ViewsKernelTestBase {
    * Stores a view output in the elements.
    */
   public function storeViewPreview($output) {
-    $html5 = new HTML5();
-    $htmlDom = $html5->loadHTML('<html><body>' . $output . '</body></html>');
+    $htmlDom = Html::load($output);
     if ($htmlDom) {
       // It's much easier to work with simplexml than DOM, luckily enough
       // we can just simply import our DOM tree.

core/tests/Drupal/KernelTests/AssertContentTrait.php

@@ -122,14 +122,12 @@ protected function setDrupalSettings($settings) {
    */
   protected function parse() {
     if (!isset($this->elements)) {
-      // DOM can load HTML soup. But, HTML soup can throw warnings, suppress
-      // them.
-      $html_dom = new \DOMDocument();
-      @$html_dom->loadHTML('<?xml encoding="UTF-8">' . $this->getRawContent(), LIBXML_NOBLANKS);
-      if ($html_dom) {
+      $content = $this->getRawContent();
+      $dom = Html::load($content);
+      if ($dom) {
         // It's much easier to work with simplexml than DOM, luckily enough
         // we can just simply import our DOM tree.
-        $this->elements = simplexml_import_dom($html_dom);
+        $this->elements = @simplexml_import_dom($dom);
       }
     }
     $this->assertNotFalse($this->elements, 'The current HTML page should be available for DOM navigation.');

core/tests/Drupal/Tests/Core/Template/AttributeTest.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\Core\Template;
 
+use Drupal\Component\Render\MarkupInterface;
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Render\Markup;
 use Drupal\Core\Template\Attribute;
@@ -9,7 +10,6 @@
 use Drupal\Core\Template\AttributeString;
 use Drupal\Core\Template\Loader\StringLoader;
 use Drupal\Tests\UnitTestCase;
-use Drupal\Component\Render\MarkupInterface;
 use Twig\Environment;
 
 /**
@@ -447,8 +447,7 @@ protected function assertNoID(string $id, string $html): void {
    *   The number of results that are found.
    */
   protected function getXPathResultCount($query, $html) {
-    $document = new \DOMDocument();
-    $document->loadHTML($html);
+    $document = Html::load($html);
     $xpath = new \DOMXPath($document);
 
     return $xpath->query($query)->length;

core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php

@@ -3,6 +3,8 @@
 namespace Drupal\Tests\Core\Utility;
 
 use Drupal\Component\Render\MarkupInterface;
+use Drupal\Component\Utility\Html;
+use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\GeneratedButton;
 use Drupal\Core\GeneratedNoLink;
 use Drupal\Core\GeneratedUrl;
@@ -12,7 +14,6 @@
 use Drupal\Core\Url;
 use Drupal\Core\Utility\LinkGenerator;
 use Drupal\Tests\UnitTestCase;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
 
 /**
  * @coversDefaultClass \Drupal\Core\Utility\LinkGenerator
@@ -676,8 +677,7 @@ public static function assertLink(array $properties, MarkupInterface $html, int
     }
 
     // Execute the query.
-    $document = new \DOMDocument();
-    $document->loadHTML($html);
+    $document = Html::load($html);
     $xpath = new \DOMXPath($document);
 
     self::assertEquals($count, $xpath->query($query)->length);
@@ -694,8 +694,7 @@ public static function assertLink(array $properties, MarkupInterface $html, int
    * @internal
    */
   protected function assertNoXPathResults(string $query, string $html): void {
-    $document = new \DOMDocument();
-    $document->loadHTML($html);
+    $document = Html::load($html);
     $xpath = new \DOMXPath($document);
 
     self::assertFalse((bool) $xpath->query($query)->length);