Simplifies implementation

composer.json

@@ -2,7 +2,7 @@
     "name":        "kenshodigital/kirby-xhtml",
     "description": "Ensures well-formed XML and XHTML output for Kirby templates.",
     "type":        "kirby-plugin",
-    "version":     "1.0.1",
+    "version":     "1.0.0",
     "homepage":    "https://github.com/kenshodigital/kirby-xhtml",
     "license":     "MIT",
     "authors":

index.php

@@ -1,15 +1,46 @@
-<?php declare(strict_types=1);
+<?php
+/**
+ * @noinspection PhpUnhandledExceptionInspection
+ */
+declare(strict_types=1);
 
 namespace Kenshō\XHTML;
 
 use DOMDocument;
 use Kirby\Cms\App;
 
+const XML = [
+    'htm',
+    'html',
+    'rss',
+    'xht',
+    'xhtml',
+    'xml',
+    'xsl',
+];
+const XHTML = [
+    'htm',
+    'html',
+    'xht',
+    'xhtml',
+];
 App::plugin('kensho/xhtml', [
     'hooks' => [
+        /**
+         * Ensures well-formed XML and XHTML
+         * output and strips whitespace between
+         * nodes.
+         */
         'page.render:after' => function (string $contentType, array $data, string $html): string {
-            if (\in_array($contentType, XMLProcessor::TYPES)) {
-                $html = (new XMLProcessor(new DOMDocument))->process($html);
+            if (\in_array($contentType, XML)) {
+                $document                     = new DOMDocument;
+                $document->preserveWhiteSpace = FALSE;
+                $document->loadXML($html);
+
+                if (\in_array($contentType, XHTML)) {
+                    App::instance()->response()->type('application/xhtml+xml');
+                }
+                return $document->saveXML();
             }
             return $html;
         },