$this->resetUniqueID();
} elseif ((defined('DEBUG_DESTRUCTOR')) && (is_object($this->getDebugInstance()))) {
// Already destructed object
- $this->getDebugInstance()->output(sprintf("[%s:] The object <strong>%s</strong> is already destroyed.",
+ $this->debugOutput(sprintf("[%s:] The object <strong>%s</strong> is already destroyed.",
__CLASS__, $this->__toString()
));
}
}
// Output stub message
- $this->getDebugInstance()->output(sprintf("[%s->%s] Stub! Args: %s",
+ $this->debugOutput(sprintf("[%s->%s] Stub! Args: %s",
$this->__toString(),
$methodName,
$argsString
* @return $dbInstance The database layer instance
*/
public final function getDatabaseInstance () {
+ // Default is invalid db instance
+ $dbInstance = null;
+
+ // Is the registry there and initialized?
if ((class_exists('Registry')) && (Registry::isInitialized() === true)) {
- return Registry::getRegistry()->getInstance('dbInstance');
- } else {
- return null;
- }
+ $dbInstance = Registry::getRegistry()->getInstance('dbInstance');
+ } // END - if
+
+ // Return instance
+ return $dbInstance;
}
/**
* @return $objectDescription The description of this simulation part
*/
public final function getObjectDescription () {
- if (isset($this->objectDescription)) {
- return $this->objectDescription;
- } else {
- return null;
- }
+ return $this->objectDescription;
}
/**
/**
* Compare if both simulation part description and class name matches
- * (shall be enougth)
+ * (shall be enough)
*
* @param $itemInstance An object instance to an other class
* @return boolean The result of comparing class name simulation part description
if (is_null($appInstance)) {
// Thrown an exception
throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
- }
- }
+ } // END - if
+ } // END - if
// Generate FQFN for all application templates
$fqfn = sprintf("%s%s/%s/%s",
* @return void
*/
public final function debugInstance () {
+ // Restore the error handler to avoid trouble with missing array elements or undeclared variables
+ restore_error_handler();
+
// Generate the output
$content = sprintf("<pre>%s</pre>",
- trim(print_r($this, true))
+ trim(
+ htmlentities(
+ print_r($this, true)
+ )
+ )
);
// Output it
- ApplicationEntryPoint::app_die(sprintf("<strong>%s debug output:</strong><div id=\"debug_content\">%s</div>Loaded includes: <div id=\"debug_include_list\">%s</div>",
+ ApplicationEntryPoint::app_die(sprintf("<strong>%s debug output:</strong><div id=\"debug_content\">%s</div>\nLoaded includes: <div id=\"debug_include_list\">%s</div>",
$this->__toString(),
$content,
ClassLoader::getInstance()->getPrintableIncludeList()
$methodName = "UnknownClass->unknownMethod";
if ((isset($backtrace[1]['class'])) && (isset($backtrace[1]['function']))) {
$methodName = $backtrace[1]['class']."->".$backtrace[1]['function'];
- }
+ } // END - if
// Construct the full message
$stubMessage = sprintf("[%s:] Partial stub!",
if (!empty($message)) {
// Then add it as well
$stubMessage .= sprintf(" Message: <span id=\"stub_message\">%s</span>", $message);
- }
+ } // END - if
// Debug instance is there?
if (!is_null($this->getDebugInstance())) {
// Output stub message
- $this->getDebugInstance()->output($stubMessage);
+ $this->debugOutput($stubMessage);
} else {
// Trigger an error
trigger_error($stubMessage."<br />\n");
* Outputs a debug message wether to debug instance (should be set!) or dies with or pints the message
*
* @param $message Message we shall send out...
- * @param $doPrint Wether we shall print or die here which last is the default
+ * @param $doPrint Wether we shall print or die here which first is the default
* @return void
*/
- public function debugOutput ($message, $doPrint = false) {
+ public function debugOutput ($message, $doPrint = true) {
// Get debug instance
$debugInstance = $this->getDebugInstance();
if (!$doPrint) die(); // Die here if not printed
} else {
// Put directly out
- // DO NOT REWRITE THIS TO app_die() !!!
if ($doPrint) {
print($message);
} else {
+ // DO NOT REWRITE THIS TO app_die() !!!
die($message);
}
}