Replaced the HTML Parser

Replaced the HTML-Parser with the inbuilt HTML parser.

Author: QuickWrite

includes/CustomOptions.php

@@ -1,8 +1,5 @@
 <?php
 require_once __DIR__ . '/vendor/autoload.php';
-require_once 'CustomOptions.php';
-
-use PHPHtmlParser\Dom;
 
 /**
  * Stores the description of the code.
@@ -49,19 +46,14 @@ public function getNext($index) {
      * @param string $dom A string that has the content of the <desc>-element.
      */
     public function setTexts(&$dom) {
-
-        $content = new Dom();
-
-        $content->loadStr($dom, getOptions());
-
-        $positions = $content->getElementsByTag('position');
+        $positions = $dom->getElementsByTagName('position');
         $numberOfPos = sizeof($positions);
 
         $hasOne = false;
 
         for($i = 0; $i < $numberOfPos; ++$i) {
             $key = $positions[$i]->getAttribute('line');
-            $content = $positions[$i]->innerHtml;
+            $content = $positions->item($i)->nodeValue;
 
             if($key == 1)
                 $hasOne = true;

includes/Description.php

@@ -39,8 +39,8 @@ public static function renderMultiCodeBlock( $input, array $args, Parser $parser
 		$replaced = str_replace($code, '', $input);
 		$dom = getDOM($replaced);
 
-		$codevariants = $dom->getElementsbyTag('codeblock')->toArray();
-		$descriptions = $dom->getElementsbyTag('desc')->toArray();
+		$codevariants = $dom->getElementsbyTagName('codeblock');
+		$descriptions = $dom->getElementsbyTagName('desc');
 
 		$size = sizeof($codevariants);
 		$return = "";
@@ -49,7 +49,9 @@ public static function renderMultiCodeBlock( $input, array $args, Parser $parser
 		$h1 = new \Highlight\Highlighter();
 
 		for($i = 0; $i < $size; ++$i) {
-			$codeblock = createCodeBlock($codevariants[$i], $code[$i], $descriptions[$i], $parser, $h1);
+			$desc = $descriptions->item($i);
+
+			$codeblock = createCodeBlock($code[$i], $desc, $codevariants[$i]->getAttribute('lang'), $parser, $h1);
 			$return .= '<div class="tab-content '.($i == 0 ? 'tc-active' : '').'" data-tab="'.$i.'">'.$codeblock[0].'</div>';
 			array_push($languages, $codeblock[1]);
 		}

includes/MultiCodeBlock.php

@@ -1,12 +1,9 @@
 <?php
 require_once __DIR__ . '/vendor/autoload.php';
-require_once 'CustomOptions.php';
 
 require_once 'Description.php';
 require_once 'Code.php';
 
-use PHPHtmlParser\Dom;
-
 /**
  * Returns the DOM-Parser with custom options and the HTML-Tree
  * 
@@ -15,8 +12,13 @@
  * @return PHPHtmlParser\Dom The DOM-Element that has the HTML-Tree
  */
 function getDOM(&$content) {
-    $dom = new Dom();
-    $dom->loadStr($content, getOptions());
+    $dom = new DOMDocument();
+
+    $dom->validateOnParse = false;
+
+    libxml_use_internal_errors(true);
+    $dom->loadHTML($content);
+    libxml_clear_errors();
 
     return $dom;
 }
@@ -72,17 +74,15 @@ function replaceLang(string $lang) {
  * 
  * @return array The codeblock as the first element and the language as the second element.
  */
-function createCodeBlock(&$codevariant, &$code, &$description, Parser &$parser, \Highlight\Highlighter &$h1) {
-
-    $lang = $codevariant->getAttribute("lang");
+function createCodeBlock(&$code, &$description, $lang, Parser &$parser, \Highlight\Highlighter &$h1) {
     if($lang == null) {
         return array('<span style="color: red; font-size: 700;">No Lang Attribute</span>', 'No lang');
     }
 
     $lang = strtolower($lang);
 
     $code = new Code($code, $lang);
-    $desc = new Description(($description == null ? null : $description->innerHtml));
+    $desc = new Description($description);
     $highlight = $code->highlight($h1);
 
     $isObject = true;

includes/MultiCodeBlockBuilder.php

@@ -1,6 +1,5 @@
 {
     "require": {
-        "scrivo/highlight.php": "v9.18.1.6",
-        "paquettg/php-html-parser": "^3.1"
+        "scrivo/highlight.php": "v9.18.1.6"
     }
 }