Split config preparation code into a new function from htmldoc::minify().

Fixed variable existence bug in `index.php`.
Updated dependencies.

Author: hexydec

composer.json

@@ -16,8 +16,8 @@
     "require": {
         "php": ">=8.0",
 		"hexydec/tokenise": "1.0.1",
-		"hexydec/cssdoc": "1.1.0",
-		"hexydec/jslite": "1.0.0"
+		"hexydec/cssdoc": "1.1.1",
+		"hexydec/jslite": "1.0.1"
 	},
 	"autoload": {
 		"classmap": ["src/"]

composer.lock

@@ -1,5 +1,5 @@
 <?php
-require(__DIR__.'/vendor/autoload.php');
+require __DIR__.'/vendor/autoload.php';
 
 $error = null;
 \set_error_handler(function (int $type, string $msg) use (&$error) {
@@ -13,13 +13,13 @@
 $base = $_POST['base'] ?? null;
 $input = '';
 $output = '';
-$minify = Array();
-$timing = Array(
+$minify = [];
+$timing = [
 	'start' => \microtime(true)
-);
-$mem = Array(
+];
+$mem = [
 	'start' => \memory_get_peak_usage()
-);
+];
 
 // create object and retrieve config
 $doc = new hexydec\html\htmldoc();
@@ -132,7 +132,7 @@
 			.minify__form-error {
 				padding: 10px;
 				background: red;
-				font-weight bold;
+				font-weight: bold;
 				color: #FFF;
 				margin: 10px 10px 0 10px;
 			}
@@ -262,9 +262,11 @@
 					</table>
 				<?php } ?>
 			</div>
-			<?php if ($output) { ?>
-				<input type="hidden" name="base" value="<?= \htmlspecialchars($base); ?>" />
-				<iframe class="minify__preview" srcdoc="<?= \htmlspecialchars(\preg_replace('/<head[^>]*>/i', '$0<base href="'.\htmlspecialchars($base).'">', $output)); ?>"></iframe>
+			<?php if ($output) {
+				if ($base) { ?>
+					<input type="hidden" name="base" value="<?= \htmlspecialchars($base); ?>" />
+				<?php } ?>
+				<iframe class="minify__preview" srcdoc="<?= \htmlspecialchars($base === null ? $output : \preg_replace('/<head[^>]*>/i', '$0<base href="'.\htmlspecialchars($base).'">', $output)); ?>"></iframe>
 			<?php } ?>
 			<div class="minify__options">
 				<h3>Options</h3>

index.php

@@ -541,13 +541,29 @@ protected function collection(array $nodes) : htmldoc {
 	public function minify(array $minify = []) : void {
 
 		// merge config
-		$minify = \array_replace_recursive($this->config['minify'], $minify);
+		$minify = $this->getMinifyOptions($minify);
 
 		// set minify output parameters
 		if ($minify['quotes']) {
 			$this->config['output']['quotestyle'] = 'minimal';
 		}
 
+		// sort classes by occurence, then by string
+		if (!empty($minify['attributes']['sort']) && !empty($this->cache['attr'])) {
+			$minify['attributes']['sort'] = $this->sortAttributes($this->cache['attr'], $this->cache['attrvalues']);
+		}
+
+		// minify children
+		foreach ($this->children AS $item) {
+			$item->minify($minify);
+		}
+	}
+
+	protected function getMinifyOptions(array $minify) : array {
+
+		// merge config
+		$minify = \array_replace_recursive($this->config['minify'], $minify);
+
 		// set safe options
 		if ($minify['safe']) {
 			$minify['urls'] = false;
@@ -568,16 +584,7 @@ public function minify(array $minify = []) : void {
 			}
 			$minify['close'] = false;
 		}
-
-		// sort classes by occurence, then by string
-		if (!empty($minify['attributes']['sort']) && !empty($this->cache['attr'])) {
-			$minify['attributes']['sort'] = $this->sortAttributes($this->cache['attr'], $this->cache['attrvalues']);
-		}
-
-		// minify children
-		foreach ($this->children AS $item) {
-			$item->minify($minify);
-		}
+		return $minify;
 	}
 
 	/**