refactor: replace trigger_error(E_USER_ERROR) with exceptions (PHP 8.4 compatibility) (#218)

lacatoire · lacatoire · web-flow · commit 7366bc9f2aa3 · 2026-01-09T02:09:58.000Z
Co-authored-by: lacatoire &lt;louis-arnaud.catoire@external.drivalia.com&gt;
diff --git a/phpdotnet/phd/Autoloader.php b/phpdotnet/phd/Autoloader.php
@@ -26,7 +26,7 @@ public static function autoload(string $name): void
 
                 return;
             }
-            trigger_error(vsprintf('Cannot find file for %s: %s', [$name, $file ?? $filename]), E_USER_ERROR);
+            throw new \Error(vsprintf('Cannot find file for %s: %s', [$name, $file ?? $filename]));
         }
     }
 
diff --git a/phpdotnet/phd/Format/Factory.php b/phpdotnet/phd/Format/Factory.php
@@ -49,7 +49,7 @@ public final function createFormat($format, ...$formatParams) {
              }
             return $obj;
         }
-        trigger_error("This format is not supported by this package", E_USER_ERROR);
+        throw new \Error('This format is not supported by this package');
     }
 
     public static final function createFactory($package) {
diff --git a/phpdotnet/phd/Options/Handler.php b/phpdotnet/phd/Options/Handler.php
@@ -184,10 +184,10 @@ public function option_d(string $k, mixed $v): array
     public function option_docbook(string $k, mixed $v): array
     {
         if (is_array($v)) {
-            trigger_error("Can only parse one file at a time", E_USER_ERROR);
+            throw new \Error('Can only parse one file at a time');
         }
         if (!file_exists($v) || is_dir($v) || !is_readable($v)) {
-            trigger_error(sprintf("'%s' is not a readable docbook file", $v), E_USER_ERROR);
+            throw new \Error(sprintf("'%s' is not a readable docbook file", $v));
         }
         return [
             'xmlRoot' => dirname($v),
@@ -209,19 +209,19 @@ public function option_o(string $k, mixed $v): array
     public function option_output(string $k, mixed $v): array
     {
         if (is_array($v)) {
-            trigger_error("Only a single output location can be supplied", E_USER_ERROR);
+            throw new \Error('Only a single output location can be supplied');
         }
         if (!file_exists($v)) {
             $this->outputHandler->v("Creating output directory..", VERBOSE_MESSAGES);
             if (!mkdir($v, 0777, true)) {
-                trigger_error(vsprintf("Can't create output directory : %s", [$v]), E_USER_ERROR);
+                throw new \Error(vsprintf("Can't create output directory : %s", [$v]));
             }
             $this->outputHandler->v("Output directory created", VERBOSE_MESSAGES);
         } elseif (!is_dir($v)) {
-            trigger_error("Output directory is a file?", E_USER_ERROR);
+            throw new \Error('Output directory is a file?');
         }
         if (!is_dir($v) || !is_readable($v)) {
-            trigger_error(sprintf("'%s' is not a valid directory", $v), E_USER_ERROR);
+            throw new \Error(sprintf("'%s' is not a valid directory", $v));
         }
         $v = (substr($v, strlen($v) - strlen(DIRECTORY_SEPARATOR)) === DIRECTORY_SEPARATOR) ? $v : ($v . DIRECTORY_SEPARATOR);
 
@@ -234,7 +234,7 @@ public function option_output(string $k, mixed $v): array
     public function option_outputfilename(string $k, mixed $v): array
     {
         if (is_array($v)) {
-            trigger_error("Only a single output location can be supplied", E_USER_ERROR);
+            throw new \Error('Only a single output location can be supplied');
         }
         $file = basename($v);
 
@@ -281,7 +281,7 @@ public function option_package(string $k, mixed $v): array
         foreach((array)$v as $package) {
             if (!in_array($package, $this->config->getSupportedPackages())) {
                 $supported = implode(', ', $this->config->getSupportedPackages());
-                trigger_error("Invalid Package (Tried: '$package' Supported: '$supported')", E_USER_ERROR);
+                throw new \Error("Invalid Package (Tried: '$package' Supported: '$supported')");
             }
         }
         return ['package' => (array) $v];
@@ -341,13 +341,13 @@ public function option_skip(string $k, mixed $v): array
     public function option_saveconfig(string $k, mixed $v): array
     {
         if (is_array($v)) {
-            trigger_error(sprintf("You cannot pass %s more than once", $k), E_USER_ERROR);
+            throw new \Error(sprintf('You cannot pass %s more than once', $k));
         }
 
         $val = is_bool($v) ? true : self::boolval($v);
 
         if (!is_bool($val)) {
-            trigger_error("yes/no || on/off || true/false || 1/0 expected", E_USER_ERROR);
+            throw new \Error('yes/no || on/off || true/false || 1/0 expected');
         }
 
         return ['saveConfig' => $val];
@@ -381,7 +381,7 @@ public function option_verbose(string $k, mixed $v): array
                     $verbose = max($verbose, 1);
                     $verbose <<= 1;
                 } else {
-                    trigger_error("Unknown option passed to --$k, '$const'", E_USER_ERROR);
+                    throw new \Error("Unknown option passed to --$k, '$const'");
                 }
             }
         }
@@ -438,11 +438,11 @@ public function option_c(string $k, mixed $v): array
     public function option_color(string $k, mixed $v): array
     {
         if (is_array($v)) {
-            trigger_error(sprintf("You cannot pass %s more than once", $k), E_USER_ERROR);
+            throw new \Error(sprintf('You cannot pass %s more than once', $k));
         }
         $val = self::boolval($v);
         if (!is_bool($val)) {
-            trigger_error("yes/no || on/off || true/false || 1/0 expected", E_USER_ERROR);
+            throw new \Error('yes/no || on/off || true/false || 1/0 expected');
         }
         return ['colorOutput' => $val];
     }
diff --git a/phpdotnet/phd/Options/Parser.php b/phpdotnet/phd/Options/Parser.php
@@ -80,11 +80,11 @@ private function validateOptions(): void {
             $checkArgv = explode('=', $argv[$i]);
             if (substr($checkArgv[0], 0, 2) === '--') {
                 if (!in_array(substr($checkArgv[0], 2), $long)) {
-                    trigger_error('Invalid long option ' . $argv[$i], E_USER_ERROR);
+                    throw new \Error('Invalid long option ' . $argv[$i]);
                 }
             } elseif (substr($checkArgv[0], 0, 1) === '-') {
                 if (!in_array(substr($checkArgv[0], 1), $short)) {
-                    trigger_error('Invalid short option ' . $argv[$i], E_USER_ERROR);
+                    throw new \Error('Invalid short option ' . $argv[$i]);
                 }
            }
         }
@@ -98,15 +98,15 @@ public function getopt(): array {
 
         $args = getopt($this->getShortOptions(), $this->getLongOptions());
         if ($args === false) {
-            trigger_error("Something happend with getopt(), please report a bug", E_USER_ERROR);
+            throw new \Error('Something happend with getopt(), please report a bug');
         }
 
         $parsedOptions = [];
         foreach ($args as $k => $v) {
             $handler = $this->handlerForOption($k);
 
             if (!is_callable($handler)) {
-                trigger_error("Hmh, something weird has happend, I don't know this option", E_USER_ERROR);
+                throw new \Error("Hmh, something weird has happend, I don't know this option");
             }
 
             $retVal = call_user_func($handler, $k, $v);
diff --git a/phpdotnet/phd/Package/Generic/ChunkedXHTML.php b/phpdotnet/phd/Package/Generic/ChunkedXHTML.php
@@ -77,11 +77,11 @@ public function update($event, $value = null) {
             $this->postConstruct();
             if (file_exists($this->getOutputDir())) {
                 if (!is_dir($this->getOutputDir())) {
-                    trigger_error("Output directory is a file?", E_USER_ERROR);
+                    throw new \Error('Output directory is a file?');
                 }
             } else {
                 if (!mkdir($this->getOutputDir(), 0777, true)) {
-                    trigger_error("Can't create output directory", E_USER_ERROR);
+                    throw new \Error("Can't create output directory");
                 }
             }
             if ($this->config->css) {
diff --git a/phpdotnet/phd/Package/Generic/Manpage.php b/phpdotnet/phd/Package/Generic/Manpage.php
@@ -316,11 +316,11 @@ public function update($event, $value = null) {
             $this->setOutputDir($this->config->outputDir . strtolower($this->toValidName($this->getFormatName())) . '/');
             if (file_exists($this->getOutputDir())) {
                 if (!is_dir($this->getOutputDir())) {
-                    trigger_error("Output directory is a file?", E_USER_ERROR);
+                    throw new \Error('Output directory is a file?');
                 }
             } else {
                 if (!mkdir($this->getOutputDir(), 0777, true)) {
-                    trigger_error("Can't create output directory", E_USER_ERROR);
+                    throw new \Error("Can't create output directory");
                 }
             }
             break;
diff --git a/phpdotnet/phd/Package/Generic/TocFeed.php b/phpdotnet/phd/Package/Generic/TocFeed.php
@@ -224,11 +224,11 @@ public function update($event, $value = null)
             $dir = $this->getOutputDir();
             if (file_exists($dir)) {
                 if (!is_dir($dir)) {
-                    trigger_error("Output directory is a file?", E_USER_ERROR);
+                    throw new \Error('Output directory is a file?');
                 }
             } else {
                 if (!mkdir($dir, 0777, true)) {
-                    trigger_error("Can't create output directory", E_USER_ERROR);
+                    throw new \Error("Can't create output directory");
                 }
             }
             break;
diff --git a/phpdotnet/phd/Package/Generic/XHTML.php b/phpdotnet/phd/Package/Generic/XHTML.php
@@ -678,11 +678,11 @@ protected function fetchStylesheet($name = null) {
         $stylesDir .= 'styles/';
         if (file_exists($stylesDir)) {
             if (!is_dir($stylesDir)) {
-                trigger_error("The styles/ directory is a file?", E_USER_ERROR);
+                throw new \Error('The styles/ directory is a file?');
             }
         } else {
             if (!mkdir($stylesDir, 0777, true)) {
-                trigger_error("Can't create the styles/ directory.", E_USER_ERROR);
+                throw new \Error("Can't create the styles/ directory.");
             }
         }
         foreach ((array)$this->config->css as $css) {
diff --git a/phpdotnet/phd/Package/IDE/API.php b/phpdotnet/phd/Package/IDE/API.php
@@ -72,10 +72,10 @@ public function __construct($dir)
                         : $dir . DIRECTORY_SEPARATOR;
                 $this->funclist = file($this->dir . self::FUNCLIST_FILE, FILE_IGNORE_NEW_LINES);
             } else {
-                trigger_error('Is the PhD output directory a file?', E_USER_ERROR);
+                throw new \Error('Is the PhD output directory a file?');
             }
         } else {
-            trigger_error('The PhD output directory does not exist.', E_USER_ERROR);
+            throw new \Error('The PhD output directory does not exist.');
         }
     }
 
diff --git a/phpdotnet/phd/Package/IDE/Base.php b/phpdotnet/phd/Package/IDE/Base.php
@@ -215,19 +215,19 @@ public function loadVersionInfo() {
         if (file_exists($this->config->phpwebVersionFilename)) {
             $this->versions = self::generateVersionInfo($this->config->phpwebVersionFilename);
         } else {
-            trigger_error("Can't load the versions file", E_USER_ERROR);
+            throw new \Error("Can't load the versions file");
         }
     }
 
     public function createOutputDirectory() {
         $this->setOutputDir($this->config->outputDir . strtolower($this->getFormatName()) . '/');
         if (file_exists($this->getOutputDir())) {
             if (!is_dir($this->getOutputDir())) {
-                trigger_error("Output directory is a file?", E_USER_ERROR);
+                throw new \Error('Output directory is a file?');
             }
         } else {
             if (!mkdir($this->getOutputDir(), 0777, true)) {
-                trigger_error("Can't create output directory", E_USER_ERROR);
+                throw new \Error("Can't create output directory");
             }
         }
     }
diff --git a/phpdotnet/phd/Package/IDE/demo.php b/phpdotnet/phd/Package/IDE/demo.php
@@ -64,21 +64,21 @@ function usage()
     case 'd':
     case 'dir':
         if (is_array($v)) {
-            trigger_error('Is not possible to pass the --dir option more then once', E_USER_ERROR);
+            throw new \Error('Is not possible to pass the --dir option more then once');
         }
         $OPTION['dir'] = $v;
         break;
     case 'f':
     case 'function':
         if (is_array($v)) {
-            trigger_error('Is not possible to pass the --function option more then once', E_USER_ERROR);
+            throw new \Error('Is not possible to pass the --function option more then once');
         }
         $OPTION['function'] = $v;
         break;
     case 'c':
     case 'class':
         if (is_array($v)) {
-            trigger_error('Is not possible to pass the --class option more then once', E_USER_ERROR);
+            throw new \Error('Is not possible to pass the --class option more then once');
         }
         $OPTION['class'] = $v;
         break;
@@ -107,7 +107,7 @@ function usage()
         $OPTION['help'] = true;
         break;
     default:
-        trigger_error('Invalid Option: ' . $k, E_USER_ERROR);
+        throw new \Error('Invalid Option: ' . $k);
     }
 }
 
@@ -117,19 +117,19 @@ function usage()
 }
 
 if ($OPTION['dir'] == NULL) {
-    trigger_error('You must specify the PhD output directory with the --dir option.', E_USER_ERROR);
+    throw new \Error('You must specify the PhD output directory with the --dir option.');
 }
 
 if ($OPTION['function'] == NULL && $OPTION['class'] == NULL) {
-    trigger_error('You must pass either --class or --function options.', E_USER_ERROR);
+    throw new \Error('You must pass either --class or --function options.');
 }
 
 $api = new PhD\Package_IDE_API($OPTION['dir']);
 
 if ($OPTION['class'] != NULL) {
     $methods = $api->getMethodsByClass($OPTION['class']);
     if ($methods == NULL) {
-        trigger_error('Invalid Class name: ' . $OPTION['class'], E_USER_ERROR);
+        throw new \Error('Invalid Class name: ' . $OPTION['class']);
     }
     foreach ($methods as $method) {
         echo $method . PHP_EOL;
@@ -140,7 +140,7 @@ function usage()
 $function = $api->getFunctionByName($OPTION['function']);
 
 if ($function == NULL) {
-    trigger_error('Invalid Function: ' . $OPTION['function'], E_USER_ERROR);
+    throw new \Error('Invalid Function: ' . $OPTION['function']);
 }
 
 if ($OPTION['signature'] === true) {
diff --git a/phpdotnet/phd/Package/PEAR/ChunkedXHTML.php b/phpdotnet/phd/Package/PEAR/ChunkedXHTML.php
@@ -80,11 +80,11 @@ public function update($event, $value = null) {
             $this->postConstruct();
             if (file_exists($this->getOutputDir())) {
                 if (!is_dir($this->getOutputDir())) {
-                    trigger_error("Output directory is a file?", E_USER_ERROR);
+                    throw new \Error('Output directory is a file?');
                 }
             } else {
                 if (!mkdir($this->getOutputDir(), 0777, true)) {
-                    trigger_error("Can't create output directory", E_USER_ERROR);
+                    throw new \Error("Can't create output directory");
                 }
             }
             if ($this->config->css) {
diff --git a/phpdotnet/phd/Package/PHP/ChunkedXHTML.php b/phpdotnet/phd/Package/PHP/ChunkedXHTML.php
@@ -241,12 +241,12 @@ private function mkdir(string $dir): void
     {
         if (file_exists($dir)) {
             if (!is_dir($dir)) {
-                trigger_error("The specified directory is a file: {$dir}", E_USER_ERROR);
+                throw new \Error("The specified directory is a file: {$dir}");
             }
             return;
         }
         if (!mkdir($dir, 0777, true)) {
-            trigger_error("Can't create the specified directory: {$dir}", E_USER_ERROR);
+            throw new \Error("Can't create the specified directory: {$dir}");
         }
     }
 
diff --git a/phpdotnet/phd/Package/PHP/EnhancedCHM.php b/phpdotnet/phd/Package/PHP/EnhancedCHM.php
@@ -26,15 +26,20 @@ public function update($event, $value = null) {
             // Use %TEMP%/usernotes as base directory for Usernotes.
             $temp = sys_get_temp_dir();
             if (!$temp || !is_dir($temp)) {
-                trigger_error('Unable to locate the systems temporary system directory for EnhancedCHM.', E_USER_ERROR);
+                throw new \Error('Unable to locate the systems temporary system directory for EnhancedCHM.');
                 break;
             }
 
             $this->userNotesBaseDir = $temp . DIRECTORY_SEPARATOR . 'usernotes' . DIRECTORY_SEPARATOR;
 
             // Make the usernotes directory.
-            if(!file_exists($this->userNotesBaseDir) || is_file($this->userNotesBaseDir)) {
-                mkdir($this->userNotesBaseDir, 0777, true) or trigger_error(vsprintf("Can't create the usernotes directory : %s", [$this->userNotesBaseDir]), E_USER_ERROR);
+            if (!file_exists($this->userNotesBaseDir) || is_file($this->userNotesBaseDir)) {
+                if (!mkdir($this->userNotesBaseDir, 0777, true)) {
+                    throw new \RuntimeException(sprintf(
+                        "Can't create the usernotes directory: %s",
+                        $this->userNotesBaseDir
+                    ));
+                }
             }
 
             // Get the local last-updated value.
@@ -54,7 +59,7 @@ public function update($event, $value = null) {
                 }
 
                 if (!extension_loaded('bz2')) {
-                    trigger_error('The BZip2 extension is not available.', E_USER_ERROR);
+                    throw new \Error('The BZip2 extension is not available.');
                     break;
                 }
 
@@ -65,7 +70,7 @@ public function update($event, $value = null) {
 
                 // Use a decompression stream filter to save having to store anything locally other than the expanded user notes.
                 if (false === ($fpNotes = fopen('http://www.php.net/backend/notes/all.bz2', 'rb'))) {
-                    trigger_error('Failed to access the usernotes archive.', E_USER_ERROR);
+                    throw new \Error('Failed to access the usernotes archive.');
                     break;
                 }
 
diff --git a/phpdotnet/phd/Package/PHP/HowTo.php b/phpdotnet/phd/Package/PHP/HowTo.php
@@ -28,11 +28,11 @@ public function update($event, $value = null) {
             $this->postConstruct();
             if (file_exists($this->getOutputDir())) {
                 if (!is_dir($this->getOutputDir())) {
-                    trigger_error("Output directory is a file?", E_USER_ERROR);
+                    throw new \Error('Output directory is a file?');
                 }
             } else {
                 if (!mkdir($this->getOutputDir(), 0777, true)) {
-                    trigger_error("Can't create output directory", E_USER_ERROR);
+                    throw new \Error("Can't create output directory");
                 }
             }
             break;
diff --git a/phpdotnet/phd/Package/PHP/Web.php b/phpdotnet/phd/Package/PHP/Web.php
diff --git a/phpdotnet/phd/Package/PHP/XHTML.php b/phpdotnet/phd/Package/PHP/XHTML.php
diff --git a/render.php b/render.php

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public static function autoload(string $name): void`
`26`	`26`
`27`	`27`	`return;`
`28`	`28`	`}`
`29`		`- trigger_error(vsprintf('Cannot find file for %s: %s', [$name, $file ?? $filename]), E_USER_ERROR);`
	`29`	`+ throw new \Error(vsprintf('Cannot find file for %s: %s', [$name, $file ?? $filename]));`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public final function createFormat($format, ...$formatParams) {`
`49`	`49`	`}`
`50`	`50`	`return $obj;`
`51`	`51`	`}`
`52`		`- trigger_error("This format is not supported by this package", E_USER_ERROR);`
	`52`	`+ throw new \Error('This format is not supported by this package');`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public static final function createFactory($package) {`
Original file line number	Diff line number	Diff line change
`@@ -184,10 +184,10 @@ public function option_d(string $k, mixed $v): array`
`184`	`184`	`public function option_docbook(string $k, mixed $v): array`
`185`	`185`	`{`
`186`	`186`	`if (is_array($v)) {`
`187`		`- trigger_error("Can only parse one file at a time", E_USER_ERROR);`
	`187`	`+ throw new \Error('Can only parse one file at a time');`
`188`	`188`	`}`
`189`	`189`	`if (!file_exists($v) \|\| is_dir($v) \|\| !is_readable($v)) {`
`190`		`- trigger_error(sprintf("'%s' is not a readable docbook file", $v), E_USER_ERROR);`
	`190`	`+ throw new \Error(sprintf("'%s' is not a readable docbook file", $v));`
`191`	`191`	`}`
`192`	`192`	`return [`
`193`	`193`	`'xmlRoot' => dirname($v),`
`@@ -209,19 +209,19 @@ public function option_o(string $k, mixed $v): array`
`209`	`209`	`public function option_output(string $k, mixed $v): array`
`210`	`210`	`{`
`211`	`211`	`if (is_array($v)) {`
`212`		`- trigger_error("Only a single output location can be supplied", E_USER_ERROR);`
	`212`	`+ throw new \Error('Only a single output location can be supplied');`
`213`	`213`	`}`
`214`	`214`	`if (!file_exists($v)) {`
`215`	`215`	`$this->outputHandler->v("Creating output directory..", VERBOSE_MESSAGES);`
`216`	`216`	`if (!mkdir($v, 0777, true)) {`
`217`		`- trigger_error(vsprintf("Can't create output directory : %s", [$v]), E_USER_ERROR);`
	`217`	`+ throw new \Error(vsprintf("Can't create output directory : %s", [$v]));`
`218`	`218`	`}`
`219`	`219`	`$this->outputHandler->v("Output directory created", VERBOSE_MESSAGES);`
`220`	`220`	`} elseif (!is_dir($v)) {`
`221`		`- trigger_error("Output directory is a file?", E_USER_ERROR);`
	`221`	`+ throw new \Error('Output directory is a file?');`
`222`	`222`	`}`
`223`	`223`	`if (!is_dir($v) \|\| !is_readable($v)) {`
`224`		`- trigger_error(sprintf("'%s' is not a valid directory", $v), E_USER_ERROR);`
	`224`	`+ throw new \Error(sprintf("'%s' is not a valid directory", $v));`
`225`	`225`	`}`
`226`	`226`	`$v = (substr($v, strlen($v) - strlen(DIRECTORY_SEPARATOR)) === DIRECTORY_SEPARATOR) ? $v : ($v . DIRECTORY_SEPARATOR);`
`227`	`227`
`@@ -234,7 +234,7 @@ public function option_output(string $k, mixed $v): array`
`234`	`234`	`public function option_outputfilename(string $k, mixed $v): array`
`235`	`235`	`{`
`236`	`236`	`if (is_array($v)) {`
`237`		`- trigger_error("Only a single output location can be supplied", E_USER_ERROR);`
	`237`	`+ throw new \Error('Only a single output location can be supplied');`
`238`	`238`	`}`
`239`	`239`	`$file = basename($v);`
`240`	`240`
`@@ -281,7 +281,7 @@ public function option_package(string $k, mixed $v): array`
`281`	`281`	`foreach((array)$v as $package) {`
`282`	`282`	`if (!in_array($package, $this->config->getSupportedPackages())) {`
`283`	`283`	`$supported = implode(', ', $this->config->getSupportedPackages());`
`284`		`- trigger_error("Invalid Package (Tried: '$package' Supported: '$supported')", E_USER_ERROR);`
	`284`	`+ throw new \Error("Invalid Package (Tried: '$package' Supported: '$supported')");`
`285`	`285`	`}`
`286`	`286`	`}`
`287`	`287`	`return ['package' => (array) $v];`
`@@ -341,13 +341,13 @@ public function option_skip(string $k, mixed $v): array`
`341`	`341`	`public function option_saveconfig(string $k, mixed $v): array`
`342`	`342`	`{`
`343`	`343`	`if (is_array($v)) {`
`344`		`- trigger_error(sprintf("You cannot pass %s more than once", $k), E_USER_ERROR);`
	`344`	`+ throw new \Error(sprintf('You cannot pass %s more than once', $k));`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`$val = is_bool($v) ? true : self::boolval($v);`
`348`	`348`
`349`	`349`	`if (!is_bool($val)) {`
`350`		`- trigger_error("yes/no \|\| on/off \|\| true/false \|\| 1/0 expected", E_USER_ERROR);`
	`350`	`+ throw new \Error('yes/no \|\| on/off \|\| true/false \|\| 1/0 expected');`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`return ['saveConfig' => $val];`
`@@ -381,7 +381,7 @@ public function option_verbose(string $k, mixed $v): array`
`381`	`381`	`$verbose = max($verbose, 1);`
`382`	`382`	`$verbose <<= 1;`
`383`	`383`	`} else {`
`384`		`- trigger_error("Unknown option passed to --$k, '$const'", E_USER_ERROR);`
	`384`	`+ throw new \Error("Unknown option passed to --$k, '$const'");`
`385`	`385`	`}`
`386`	`386`	`}`
`387`	`387`	`}`
`@@ -438,11 +438,11 @@ public function option_c(string $k, mixed $v): array`
`438`	`438`	`public function option_color(string $k, mixed $v): array`
`439`	`439`	`{`
`440`	`440`	`if (is_array($v)) {`
`441`		`- trigger_error(sprintf("You cannot pass %s more than once", $k), E_USER_ERROR);`
	`441`	`+ throw new \Error(sprintf('You cannot pass %s more than once', $k));`
`442`	`442`	`}`
`443`	`443`	`$val = self::boolval($v);`
`444`	`444`	`if (!is_bool($val)) {`
`445`		`- trigger_error("yes/no \|\| on/off \|\| true/false \|\| 1/0 expected", E_USER_ERROR);`
	`445`	`+ throw new \Error('yes/no \|\| on/off \|\| true/false \|\| 1/0 expected');`
`446`	`446`	`}`
`447`	`447`	`return ['colorOutput' => $val];`
`448`	`448`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,11 +80,11 @@ private function validateOptions(): void {`
`80`	`80`	`$checkArgv = explode('=', $argv[$i]);`
`81`	`81`	`if (substr($checkArgv[0], 0, 2) === '--') {`
`82`	`82`	`if (!in_array(substr($checkArgv[0], 2), $long)) {`
`83`		`- trigger_error('Invalid long option ' . $argv[$i], E_USER_ERROR);`
	`83`	`+ throw new \Error('Invalid long option ' . $argv[$i]);`
`84`	`84`	`}`
`85`	`85`	`} elseif (substr($checkArgv[0], 0, 1) === '-') {`
`86`	`86`	`if (!in_array(substr($checkArgv[0], 1), $short)) {`
`87`		`- trigger_error('Invalid short option ' . $argv[$i], E_USER_ERROR);`
	`87`	`+ throw new \Error('Invalid short option ' . $argv[$i]);`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`	`}`
`@@ -98,15 +98,15 @@ public function getopt(): array {`
`98`	`98`
`99`	`99`	`$args = getopt($this->getShortOptions(), $this->getLongOptions());`
`100`	`100`	`if ($args === false) {`
`101`		`- trigger_error("Something happend with getopt(), please report a bug", E_USER_ERROR);`
	`101`	`+ throw new \Error('Something happend with getopt(), please report a bug');`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`$parsedOptions = [];`
`105`	`105`	`foreach ($args as $k => $v) {`
`106`	`106`	`$handler = $this->handlerForOption($k);`
`107`	`107`
`108`	`108`	`if (!is_callable($handler)) {`
`109`		`- trigger_error("Hmh, something weird has happend, I don't know this option", E_USER_ERROR);`
	`109`	`+ throw new \Error("Hmh, something weird has happend, I don't know this option");`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`$retVal = call_user_func($handler, $k, $v);`
Original file line number	Diff line number	Diff line change
`@@ -77,11 +77,11 @@ public function update($event, $value = null) {`
`77`	`77`	`$this->postConstruct();`
`78`	`78`	`if (file_exists($this->getOutputDir())) {`
`79`	`79`	`if (!is_dir($this->getOutputDir())) {`
`80`		`- trigger_error("Output directory is a file?", E_USER_ERROR);`
	`80`	`+ throw new \Error('Output directory is a file?');`
`81`	`81`	`}`
`82`	`82`	`} else {`
`83`	`83`	`if (!mkdir($this->getOutputDir(), 0777, true)) {`
`84`		`- trigger_error("Can't create output directory", E_USER_ERROR);`
	`84`	`+ throw new \Error("Can't create output directory");`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`if ($this->config->css) {`
Original file line number	Diff line number	Diff line change
`@@ -316,11 +316,11 @@ public function update($event, $value = null) {`
`316`	`316`	`$this->setOutputDir($this->config->outputDir . strtolower($this->toValidName($this->getFormatName())) . '/');`
`317`	`317`	`if (file_exists($this->getOutputDir())) {`
`318`	`318`	`if (!is_dir($this->getOutputDir())) {`
`319`		`- trigger_error("Output directory is a file?", E_USER_ERROR);`
	`319`	`+ throw new \Error('Output directory is a file?');`
`320`	`320`	`}`
`321`	`321`	`} else {`
`322`	`322`	`if (!mkdir($this->getOutputDir(), 0777, true)) {`
`323`		`- trigger_error("Can't create output directory", E_USER_ERROR);`
	`323`	`+ throw new \Error("Can't create output directory");`
`324`	`324`	`}`
`325`	`325`	`}`
`326`	`326`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -224,11 +224,11 @@ public function update($event, $value = null)`
`224`	`224`	`$dir = $this->getOutputDir();`
`225`	`225`	`if (file_exists($dir)) {`
`226`	`226`	`if (!is_dir($dir)) {`
`227`		`- trigger_error("Output directory is a file?", E_USER_ERROR);`
	`227`	`+ throw new \Error('Output directory is a file?');`
`228`	`228`	`}`
`229`	`229`	`} else {`
`230`	`230`	`if (!mkdir($dir, 0777, true)) {`
`231`		`- trigger_error("Can't create output directory", E_USER_ERROR);`
	`231`	`+ throw new \Error("Can't create output directory");`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -678,11 +678,11 @@ protected function fetchStylesheet($name = null) {`
`678`	`678`	`$stylesDir .= 'styles/';`
`679`	`679`	`if (file_exists($stylesDir)) {`
`680`	`680`	`if (!is_dir($stylesDir)) {`
`681`		`- trigger_error("The styles/ directory is a file?", E_USER_ERROR);`
	`681`	`+ throw new \Error('The styles/ directory is a file?');`
`682`	`682`	`}`
`683`	`683`	`} else {`
`684`	`684`	`if (!mkdir($stylesDir, 0777, true)) {`
`685`		`- trigger_error("Can't create the styles/ directory.", E_USER_ERROR);`
	`685`	`+ throw new \Error("Can't create the styles/ directory.");`
`686`	`686`	`}`
`687`	`687`	`}`
`688`	`688`	`foreach ((array)$this->config->css as $css) {`
Original file line number	Diff line number	Diff line change
`@@ -72,10 +72,10 @@ public function __construct($dir)`
`72`	`72`	`: $dir . DIRECTORY_SEPARATOR;`
`73`	`73`	`$this->funclist = file($this->dir . self::FUNCLIST_FILE, FILE_IGNORE_NEW_LINES);`
`74`	`74`	`} else {`
`75`		`- trigger_error('Is the PhD output directory a file?', E_USER_ERROR);`
	`75`	`+ throw new \Error('Is the PhD output directory a file?');`
`76`	`76`	`}`
`77`	`77`	`} else {`
`78`		`- trigger_error('The PhD output directory does not exist.', E_USER_ERROR);`
	`78`	`+ throw new \Error('The PhD output directory does not exist.');`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -215,19 +215,19 @@ public function loadVersionInfo() {`
`215`	`215`	`if (file_exists($this->config->phpwebVersionFilename)) {`
`216`	`216`	`$this->versions = self::generateVersionInfo($this->config->phpwebVersionFilename);`
`217`	`217`	`} else {`
`218`		`- trigger_error("Can't load the versions file", E_USER_ERROR);`
	`218`	`+ throw new \Error("Can't load the versions file");`
`219`	`219`	`}`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`public function createOutputDirectory() {`
`223`	`223`	`$this->setOutputDir($this->config->outputDir . strtolower($this->getFormatName()) . '/');`
`224`	`224`	`if (file_exists($this->getOutputDir())) {`
`225`	`225`	`if (!is_dir($this->getOutputDir())) {`
`226`		`- trigger_error("Output directory is a file?", E_USER_ERROR);`
	`226`	`+ throw new \Error('Output directory is a file?');`
`227`	`227`	`}`
`228`	`228`	`} else {`
`229`	`229`	`if (!mkdir($this->getOutputDir(), 0777, true)) {`
`230`		`- trigger_error("Can't create output directory", E_USER_ERROR);`
	`230`	`+ throw new \Error("Can't create output directory");`
`231`	`231`	`}`
`232`	`232`	`}`
`233`	`233`	`}`