X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fclass_BaseFrameworkSystem.php;h=48ab38c3c2554eaacb91ee16f6fd7c9a072c2061;hp=5cc9d8119df991d6803ba38a42f5dbc79fdc9ed9;hb=e460e503df60eec92ab83b3167eed2e5399097f5;hpb=c8a4397d3236e0e190be52e62a3d2504658d5f8a
diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 5cc9d811..48ab38c3 100644
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -76,17 +76,17 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
/**
* The real class name
*/
- private $realClass = "FrameworkSystem";
+ private $realClass = 'FrameworkSystem';
/**
* Thousands seperator
*/
- private $thousands = "."; // German
+ private $thousands = '.'; // German
/**
* Decimal seperator
*/
- private $decimals = ","; // German
+ private $decimals = ','; // German
/***********************
* Exception codes.... *
@@ -149,6 +149,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
const EXCEPTION_ASSERTION_FAILED = 0x037;
const EXCEPTION_FILE_CANNOT_BE_READ = 0x038;
const EXCEPTION_DATABASE_UPDATED_NOT_ALLOWED = 0x039;
+ const EXCEPTION_FILTER_CHAIN_INTERCEPTED = 0x040;
/**
* In the super constructor these system classes shall be ignored or else
@@ -160,22 +161,21 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
*---------------------------------------------------------------------*
*/
private $systemClasses = array(
- "DebugMiddleware", // Debug middleware output sub-system
- "Registry", // Object registry
- "ObjectFactory", // Object factory
- "DebugWebOutput", // Debug web output sub-system
- "WebOutput", // Web output sub-system
- "CompressorChannel", // Compressor sub-system
- "DebugConsoleOutput", // Debug console output sub-system
- "DebugErrorLogOutput", // Debug error_log() output sub-system
- "FrameworkDirectoryPointer", // Directory handler sub-system
- "NullCompressor", // Null compressor
- "Bzip2Compressor", // BZIP2 compressor
- "GzipCompressor", // GZIP compressor
+ 'DebugMiddleware', // Debug middleware output sub-system
+ 'Registry', // Object registry
+ 'ObjectFactory', // Object factory
+ 'DebugWebOutput', // Debug web output sub-system
+ 'WebOutput', // Web output sub-system
+ 'CompressorChannel', // Compressor sub-system
+ 'DebugConsoleOutput', // Debug console output sub-system
+ 'DebugErrorLogOutput', // Debug error_log() output sub-system
+ 'FrameworkDirectoryPointer', // Directory handler sub-system
+ 'NullCompressor', // Null compressor
+ 'Bzip2Compressor', // BZIP2 compressor
+ 'GzipCompressor', // GZIP compressor
);
-
/**
- * Private super constructor
+ * Protected super constructor
*
* @param $className Name of the class
* @return void
@@ -208,7 +208,8 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
} elseif ((defined('DEBUG_DESTRUCTOR')) && (is_object($this->getDebugInstance()))) {
// Already destructed object
$this->debugOutput(sprintf("[%s:] The object %s is already destroyed.",
- __CLASS__, $this->__toString()
+ __CLASS__,
+ $this->__toString()
));
}
}
@@ -220,30 +221,30 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
*/
public final function __call ($methodName, $args) {
// Implode all given arguments
- $argsString = "";
+ $argsString = '';
if (empty($args)) {
// No arguments
- $argsString = "NULL";
+ $argsString = 'NULL';
} elseif (is_array($args)) {
// Some arguments are there
foreach ($args as $arg) {
// Add the type
- $argsString .= $arg." (".gettype($arg);
+ $argsString .= $arg . ' (' . gettype($arg);
// Add length if type is string
- if (gettype($arg) == 'string') $argsString .= ", ".strlen($arg);
+ if (gettype($arg) == 'string') $argsString .= ', '.strlen($arg);
// Closing bracket
- $argsString .= "), ";
+ $argsString .= '), ';
} // END - foreach
// Remove last comma
- if (substr($argsString, -2, 1) === ",") {
+ if (substr($argsString, -2, 1) == ',') {
$argsString = substr($argsString, 0, -2);
} // END - if
} else {
// Invalid arguments!
- $argsString = sprintf("!INVALID:%s!", $args);
+ $argsString = '!INVALID:' . gettype($args) . '!';
}
// Output stub message
@@ -279,10 +280,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
$this->setWebOutputInstance($outputInstance);
// Set the compressor channel
- $this->setCompressorChannel(CompressorChannel::createCompressorChannel(sprintf("%s%s",
- $this->getConfigInstance()->readConfig('base_path'),
+ $this->setCompressorChannel(CompressorChannel::createCompressorChannel(
+ $this->getConfigInstance()->readConfig('base_path').
$this->getConfigInstance()->readConfig('compressor_base_path')
- )));
+ ));
// Initialization done! :D
Registry::isInitialized('OK');
@@ -402,11 +403,11 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
/**
* Getter for configuration instance
*
- * @return $cfgInstance Configuration instance
+ * @return $configInstance Configuration instance
*/
public final function getConfigInstance () {
- $cfgInstance = Registry::getRegistry()->getInstance('config');
- return $cfgInstance;
+ $configInstance = Registry::getRegistry()->getInstance('config');
+ return $configInstance;
}
/**
@@ -622,7 +623,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
* thousands seperator
* is missing
*/
- public function formatCurrency ($value, $currency = "€", $decNum = 2) {
+ public function formatCurrency ($value, $currency = '€', $decNum = 2) {
// Are all required attriutes set?
if ((!isset($this->decimals)) || (!isset($this->thousands))) {
// Throw an exception
@@ -633,10 +634,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
$value = (float) $value;
// Reformat the US number
- $price = sprintf("%s %s",
- number_format($value, $decNum, $this->decimals, $this->thousands),
- $currency
- );
+ $price = number_format($value, $decNum, $this->decimals, $this->thousands) . $currency;
// Return as string...
return $price;
@@ -690,7 +688,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
*/
public final function addMissingTrailingSlash ($str) {
// Is there a trailing slash?
- if (substr($str, -1, 1) != "/") $str .= "/";
+ if (substr($str, -1, 1) != '/') $str .= '/';
return $str;
}
@@ -742,13 +740,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
} // END - if
} // END - if
- // Generate FQFN for all application templates
- $fqfn = sprintf("%s%s/%s",
- $this->getConfigInstance()->readConfig('application_path'),
- strtolower($appInstance->getAppShortName()),
- $this->getConfigInstance()->readConfig('tpl_base_path')
- );
-
// Are both instances set?
if ($appInstance->getLanguageInstance() === null) {
// Invalid language instance
@@ -759,7 +750,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
}
// Initialize the template engine
- $templateInstance = ObjectFactory::createObjectByConfiguredName('template_class', array($fqfn, $appInstance->getLanguageInstance(), $appInstance->getFileIoInstance()));
+ $templateInstance = ObjectFactory::createObjectByConfiguredName('template_class', array($appInstance));
// Return the prepared instance
return $templateInstance;
@@ -771,12 +762,12 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
* @param $message Optional message to show in debug output
* @return void
*/
- public final function debugInstance ($message = "") {
+ public final function debugInstance ($message = '') {
// Restore the error handler to avoid trouble with missing array elements or undeclared variables
restore_error_handler();
// Init content
- $content = "";
+ $content = '';
// Is a message set?
if (!empty($message)) {
@@ -807,12 +798,12 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
* @param $message An optional message to display
* @return void
*/
- protected function partialStub ($message = "") {
+ protected function partialStub ($message = '') {
// Get the backtrace
$backtrace = debug_backtrace();
// Generate the class::method string
- $methodName = "UnknownClass->unknownMethod";
+ $methodName = 'UnknownClass->unknownMethod';
if ((isset($backtrace[1]['class'])) && (isset($backtrace[1]['function']))) {
$methodName = $backtrace[1]['class']."->".$backtrace[1]['function'];
} // END - if
@@ -886,13 +877,13 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
*/
public function convertToClassName ($str) {
// Init class name
- $className = "";
+ $className = '';
// Convert all dashes in underscores
- $str = str_replace("-", "_", $str);
+ $str = $this->convertDashesToUnderscores($str);
// Now use that underscores to get classname parts for hungarian style
- foreach (explode("_", $str) as $strPart) {
+ foreach (explode('_', $str) as $strPart) {
// Make the class name part lower case and first upper case
$className .= ucfirst(strtolower($strPart));
} // END - foreach
@@ -901,6 +892,20 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
return $className;
}
+ /**
+ * Converts dashes to underscores, e.g. useable for configuration entries
+ *
+ * @param $str The string with maybe dashes inside
+ * @return $str The converted string with no dashed, but underscores
+ */
+ public final function convertDashesToUnderscores ($str) {
+ // Convert them all
+ $str = str_replace('-', '_', $str);
+
+ // Return converted string
+ return $str;
+ }
+
/**
* Marks up the code by adding e.g. line numbers
*
@@ -909,7 +914,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
*/
public function markupCode ($phpCode) {
// Init marked code
- $markedCode = "";
+ $markedCode = '';
// Get last error
$errorArray = error_get_last();
@@ -948,7 +953,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
*/
public function doFilterFormatTimestamp ($timestamp) {
// Default value to return
- $readable = "???";
+ $readable = '???';
// Is the timestamp null?
if (is_null($timestamp)) {
@@ -958,9 +963,9 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
switch ($this->getLanguageInstance()->getLanguageCode()) {
case "de": // German format is a bit different to default
// Split the GMT stamp up
- $dateTime = explode(" ", $timestamp);
- $dateArray = explode("-", $dateTime[0]);
- $timeArray = explode(":", $dateTime[1]);
+ $dateTime = explode(' ', $timestamp );
+ $dateArray = explode('-', $dateTime[0]);
+ $timeArray = explode(':', $dateTime[1]);
// Construct the timestamp
$readable = sprintf($this->getConfigInstance()->readConfig('german_date_time'),
@@ -1107,6 +1112,30 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
$wrapperInstance->doUpdateByResult($this->getResultInstance());
} // END - if
}
+
+ /**
+ * Outputs a deprecation warning to the developer.
+ *
+ * @param $message The message we shall output to the developer
+ * @return void
+ * @todo Write a logging mechanism for productive mode
+ */
+ public function deprecationWarning ($message) {
+ // Is developer mode active?
+ if (defined('DEVELOPER')) {
+ // Debug instance is there?
+ if (!is_null($this->getDebugInstance())) {
+ // Output stub message
+ $this->debugOutput($message);
+ } else {
+ // Trigger an error
+ trigger_error($message."
\n");
+ }
+ } else {
+ // @TODO Finish this part!
+ $this->partialStub('Developer mode inactive. Message:' . $message);
+ }
+ }
}
// [EOF]