projects
/
core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some cleanups
[core.git]
/
inc
/
classes
/
main
/
class_BaseFrameworkSystem.php
diff --git
a/inc/classes/main/class_BaseFrameworkSystem.php
b/inc/classes/main/class_BaseFrameworkSystem.php
index 70ab046529da504a28c0a40d9e4d74e996bf4021..6cc07b23a42816073734a0df3b6d8adb36966fe4 100644
(file)
--- a/
inc/classes/main/class_BaseFrameworkSystem.php
+++ b/
inc/classes/main/class_BaseFrameworkSystem.php
@@
-699,10
+699,6
@@
class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
* @param $applicationInstance An application helper instance or
* null if we shall use the default
* @return $templateInstance The template engine instance
* @param $applicationInstance An application helper instance or
* null if we shall use the default
* @return $templateInstance The template engine instance
- * @throws NullPointerException If the template engine could not
- * be initialized
- * @throws UnsupportedTemplateEngineException If $templateInstance is an
- * unsupported template engine
* @throws NullPointerException If the discovered application
* instance is still null
*/
* @throws NullPointerException If the discovered application
* instance is still null
*/
@@
-794,7
+790,7
@@
class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Generate the class::method string
$methodName = 'UnknownClass->unknownMethod';
if ((isset($backtrace[1]['class'])) && (isset($backtrace[1]['function']))) {
// Generate the class::method string
$methodName = 'UnknownClass->unknownMethod';
if ((isset($backtrace[1]['class'])) && (isset($backtrace[1]['function']))) {
- $methodName = $backtrace[1]['class']
."->".
$backtrace[1]['function'];
+ $methodName = $backtrace[1]['class']
. '->' .
$backtrace[1]['function'];
} // END - if
// Construct the full message
} // END - if
// Construct the full message
@@
-814,7
+810,7
@@
class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
$this->debugOutput($stubMessage);
} else {
// Trigger an error
$this->debugOutput($stubMessage);
} else {
// Trigger an error
- trigger_error($stubMessage
.
"<br />\n");
+ trigger_error($stubMessage
.
"<br />\n");
}
}
}
}
@@
-846,7
+842,11
@@
class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
if (is_object($debugInstance)) {
// Use debug output handler
$debugInstance->output($message);
if (is_object($debugInstance)) {
// Use debug output handler
$debugInstance->output($message);
- if ($doPrint === false) die(); // Die here if not printed
+
+ if ($doPrint === false) {
+ // Die here if not printed
+ die();
+ } // END - if
} else {
// Put directly out
if ($doPrint === true) {
} else {
// Put directly out
if ($doPrint === true) {
@@
-1141,7
+1141,7
@@
class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
$this->debugOutput($message);
} else {
// Trigger an error
$this->debugOutput($message);
} else {
// Trigger an error
- trigger_error($message
.
"<br />\n");
+ trigger_error($message
.
"<br />\n");
}
} else {
// @TODO Finish this part!
}
} else {
// @TODO Finish this part!