diff --git a/include/errors/class_FatalError.inc b/include/errors/class_FatalError.inc index ae4841c20a62a668033f13cdc49dec42975b264d..0949cc13c908127c2f07a01e01826a36bb76459e 100755 --- a/include/errors/class_FatalError.inc +++ b/include/errors/class_FatalError.inc @@ -29,7 +29,6 @@ class FatalError extends Error public function __construct (string $htmlMessage = '', int $code = 0, Throwable $previous = NULL) { $this->htmlMessage = $htmlMessage; - parent::__construct(htmlunescape(strip_tags($htmlMessage)), $code, $previous); } public function getHtmlMessage () diff --git a/include/errors/class_FusionDirectoryError.inc b/include/errors/class_FusionDirectoryError.inc index 6a694270da7afdd18986b59391aae014f42a75b9..ba0bcf2d8b9cd331f8b2b5787428733f21f53ac3 100755 --- a/include/errors/class_FusionDirectoryError.inc +++ b/include/errors/class_FusionDirectoryError.inc @@ -28,7 +28,6 @@ class FusionDirectoryError extends Error public function __construct (string $htmlMessage = '', int $code = 0, Throwable $previous = NULL) { $this->htmlMessage = $htmlMessage; - parent::__construct(htmlunescape(strip_tags($htmlMessage)), $code, $previous); } public function getHtmlMessage () @@ -39,14 +38,14 @@ class FusionDirectoryError extends Error public function toArray (): array { return [ - 'class' => get_class($this), + 'class' => static::class, 'message' => $this->getMessage(), 'line' => $this->getLine(), 'file' => $this->getFile(), ]; } - public function __toString () + public function __toString (): string { return $this->getMessage(); } diff --git a/include/errors/class_SimplePluginError.inc b/include/errors/class_SimplePluginError.inc index a2d8ef1efde4f16bddecf62effea80830d499b1a..f93ed77eda54fa0c2f814ba2ef07324e0cd88c88 100755 --- a/include/errors/class_SimplePluginError.inc +++ b/include/errors/class_SimplePluginError.inc @@ -21,7 +21,7 @@ /*! \class SimplePluginError \brief Error returned by any method of SimplePlugin */ -class SimplePluginError extends FusionDirectoryError +class SimplePluginError extends FusionDirectoryError implements \Stringable { protected $object; protected $tab; @@ -49,7 +49,7 @@ class SimplePluginError extends FusionDirectoryError $this->tab = NULL; $this->object = $origin; } elseif ($origin !== NULL) { - trigger_error('Invalid origin of class '.get_class($origin)); + trigger_error('Invalid origin of class '.$origin::class); } } if (!$this->object instanceof simpleTabs) { @@ -66,7 +66,7 @@ class SimplePluginError extends FusionDirectoryError } if (isset($this->tab)) { - $array['tab'] = get_class($this->tab); + $array['tab'] = $this->tab::class; } if (isset($this->attribute)) { @@ -76,7 +76,7 @@ class SimplePluginError extends FusionDirectoryError return $array; } - public function __toString () + public function __toString (): string { $msg = ''; @@ -84,8 +84,8 @@ class SimplePluginError extends FusionDirectoryError $msg .= $this->object->dn.' > '; } - if (isset($this->tab) && isset($this->tab->parent->by_name[get_class($this->tab)])) { - $msg .= $this->tab->parent->by_name[get_class($this->tab)].' > '; + if (isset($this->tab) && isset($this->tab->parent->by_name[$this->tab::class])) { + $msg .= $this->tab->parent->by_name[$this->tab::class].' > '; } if (isset($this->attribute)) { @@ -110,8 +110,8 @@ class SimplePluginError extends FusionDirectoryError $breadcrumbs[] = htmlescape($this->object->dn); } - if (isset($this->tab) && isset($this->tab->parent->by_name[get_class($this->tab)])) { - $breadcrumbs[] = htmlescape($this->tab->parent->by_name[get_class($this->tab)]); + if (isset($this->tab) && isset($this->tab->parent->by_name[$this->tab::class])) { + $breadcrumbs[] = htmlescape($this->tab->parent->by_name[$this->tab::class]); } if (isset($this->attribute)) { diff --git a/include/errors/class_SimplePluginHookError.inc b/include/errors/class_SimplePluginHookError.inc index c7a693a27d3a7901da258b2957d134a17d736a69..7df540ab71a0ba2d04193112ca247299a1e0d16b 100755 --- a/include/errors/class_SimplePluginHookError.inc +++ b/include/errors/class_SimplePluginHookError.inc @@ -50,8 +50,8 @@ class SimplePluginHookError extends SimplePluginError $html .= htmlescape($this->object->dn.' > '); } - if (isset($this->tab) && isset($this->tab->parent->by_name[get_class($this->tab)])) { - $html .= htmlescape($this->tab->parent->by_name[get_class($this->tab)].' > '); + if (isset($this->tab) && isset($this->tab->parent->by_name[$this->tab::class])) { + $html .= htmlescape($this->tab->parent->by_name[$this->tab::class].' > '); } if (isset($this->attribute)) { diff --git a/include/errors/class_SimplePluginLdapError.inc b/include/errors/class_SimplePluginLdapError.inc index 5f05144f6b649f6dba38f4e39762cdf7dfff9c80..f73389ee47ae1bf6ea06f90295020615b94550cb 100755 --- a/include/errors/class_SimplePluginLdapError.inc +++ b/include/errors/class_SimplePluginLdapError.inc @@ -57,8 +57,8 @@ class SimplePluginLdapError extends SimplePluginError $html .= htmlescape($this->object->dn.' > '); } - if (isset($this->tab) && isset($this->tab->parent->by_name[get_class($this->tab)])) { - $html .= htmlescape($this->tab->parent->by_name[get_class($this->tab)].' > '); + if (isset($this->tab) && isset($this->tab->parent->by_name[$this->tab::class])) { + $html .= htmlescape($this->tab->parent->by_name[$this->tab::class].' > '); } if (isset($this->attribute)) {