X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fclass_BaseFrameworkSystem.php;h=4b481128041aae298adee3ecf301c608ce063e49;hb=28ff0710d8eb3a2d0c1547d6ebeaae05eb50c7f6;hp=350c97faa34c12a99f052bec9ad3c165e8d53aa1;hpb=aa76ddf7f1d5d302f1d752efcd113515ecf152a2;p=core.git
diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index 350c97fa..4b481128 100644
--- a/framework/main/classes/class_BaseFrameworkSystem.php
+++ b/framework/main/classes/class_BaseFrameworkSystem.php
@@ -1,53 +1,39 @@
* @version 0.0.0
- * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
* @license GNU GPL 3.0 or any newer version
* @link http://www.shipsimu.org
*
@@ -72,41 +58,21 @@ use \ReflectionClass;
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
+abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
/**
* Length of output from hash()
*/
private static $hashLength = NULL;
/**
- * The real class name
- */
- private $realClass = 'BaseFrameworkSystem';
-
- /**
- * Search criteria instance
- */
- private $searchInstance = NULL;
-
- /**
- * Update criteria instance
- */
- private $updateInstance = NULL;
-
- /**
- * The file I/O instance for the template loader
- */
- private $fileIoInstance = NULL;
-
- /**
- * Resolver instance
+ * Self-referencing instance
*/
- private $resolverInstance = NULL;
+ private static $instance = NULL;
/**
- * Template engine instance
+ * The real class name
*/
- private $templateInstance = NULL;
+ private $realClass = __CLASS__;
/**
* Database result instance
@@ -118,16 +84,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
*/
private $userInstance = NULL;
- /**
- * A controller instance
- */
- private $controllerInstance = NULL;
-
- /**
- * Instance of a RNG
- */
- private $rngInstance = NULL;
-
/**
* Instance of a crypto helper
*/
@@ -138,61 +94,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
*/
private $iteratorInstance = NULL;
- /**
- * Instance of the list
- */
- private $listInstance = NULL;
-
- /**
- * Instance of a menu
- */
- private $menuInstance = NULL;
-
- /**
- * Instance of the image
- */
- private $imageInstance = NULL;
-
- /**
- * Instance of the stacker
- */
- private $stackInstance = NULL;
-
- /**
- * A Compressor instance
- */
- private $compressorInstance = NULL;
-
- /**
- * A Parseable instance
- */
- private $parserInstance = NULL;
-
- /**
- * A HandleableProtocol instance
- */
- private $protocolInstance = NULL;
-
- /**
- * A database wrapper instance
- */
- private $databaseInstance = NULL;
-
- /**
- * A helper instance for the form
- */
- private $helperInstance = NULL;
-
- /**
- * An instance of a Source class
- */
- private $sourceInstance = NULL;
-
- /**
- * An instance of a UrlSource class
- */
- private $urlSourceInstance = NULL;
-
/**
* An instance of a InputStream class
*/
@@ -208,133 +109,25 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
*/
private $handlerInstance = NULL;
- /**
- * Visitor handler instance
- */
- private $visitorInstance = NULL;
-
- /**
- * DHT instance
- */
- private $dhtInstance = NULL;
-
/**
* An instance of a database wrapper class
*/
private $wrapperInstance = NULL;
- /**
- * An instance of a file I/O pointer class (not handler)
- */
- private $pointerInstance = NULL;
-
- /**
- * An instance of an Indexable class
- */
- private $indexInstance = NULL;
-
- /**
- * An instance of a Block class
- */
- private $blockInstance = NULL;
-
- /**
- * A Minable instance
- */
- private $minableInstance = NULL;
-
- /**
- * A FrameworkDirectory instance
- */
- private $directoryInstance = NULL;
-
- /**
- * An instance of a communicator
- */
- private $communicatorInstance = NULL;
-
- /**
- * The concrete output instance
- */
- private $outputInstance = NULL;
-
/**
* State instance
*/
private $stateInstance = NULL;
/**
- * Thousands separator
+ * Call-back instance
*/
- private $thousands = '.'; // German
-
- /**
- * Decimal separator
- */
- private $decimals = ','; // German
-
- /**
- * Socket resource
- */
- private $socketResource = false;
-
- /**
- * Regular expression to use for validation
- */
- private $regularExpression = '';
-
- /**
- * Package data
- */
- private $packageData = array();
+ private $callbackInstance = NULL;
/**
* Generic array
*/
- private $genericArray = array();
-
- /**
- * Command name
- */
- private $commandName = '';
-
- /**
- * Controller name
- */
- private $controllerName = '';
-
- /**
- * Name of used protocol
- */
- private $protocolName = 'invalid';
-
- /**
- * Array with bitmasks and such for pack/unpack methods to support both
- * 32-bit and 64-bit systems
- */
- private $packingData = array(
- 32 => array(
- 'step' => 3,
- 'left' => 0xffff0000,
- 'right' => 0x0000ffff,
- 'factor' => 16,
- 'format' => 'II',
- ),
- 64 => array(
- 'step' => 7,
- 'left' => 0xffffffff00000000,
- 'right' => 0x00000000ffffffff,
- 'factor' => 32,
- 'format' => 'NN'
- )
- );
-
- /**
- * Simple 64-bit check, thanks to "Salman A" from stackoverflow.com:
- *
- * The integer size is 4 bytes on 32-bit and 8 bytes on a 64-bit system.
- */
- private $archArrayElement = false;
+ private $genericArray = [];
/***********************
* Exception codes.... *
@@ -403,50 +196,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
const EXCEPTION_DATABASE_UPDATED_NOT_ALLOWED = 0x03c;
const EXCEPTION_FILTER_CHAIN_INTERCEPTED = 0x03d;
const EXCEPTION_INVALID_SOCKET = 0x03e;
-
- /**
- * Hexadecimal->Decimal translation array
- */
- private static $hexdec = array(
- '0' => 0,
- '1' => 1,
- '2' => 2,
- '3' => 3,
- '4' => 4,
- '5' => 5,
- '6' => 6,
- '7' => 7,
- '8' => 8,
- '9' => 9,
- 'a' => 10,
- 'b' => 11,
- 'c' => 12,
- 'd' => 13,
- 'e' => 14,
- 'f' => 15
- );
-
- /**
- * Decimal->hexadecimal translation array
- */
- private static $dechex = array(
- 0 => '0',
- 1 => '1',
- 2 => '2',
- 3 => '3',
- 4 => '4',
- 5 => '5',
- 6 => '6',
- 7 => '7',
- 8 => '8',
- 9 => '9',
- 10 => 'a',
- 11 => 'b',
- 12 => 'c',
- 13 => 'd',
- 14 => 'e',
- 15 => 'f'
- );
+ const EXCEPTION_SELF_INSTANCE = 0x03f;
/**
* Startup time in miliseconds
@@ -459,24 +209,15 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
* @param $className Name of the class
* @return void
*/
- protected function __construct ($className) {
+ protected function __construct (string $className) {
// Set real class
$this->setRealClass($className);
- // Set configuration instance if no registry ...
- if (!$this instanceof Register) {
- // ... because registries doesn't need to be configured
- $this->setConfigInstance(FrameworkConfiguration::getSelfInstance());
- } // END - if
-
// Is the startup time set? (0 cannot be true anymore)
if (self::$startupTime == 0) {
// Then set it
self::$startupTime = microtime(true);
- } // END - if
-
- // Set array element
- $this->archArrayElement = (PHP_INT_SIZE === 8 ? 64 : 32);
+ }
}
/**
@@ -511,23 +252,39 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
* @args $args Arguments passed to the method
* @return void
*/
- public final function __call ($methodName, $args) {
- return self::__callStatic($methodName, $args);
+ public final function __call (string $methodName, array $args = NULL) {
+ // Set self-instance
+ self::$instance = $this;
+
+ // Call static method
+ self::__callStatic($methodName, $args);
+
+ // Clear self-instance
+ self::$instance = NULL;
}
/**
* The __callStatic() method where all non-implemented static methods end up
*
* @param $methodName Name of the missing method
- * @args $args Arguments passed to the method
+ * @param $args Arguments passed to the method
* @return void
+ * @throws InvalidArgumentException If self::$instance is not a framework's own object
*/
- public static final function __callStatic ($methodName, $args) {
- // Trace message
+ public static final function __callStatic (string $methodName, array $args = NULL) {
+ // Init argument string and class name
//* PRINT-DEBUG: */ printf('[%s:%d]: methodName=%s,args[]=%s - CALLED!' . PHP_EOL, __METHOD__, __LINE__, $methodName, gettype($args));
-
- // Init argument string
$argsString = '';
+ $className = 'unknown';
+
+ // Is self-instance set?
+ if (self::$instance instanceof FrameworkInterface) {
+ // Framework's own instance
+ $className = self::$instance->__toString();
+ } elseif (!is_null(self::$instance)) {
+ // Invalid argument!
+ throw new InvalidArgumentException(sprintf('self::instance[%s] is not expected.', gettype(self::$instance)), self::EXCEPTION_SELF_INSTANCE);
+ }
// Is it NULL, empty or an array?
if (is_null($args)) {
@@ -570,23 +327,22 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Comma for next one
$argsString .= ', ';
- } // END - foreach
+ }
- // Remove last comma
+ // Last comma found?
if (substr($argsString, -2, 1) == ',') {
+ // Remove last comma
$argsString = substr($argsString, 0, -2);
- } // END - if
+ }
// Close braces
$argsString .= ')';
- } else {
- // Invalid arguments!
- $argsString = '!INVALID:' . gettype($args) . '!';
}
// Output stub message
// @TODO __CLASS__ does always return BaseFrameworkSystem but not the extending (=child) class
- self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[unknown::%s]: Stub! Args: %s',
+ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s::%s]: Stub! Args: %s',
+ $className,
$methodName,
$argsString
));
@@ -611,7 +367,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
* @param $value Value to store
* @return void
*/
- public final function __set ($name, $value) {
+ public final function __set (string $name, $value) {
$this->debugBackTrace(sprintf('Tried to set a missing field. name=%s, value[%s]=%s',
$name,
gettype($value),
@@ -625,7 +381,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
* @param $name Name of the field/attribute
* @return void
*/
- public final function __get ($name) {
+ public final function __get (string $name) {
$this->debugBackTrace(sprintf('Tried to get a missing field. name=%s',
$name
));
@@ -637,7 +393,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
* @param $name Name of the field/attribute
* @return void
*/
- public final function __unset ($name) {
+ public final function __unset (string $name) {
$this->debugBackTrace(sprintf('Tried to unset a missing field. name=%s',
$name
));
@@ -678,959 +434,244 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
*
* @param $realClass Class name (string)
* @return void
- */
- public final function setRealClass ($realClass) {
- // Set real class
- $this->realClass = (string) $realClass;
- }
-
- /**
- * Setter for database result instance
- *
- * @param $resultInstance An instance of a database result class
- * @return void
- * @todo SearchableResult and UpdateableResult shall have a super interface to use here
- */
- protected final function setResultInstance (SearchableResult $resultInstance) {
- $this->resultInstance = $resultInstance;
- }
-
- /**
- * Getter for database result instance
- *
- * @return $resultInstance An instance of a database result class
- */
- public final function getResultInstance () {
- return $this->resultInstance;
- }
-
- /**
- * Setter for template engine instances
- *
- * @param $templateInstance An instance of a template engine class
- * @return void
- */
- protected final function setTemplateInstance (CompileableTemplate $templateInstance) {
- $this->templateInstance = $templateInstance;
- }
-
- /**
- * Getter for template engine instances
- *
- * @return $templateInstance An instance of a template engine class
- */
- protected final function getTemplateInstance () {
- return $this->templateInstance;
- }
-
- /**
- * Setter for search instance
- *
- * @param $searchInstance Searchable criteria instance
- * @return void
- */
- public final function setSearchInstance (LocalSearchCriteria $searchInstance) {
- $this->searchInstance = $searchInstance;
- }
-
- /**
- * Getter for search instance
- *
- * @return $searchInstance Searchable criteria instance
- */
- public final function getSearchInstance () {
- return $this->searchInstance;
- }
-
- /**
- * Setter for update instance
- *
- * @param $updateInstance An instance of a LocalUpdateCriteria clase
- * @return void
- */
- public final function setUpdateInstance (LocalUpdateCriteria $updateInstance) {
- $this->updateInstance = $updateInstance;
- }
-
- /**
- * Getter for update instance
- *
- * @return $updateInstance Updateable criteria instance
- */
- public final function getUpdateInstance () {
- return $this->updateInstance;
- }
-
- /**
- * Setter for resolver instance
- *
- * @param $resolverInstance Instance of a command resolver class
- * @return void
- */
- public final function setResolverInstance (Resolver $resolverInstance) {
- $this->resolverInstance = $resolverInstance;
- }
-
- /**
- * Getter for resolver instance
- *
- * @return $resolverInstance Instance of a command resolver class
- */
- public final function getResolverInstance () {
- return $this->resolverInstance;
- }
-
- /**
- * Setter for language instance
- *
- * @param $configInstance The configuration instance which shall
- * be FrameworkConfiguration
- * @return void
- */
- public final function setConfigInstance (FrameworkConfiguration $configInstance) {
- Registry::getRegistry()->addInstance('config', $configInstance);
- }
-
- /**
- * Getter for configuration instance
- *
- * @return $configInstance Configuration instance
- */
- public final function getConfigInstance () {
- $configInstance = Registry::getRegistry()->getInstance('config');
- return $configInstance;
- }
-
- /**
- * Setter for debug instance
- *
- * @param $debugInstance The instance for debug output class
- * @return void
- */
- public final function setDebugInstance (DebugMiddleware $debugInstance) {
- Registry::getRegistry()->addInstance('debug', $debugInstance);
- }
-
- /**
- * Getter for debug instance
- *
- * @return $debugInstance Instance to class DebugConsoleOutput or DebugWebOutput
- */
- public final function getDebugInstance () {
- // Get debug instance
- $debugInstance = Registry::getRegistry()->getInstance('debug');
-
- // Return it
- return $debugInstance;
- }
-
- /**
- * Setter for web output instance
- *
- * @param $webInstance The instance for web output class
- * @return void
- */
- public final function setWebOutputInstance (OutputStreamer $webInstance) {
- Registry::getRegistry()->addInstance('web_output', $webInstance);
- }
-
- /**
- * Getter for web output instance
- *
- * @return $webOutputInstance - Instance to class WebOutput
- */
- public final function getWebOutputInstance () {
- $webOutputInstance = Registry::getRegistry()->getInstance('web_output');
- return $webOutputInstance;
- }
-
- /**
- * Setter for database instance
- *
- * @param $databaseInstance The instance for the database connection (forced DatabaseConnection)
- * @return void
- */
- public final function setDatabaseInstance (DatabaseConnection $databaseInstance) {
- Registry::getRegistry()->addInstance('db_instance', $databaseInstance);
- }
-
- /**
- * Getter for database layer
- *
- * @return $databaseInstance The database layer instance
- */
- public final function getDatabaseInstance () {
- // Get instance
- $databaseInstance = Registry::getRegistry()->getInstance('db_instance');
-
- // Return instance
- return $databaseInstance;
- }
-
- /**
- * Setter for compressor channel
- *
- * @param $compressorInstance An instance of CompressorChannel
- * @return void
- */
- public final function setCompressorChannel (CompressorChannel $compressorInstance) {
- Registry::getRegistry()->addInstance('compressor', $compressorInstance);
- }
-
- /**
- * Getter for compressor channel
- *
- * @return $compressorInstance The compressor channel
- */
- public final function getCompressorChannel () {
- $compressorInstance = Registry::getRegistry()->getInstance('compressor');
- return $compressorInstance;
- }
-
- /**
- * Protected getter for a manageable application helper class
- *
- * @return $applicationInstance An instance of a manageable application helper class
- */
- protected final function getApplicationInstance () {
- $applicationInstance = Registry::getRegistry()->getInstance('app');
- return $applicationInstance;
- }
-
- /**
- * Setter for a manageable application helper class
- *
- * @param $applicationInstance An instance of a manageable application helper class
- * @return void
- */
- public final function setApplicationInstance (ManageableApplication $applicationInstance) {
- Registry::getRegistry()->addInstance('application', $applicationInstance);
- }
-
- /**
- * Private getter for language instance
- *
- * @return $langInstance An instance to the language sub-system
- */
- protected final function getLanguageInstance () {
- $langInstance = Registry::getRegistry()->getInstance('language');
- return $langInstance;
- }
-
- /**
- * Setter for language instance
- *
- * @param $langInstance An instance to the language sub-system
- * @return void
- * @see LanguageSystem
- */
- public final function setLanguageInstance (ManageableLanguage $langInstance) {
- Registry::getRegistry()->addInstance('language', $langInstance);
- }
-
- /**
- * Private getter for file IO instance
- *
- * @return $fileIoInstance An instance to the file I/O sub-system
- */
- protected final function getFileIoInstance () {
- return $this->fileIoInstance;
- }
-
- /**
- * Setter for file I/O instance
- *
- * @param $fileIoInstance An instance to the file I/O sub-system
- * @return void
- */
- public final function setFileIoInstance (IoHandler $fileIoInstance) {
- $this->fileIoInstance = $fileIoInstance;
- }
-
- /**
- * Protected setter for user instance
- *
- * @param $userInstance An instance of a user class
- * @return void
- */
- protected final function setUserInstance (ManageableAccount $userInstance) {
- $this->userInstance = $userInstance;
- }
-
- /**
- * Getter for user instance
- *
- * @return $userInstance An instance of a user class
- */
- public final function getUserInstance () {
- return $this->userInstance;
- }
-
- /**
- * Setter for controller instance (this surely breaks a bit the MVC patterm)
- *
- * @param $controllerInstance An instance of the controller
- * @return void
- */
- public final function setControllerInstance (Controller $controllerInstance) {
- $this->controllerInstance = $controllerInstance;
- }
-
- /**
- * Getter for controller instance (this surely breaks a bit the MVC patterm)
- *
- * @return $controllerInstance An instance of the controller
- */
- public final function getControllerInstance () {
- return $this->controllerInstance;
- }
-
- /**
- * Setter for RNG instance
- *
- * @param $rngInstance An instance of a random number generator (RNG)
- * @return void
- */
- protected final function setRngInstance (RandomNumberGenerator $rngInstance) {
- $this->rngInstance = $rngInstance;
- }
-
- /**
- * Getter for RNG instance
- *
- * @return $rngInstance An instance of a random number generator (RNG)
- */
- public final function getRngInstance () {
- return $this->rngInstance;
- }
-
- /**
- * Setter for Cryptable instance
- *
- * @param $cryptoInstance An instance of a Cryptable class
- * @return void
- */
- protected final function setCryptoInstance (Cryptable $cryptoInstance) {
- $this->cryptoInstance = $cryptoInstance;
- }
-
- /**
- * Getter for Cryptable instance
- *
- * @return $cryptoInstance An instance of a Cryptable class
- */
- public final function getCryptoInstance () {
- return $this->cryptoInstance;
- }
-
- /**
- * Setter for the list instance
- *
- * @param $listInstance A list of Listable
- * @return void
- */
- protected final function setListInstance (Listable $listInstance) {
- $this->listInstance = $listInstance;
- }
-
- /**
- * Getter for the list instance
- *
- * @return $listInstance A list of Listable
- */
- protected final function getListInstance () {
- return $this->listInstance;
- }
-
- /**
- * Setter for the menu instance
- *
- * @param $menuInstance A RenderableMenu instance
- * @return void
- */
- protected final function setMenuInstance (RenderableMenu $menuInstance) {
- $this->menuInstance = $menuInstance;
- }
-
- /**
- * Getter for the menu instance
- *
- * @return $menuInstance A RenderableMenu instance
- */
- protected final function getMenuInstance () {
- return $this->menuInstance;
- }
-
- /**
- * Setter for image instance
- *
- * @param $imageInstance An instance of an image
- * @return void
- */
- public final function setImageInstance (BaseImage $imageInstance) {
- $this->imageInstance = $imageInstance;
- }
-
- /**
- * Getter for image instance
- *
- * @return $imageInstance An instance of an image
- */
- public final function getImageInstance () {
- return $this->imageInstance;
- }
-
- /**
- * Setter for stacker instance
- *
- * @param $stackInstance An instance of an stacker
- * @return void
- */
- public final function setStackInstance (Stackable $stackInstance) {
- $this->stackInstance = $stackInstance;
- }
-
- /**
- * Getter for stacker instance
- *
- * @return $stackInstance An instance of an stacker
- */
- public final function getStackInstance () {
- return $this->stackInstance;
- }
-
- /**
- * Setter for compressor instance
- *
- * @param $compressorInstance An instance of an compressor
- * @return void
- */
- public final function setCompressorInstance (Compressor $compressorInstance) {
- $this->compressorInstance = $compressorInstance;
- }
-
- /**
- * Getter for compressor instance
- *
- * @return $compressorInstance An instance of an compressor
- */
- public final function getCompressorInstance () {
- return $this->compressorInstance;
- }
-
- /**
- * Setter for Parseable instance
- *
- * @param $parserInstance An instance of an Parseable
- * @return void
- */
- public final function setParserInstance (Parseable $parserInstance) {
- $this->parserInstance = $parserInstance;
- }
-
- /**
- * Getter for Parseable instance
- *
- * @return $parserInstance An instance of an Parseable
- */
- public final function getParserInstance () {
- return $this->parserInstance;
- }
-
- /**
- * Setter for HandleableProtocol instance
- *
- * @param $protocolInstance An instance of an HandleableProtocol
- * @return void
- */
- public final function setProtocolInstance (HandleableProtocol $protocolInstance) {
- $this->protocolInstance = $protocolInstance;
- }
-
- /**
- * Getter for HandleableProtocol instance
- *
- * @return $protocolInstance An instance of an HandleableProtocol
- */
- public final function getProtocolInstance () {
- return $this->protocolInstance;
- }
-
- /**
- * Setter for DatabaseWrapper instance
- *
- * @param $wrapperInstance An instance of an DatabaseWrapper
- * @return void
- */
- public final function setWrapperInstance (DatabaseWrapper $wrapperInstance) {
- $this->wrapperInstance = $wrapperInstance;
- }
-
- /**
- * Getter for DatabaseWrapper instance
- *
- * @return $wrapperInstance An instance of an DatabaseWrapper
- */
- public final function getWrapperInstance () {
- return $this->wrapperInstance;
- }
-
- /**
- * Setter for socket resource
- *
- * @param $socketResource A valid socket resource
- * @return void
- */
- public final function setSocketResource ($socketResource) {
- //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($this->__toString() . '::' . __FUNCTION__ . ': socketResource=' . $socketResource . ',previous[' . gettype($this->socketResource) . ']=' . $this->socketResource);
- $this->socketResource = $socketResource;
- }
-
- /**
- * Getter for socket resource
- *
- * @return $socketResource A valid socket resource
- */
- public final function getSocketResource () {
- //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($this->__toString() . '::' . __FUNCTION__ . ': socketResource[' . gettype($this->socketResource) . ']=' . $this->socketResource);
- return $this->socketResource;
- }
-
- /**
- * Setter for regular expression
- *
- * @param $regularExpression A valid regular expression
- * @return void
- */
- public final function setRegularExpression ($regularExpression) {
- //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($this->__toString() . '::' . __FUNCTION__ . ': regularExpression=' . $regularExpression . ',previous[' . gettype($this->regularExpression) . ']=' . $this->regularExpression);
- $this->regularExpression = $regularExpression;
- }
-
- /**
- * Getter for regular expression
- *
- * @return $regularExpression A valid regular expression
- */
- public final function getRegularExpression () {
- //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($this->__toString() . '::' . __FUNCTION__ . ': regularExpression[' . gettype($this->regularExpression) . ']=' . $this->regularExpression);
- return $this->regularExpression;
- }
-
- /**
- * Setter for helper instance
- *
- * @param $helperInstance An instance of a helper class
- * @return void
- */
- protected final function setHelperInstance (Helper $helperInstance) {
- $this->helperInstance = $helperInstance;
- }
-
- /**
- * Getter for helper instance
- *
- * @return $helperInstance An instance of a helper class
- */
- public final function getHelperInstance () {
- return $this->helperInstance;
- }
-
- /**
- * Setter for a Source instance
- *
- * @param $sourceInstance An instance of a Source class
- * @return void
- */
- protected final function setSourceInstance (Source $sourceInstance) {
- $this->sourceInstance = $sourceInstance;
- }
-
- /**
- * Getter for a Source instance
- *
- * @return $sourceInstance An instance of a Source class
- */
- protected final function getSourceInstance () {
- return $this->sourceInstance;
- }
-
- /**
- * Setter for a UrlSource instance
- *
- * @param $sourceInstance An instance of a UrlSource class
- * @return void
- */
- protected final function setUrlSourceInstance (UrlSource $urlSourceInstance) {
- $this->urlSourceInstance = $urlSourceInstance;
- }
-
- /**
- * Getter for a UrlSource instance
- *
- * @return $urlSourceInstance An instance of a UrlSource class
- */
- protected final function getUrlSourceInstance () {
- return $this->urlSourceInstance;
- }
-
- /**
- * Getter for a InputStream instance
- *
- * @param $inputStreamInstance The InputStream instance
- */
- protected final function getInputStreamInstance () {
- return $this->inputStreamInstance;
- }
-
- /**
- * Setter for a InputStream instance
- *
- * @param $inputStreamInstance The InputStream instance
- * @return void
- */
- protected final function setInputStreamInstance (InputStream $inputStreamInstance) {
- $this->inputStreamInstance = $inputStreamInstance;
- }
-
- /**
- * Getter for a OutputStream instance
- *
- * @param $outputStreamInstance The OutputStream instance
- */
- protected final function getOutputStreamInstance () {
- return $this->outputStreamInstance;
- }
-
- /**
- * Setter for a OutputStream instance
- *
- * @param $outputStreamInstance The OutputStream instance
- * @return void
- */
- protected final function setOutputStreamInstance (OutputStream $outputStreamInstance) {
- $this->outputStreamInstance = $outputStreamInstance;
- }
-
- /**
- * Setter for handler instance
- *
- * @param $handlerInstance An instance of a Handleable class
- * @return void
- */
- protected final function setHandlerInstance (Handleable $handlerInstance) {
- $this->handlerInstance = $handlerInstance;
- }
-
- /**
- * Getter for handler instance
- *
- * @return $handlerInstance A Handleable instance
- */
- protected final function getHandlerInstance () {
- return $this->handlerInstance;
- }
-
- /**
- * Setter for visitor instance
- *
- * @param $visitorInstance A Visitor instance
- * @return void
- */
- protected final function setVisitorInstance (Visitor $visitorInstance) {
- $this->visitorInstance = $visitorInstance;
- }
-
- /**
- * Getter for visitor instance
- *
- * @return $visitorInstance A Visitor instance
- */
- protected final function getVisitorInstance () {
- return $this->visitorInstance;
- }
-
- /**
- * Setter for DHT instance
- *
- * @param $dhtInstance A Distributable instance
- * @return void
- */
- protected final function setDhtInstance (Distributable $dhtInstance) {
- $this->dhtInstance = $dhtInstance;
- }
-
- /**
- * Getter for DHT instance
- *
- * @return $dhtInstance A Distributable instance
- */
- protected final function getDhtInstance () {
- return $this->dhtInstance;
- }
-
- /**
- * Setter for raw package Data
- *
- * @param $packageData Raw package Data
- * @return void
- */
- public final function setPackageData (array $packageData) {
- $this->packageData = $packageData;
- }
-
- /**
- * Getter for raw package Data
- *
- * @return $packageData Raw package Data
- */
- public function getPackageData () {
- return $this->packageData;
- }
-
-
- /**
- * Setter for Iterator instance
- *
- * @param $iteratorInstance An instance of an Iterator
- * @return void
- */
- protected final function setIteratorInstance (Iterator $iteratorInstance) {
- $this->iteratorInstance = $iteratorInstance;
+ */
+ public final function setRealClass (string $realClass) {
+ // Set real class
+ $this->realClass = $realClass;
}
/**
- * Getter for Iterator instance
+ * Setter for database result instance
*
- * @return $iteratorInstance An instance of an Iterator
+ * @param $resultInstance An instance of a database result class
+ * @return void
+ * @todo SearchableResult and UpdateableResult shall have a super interface to use here
*/
- public final function getIteratorInstance () {
- return $this->iteratorInstance;
+ protected final function setResultInstance (SearchableResult $resultInstance) {
+ $this->resultInstance = $resultInstance;
}
/**
- * Setter for FilePointer instance
+ * Getter for database result instance
*
- * @param $pointerInstance An instance of an FilePointer class
- * @return void
+ * @return $resultInstance An instance of a database result class
*/
- protected final function setPointerInstance (FilePointer $pointerInstance) {
- $this->pointerInstance = $pointerInstance;
+ public final function getResultInstance () {
+ return $this->resultInstance;
}
/**
- * Getter for FilePointer instance
+ * Setter for debug instance
*
- * @return $pointerInstance An instance of an FilePointer class
+ * @param $debugInstance The instance for debug output class
+ * @return void
*/
- public final function getPointerInstance () {
- return $this->pointerInstance;
+ public final function setDebugInstance (DebugMiddleware $debugInstance) {
+ GenericRegistry::getRegistry()->addInstance('debug', $debugInstance);
}
/**
- * Unsets pointer instance which triggers a call of __destruct() if the
- * instance is still there. This is surely not fatal on already "closed"
- * file pointer instances.
- *
- * I don't want to mess around with above setter by giving it a default
- * value NULL as setter should always explicitly only set (existing) object
- * instances and NULL is NULL.
+ * Getter for debug instance
*
- * @return void
+ * @return $debugInstance Instance to class DebugConsoleOutput or DebugWebOutput
*/
- protected final function unsetPointerInstance () {
- // Simply it to NULL
- $this->pointerInstance = NULL;
+ public final function getDebugInstance () {
+ // Get debug instance
+ $debugInstance = GenericRegistry::getRegistry()->getInstance('debug');
+
+ // Return it
+ return $debugInstance;
}
/**
- * Setter for Indexable instance
+ * Setter for web output instance
*
- * @param $indexInstance An instance of an Indexable class
+ * @param $webInstance The instance for web output class
* @return void
*/
- protected final function setIndexInstance (Indexable $indexInstance) {
- $this->indexInstance = $indexInstance;
+ public final function setWebOutputInstance (OutputStreamer $webInstance) {
+ GenericRegistry::getRegistry()->addInstance('web_output', $webInstance);
}
/**
- * Getter for Indexable instance
+ * Getter for web output instance
*
- * @return $indexInstance An instance of an Indexable class
+ * @return $webOutputInstance - Instance to class WebOutput
*/
- public final function getIndexInstance () {
- return $this->indexInstance;
+ public final function getWebOutputInstance () {
+ $webOutputInstance = GenericRegistry::getRegistry()->getInstance('web_output');
+ return $webOutputInstance;
}
/**
- * Setter for Block instance
+ * Protected setter for user instance
*
- * @param $blockInstance An instance of an Block class
+ * @param $userInstance An instance of a user class
* @return void
*/
- protected final function setBlockInstance (Block $blockInstance) {
- $this->blockInstance = $blockInstance;
+ protected final function setUserInstance (ManageableAccount $userInstance) {
+ $this->userInstance = $userInstance;
}
/**
- * Getter for Block instance
+ * Getter for user instance
*
- * @return $blockInstance An instance of an Block class
+ * @return $userInstance An instance of a user class
*/
- public final function getBlockInstance () {
- return $this->blockInstance;
+ public final function getUserInstance () {
+ return $this->userInstance;
}
/**
- * Setter for Minable instance
+ * Setter for Cryptable instance
*
- * @param $minableInstance A Minable instance
+ * @param $cryptoInstance An instance of a Cryptable class
* @return void
*/
- protected final function setMinableInstance (Minable $minableInstance) {
- $this->minableInstance = $minableInstance;
+ protected final function setCryptoInstance (Cryptable $cryptoInstance) {
+ $this->cryptoInstance = $cryptoInstance;
}
/**
- * Getter for minable instance
+ * Getter for Cryptable instance
*
- * @return $minableInstance A Minable instance
+ * @return $cryptoInstance An instance of a Cryptable class
*/
- protected final function getMinableInstance () {
- return $this->minableInstance;
+ public final function getCryptoInstance () {
+ return $this->cryptoInstance;
}
/**
- * Setter for FrameworkDirectory instance
+ * Setter for DatabaseWrapper instance
*
- * @param $directoryInstance A FrameworkDirectory instance
+ * @param $wrapperInstance An instance of an DatabaseWrapper
* @return void
*/
- protected final function setDirectoryInstance (FrameworkDirectory $directoryInstance) {
- $this->directoryInstance = $directoryInstance;
+ public final function setWrapperInstance (DatabaseWrapper $wrapperInstance) {
+ $this->wrapperInstance = $wrapperInstance;
}
/**
- * Getter for FrameworkDirectory instance
+ * Getter for DatabaseWrapper instance
*
- * @return $directoryInstance A FrameworkDirectory instance
+ * @return $wrapperInstance An instance of an DatabaseWrapper
*/
- protected final function getDirectoryInstance () {
- return $this->directoryInstance;
+ public final function getWrapperInstance () {
+ return $this->wrapperInstance;
}
/**
- * Getter for communicator instance
+ * Getter for a InputStream instance
*
- * @return $communicatorInstance An instance of a Communicator class
+ * @param $inputStreamInstance The InputStream instance
*/
- public final function getCommunicatorInstance () {
- return $this->communicatorInstance;
+ protected final function getInputStreamInstance () {
+ return $this->inputStreamInstance;
}
/**
- * Setter for communicator instance
+ * Setter for a InputStream instance
*
- * @param $communicatorInstance An instance of a Communicator class
+ * @param $inputStreamInstance The InputStream instance
* @return void
*/
- protected final function setCommunicatorInstance (Communicator $communicatorInstance) {
- $this->communicatorInstance = $communicatorInstance;
+ protected final function setInputStreamInstance (InputStream $inputStreamInstance) {
+ $this->inputStreamInstance = $inputStreamInstance;
}
/**
- * Setter for state instance
+ * Getter for a OutputStream instance
*
- * @param $stateInstance A Stateable instance
- * @return void
+ * @param $outputStreamInstance The OutputStream instance
*/
- public final function setStateInstance (Stateable $stateInstance) {
- $this->stateInstance = $stateInstance;
+ protected final function getOutputStreamInstance () {
+ return $this->outputStreamInstance;
}
/**
- * Getter for state instance
+ * Setter for a OutputStream instance
*
- * @return $stateInstance A Stateable instance
+ * @param $outputStreamInstance The OutputStream instance
+ * @return void
*/
- public final function getStateInstance () {
- return $this->stateInstance;
+ protected final function setOutputStreamInstance (OutputStream $outputStreamInstance) {
+ $this->outputStreamInstance = $outputStreamInstance;
}
/**
- * Setter for output instance
+ * Setter for handler instance
*
- * @param $outputInstance The debug output instance
+ * @param $handlerInstance An instance of a Handleable class
* @return void
*/
- public final function setOutputInstance (OutputStreamer $outputInstance) {
- $this->outputInstance = $outputInstance;
+ protected final function setHandlerInstance (Handleable $handlerInstance) {
+ $this->handlerInstance = $handlerInstance;
}
/**
- * Getter for output instance
+ * Getter for handler instance
*
- * @return $outputInstance The debug output instance
+ * @return $handlerInstance A Handleable instance
*/
- public final function getOutputInstance () {
- return $this->outputInstance;
+ protected final function getHandlerInstance () {
+ return $this->handlerInstance;
}
/**
- * Setter for command name
+ * Setter for Iterator instance
*
- * @param $commandName Last validated command name
+ * @param $iteratorInstance An instance of an Iterator
* @return void
*/
- protected final function setCommandName ($commandName) {
- $this->commandName = $commandName;
+ protected final function setIteratorInstance (Iterator $iteratorInstance) {
+ $this->iteratorInstance = $iteratorInstance;
}
/**
- * Getter for command name
+ * Getter for Iterator instance
*
- * @return $commandName Last validated command name
+ * @return $iteratorInstance An instance of an Iterator
*/
- protected final function getCommandName () {
- return $this->commandName;
+ public final function getIteratorInstance () {
+ return $this->iteratorInstance;
}
/**
- * Setter for controller name
+ * Setter for state instance
*
- * @param $controllerName Last validated controller name
+ * @param $stateInstance A Stateable instance
* @return void
*/
- protected final function setControllerName ($controllerName) {
- $this->controllerName = $controllerName;
+ public final function setStateInstance (Stateable $stateInstance) {
+ $this->stateInstance = $stateInstance;
}
/**
- * Getter for controller name
+ * Getter for state instance
*
- * @return $controllerName Last validated controller name
+ * @return $stateInstance A Stateable instance
*/
- protected final function getControllerName () {
- return $this->controllerName;
+ public final function getStateInstance () {
+ return $this->stateInstance;
}
/**
- * Getter for protocol name
+ * Setter for call-back instance
*
- * @return $protocolName Name of used protocol
+ * @param $callbackInstance An instance of a FrameworkInterface class
+ * @return void
*/
- public final function getProtocolName () {
- return $this->protocolName;
+ public final function setCallbackInstance (FrameworkInterface $callbackInstance) {
+ $this->callbackInstance = $callbackInstance;
}
/**
- * Setter for protocol name
+ * Getter for call-back instance
*
- * @param $protocolName Name of used protocol
- * @return void
+ * @return $callbackInstance An instance of a FrameworkInterface class
*/
- protected final function setProtocolName ($protocolName) {
- $this->protocolName = $protocolName;
+ protected final function getCallbackInstance () {
+ return $this->callbackInstance;
}
/**
@@ -1663,35 +704,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
return crc32($this->__toString());
}
- /**
- * Formats computer generated price values into human-understandable formats
- * with thousand and decimal separators.
- *
- * @param $value The in computer format value for a price
- * @param $currency The currency symbol (use HTML-valid characters!)
- * @param $decNum Number of decimals after commata
- * @return $price The for the current language formated price string
- * @throws MissingDecimalsThousandsSeparatorException If decimals or
- * thousands separator
- * is missing
- */
- public function formatCurrency ($value, $currency = '€', $decNum = 2) {
- // Are all required attriutes set?
- if ((!isset($this->decimals)) || (!isset($this->thousands))) {
- // Throw an exception
- throw new MissingDecimalsThousandsSeparatorException($this, self::EXCEPTION_ATTRIBUTES_ARE_MISSING);
- } // END - if
-
- // Cast the number
- $value = (float) $value;
-
- // Reformat the US number
- $price = number_format($value, $decNum, $this->decimals, $this->thousands) . $currency;
-
- // Return as string...
- return $price;
- }
-
/**
* Appends a trailing slash to a string
*
@@ -1702,42 +714,12 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Is there a trailing slash?
if (substr($str, -1, 1) != '/') {
$str .= '/';
- } // END - if
+ }
// Return string with trailing slash
return $str;
}
- /**
- * Prepare the template engine (HtmlTemplateEngine by default) for a given
- * application helper instance (ApplicationHelper by default).
- *
- * @param $applicationInstance An application helper instance or
- * null if we shall use the default
- * @return $templateInstance The template engine instance
- * @throws NullPointerException If the discovered application
- * instance is still null
- */
- protected function prepareTemplateInstance (ManageableApplication $applicationInstance = NULL) {
- // Is the application instance set?
- if (is_null($applicationInstance)) {
- // Get the current instance
- $applicationInstance = Registry::getRegistry()->getInstance('app');
-
- // Still null?
- if (is_null($applicationInstance)) {
- // Thrown an exception
- throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
- } // END - if
- } // END - if
-
- // Initialize the template engine
- $templateInstance = ObjectFactory::createObjectByConfiguredName('html_template_class');
-
- // Return the prepared instance
- return $templateInstance;
- }
-
/**
* Debugs this instance by putting out it's full content
*
@@ -1754,8 +736,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Is a message set?
if (!empty($message)) {
// Construct message
- $content = sprintf('Message: %s
' . PHP_EOL, $message);
- } // END - if
+ $content = sprintf('
+ Message: %s
+
' . PHP_EOL, $message);
+ }
// Generate the output
$content .= sprintf('%s
',
@@ -1767,7 +751,16 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
);
// Output it
- ApplicationEntryPoint::app_exit(sprintf('%s
Loaded includes: %s
',
+ ApplicationEntryPoint::exitApplication(sprintf('
+
+ %s
+
+Loaded includes:
+
+ %s
+
',
$this->__toString(),
$content,
ClassLoader::getSelfInstance()->getPrintableIncludeList()
@@ -1800,25 +793,14 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
* @return void
*/
protected function partialStub ($message = '') {
- // Get the backtrace
- $backtrace = debug_backtrace();
-
- // Generate the class::method string
- $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!',
- $methodName
- );
+ // Init variable
+ $stubMessage = 'Partial stub!';
- // Is the extra message given?
+ // Is an extra message given?
if (!empty($message)) {
// Then add it as well
$stubMessage .= ' Message: ' . $message;
- } // END - if
+ }
// Debug instance is there?
if (!is_null($this->getDebugInstance())) {
@@ -1843,7 +825,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
if (!empty($message)) {
// Output message
printf('Message: %s
' . PHP_EOL, $message);
- } // END - if
+ }
print('');
debug_print_backtrace();
@@ -1852,7 +834,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Exit program?
if ($doExit === true) {
exit();
- } // END - if
+ }
}
/**
@@ -1865,14 +847,14 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
*/
public final static function createDebugInstance ($className, $lineNumber = NULL) {
// Is the instance set?
- if (!Registry::getRegistry()->instanceExists('debug')) {
+ if (!GenericRegistry::getRegistry()->instanceExists('debug')) {
// Init debug instance
$debugInstance = NULL;
// Try it
try {
// Get a debugger instance
- $debugInstance = DebugMiddleware::createDebugMiddleware(FrameworkConfiguration::getSelfInstance()->getConfigEntry('debug_' . FrameworkBootstrap::getRequestTypeFromSystem() . '_class'), $className);
+ $debugInstance = DebugMiddleware::createDebugMiddleware(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('debug_' . FrameworkBootstrap::getRequestTypeFromSystem() . '_class'), $className);
} catch (NullPointerException $e) {
// Didn't work, no instance there
exit(sprintf('Cannot create debugInstance! Exception=%s,message=%s,className=%s,lineNumber=%d' . PHP_EOL, $e->__toString(), $e->getMessage(), $className, $lineNumber));
@@ -1881,11 +863,11 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Empty string should be ignored and used for testing the middleware
DebugMiddleware::getSelfInstance()->output('');
- // Set it in its own class. This will set it in the registry
- $debugInstance->setDebugInstance($debugInstance);
+ // Set it in registry
+ GenericRegistry::getRegistry()->addInstance('debug', $debugInstance);
} else {
// Get instance from registry
- $debugInstance = Registry::getRegistry()->getDebugInstance();
+ $debugInstance = GenericRegistry::getRegistry()->getDebugInstance();
}
// Return it
@@ -1917,6 +899,28 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Set debug instance to NULL
$debugInstance = NULL;
+ // Get backtrace
+ $backtrace = debug_backtrace(!DEBUG_BACKTRACE_PROVIDE_OBJECT);
+
+ // Is function partialStub/__callStatic ?
+ if (in_array($backtrace[1]['function'], array('partialStub', '__call', '__callStatic'))) {
+ // Prepend class::function:line from 3rd element
+ $message = sprintf('[%s::%s:%d]: %s',
+ $backtrace[2]['class'],
+ $backtrace[2]['function'],
+ (isset($backtrace[2]['line']) ? $backtrace[2]['line'] : '0'),
+ $message
+ );
+ } else {
+ // Prepend class::function:line from 2nd element
+ $message = sprintf('[%s::%s:%d]: %s',
+ $backtrace[1]['class'],
+ $backtrace[1]['function'],
+ (isset($backtrace[1]['line']) ? $backtrace[1]['line'] : '0'),
+ $message
+ );
+ }
+
// Try it:
try {
// Get debug instance
@@ -1933,13 +937,13 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
if ($doPrint === false) {
// Die here if not printed
exit();
- } // END - if
+ }
} else {
// Are debug times enabled?
- if ($this->getConfigInstance()->getConfigEntry('debug_' . FrameworkBootstrap::getRequestTypeFromSystem() . '_output_timings') == 'Y') {
+ if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('debug_' . FrameworkBootstrap::getRequestTypeFromSystem() . '_output_timings') == 'Y') {
// Prepent it
$message = $this->getPrintableExecutionTime() . $message;
- } // END - if
+ }
// Put directly out
if ($doPrint === true) {
@@ -1952,43 +956,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
}
}
- /**
- * Converts e.g. a command from URL to a valid class by keeping out bad characters
- *
- * @param $str The string, what ever it is needs to be converted
- * @return $className Generated class name
- */
- public static final function convertToClassName ($str) {
- // Init class name
- $className = '';
-
- // Convert all dashes in underscores
- $str = self::convertDashesToUnderscores($str);
-
- // Now use that underscores to get classname parts for hungarian style
- foreach (explode('_', $str) as $strPart) {
- // Make the class name part lower case and first upper case
- $className .= ucfirst(strtolower($strPart));
- } // END - foreach
-
- // Return class name
- 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 static 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
*
@@ -2011,7 +978,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
$errorArray['message'],
$errorArray['type']
);
- } // END - if
+ }
// Add line number to the code
foreach (explode(chr(10), $phpCode) as $lineNo => $code) {
@@ -2020,79 +987,12 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
($lineNo + 1),
htmlentities($code, ENT_QUOTES)
);
- } // END - foreach
+ }
// Return the code
return $markedCode;
}
- /**
- * Filter a given GMT timestamp (non Uni* stamp!) to make it look more
- * beatiful for web-based front-ends. If null is given a message id
- * null_timestamp will be resolved and returned.
- *
- * @param $timestamp Timestamp to prepare (filter) for display
- * @return $readable A readable timestamp
- */
- public function doFilterFormatTimestamp ($timestamp) {
- // Default value to return
- $readable = '???';
-
- // Is the timestamp null?
- if (is_null($timestamp)) {
- // Get a message string
- $readable = $this->getLanguageInstance()->getMessage('null_timestamp');
- } else {
- 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]);
-
- // Construct the timestamp
- $readable = sprintf($this->getConfigInstance()->getConfigEntry('german_date_time'),
- $dateArray[0],
- $dateArray[1],
- $dateArray[2],
- $timeArray[0],
- $timeArray[1],
- $timeArray[2]
- );
- break;
-
- default: // Default is pass-through
- $readable = $timestamp;
- break;
- } // END - switch
- }
-
- // Return the stamp
- return $readable;
- }
-
- /**
- * Filter a given number into a localized number
- *
- * @param $value The raw value from e.g. database
- * @return $localized Localized value
- */
- public function doFilterFormatNumber ($value) {
- // Generate it from config and localize dependencies
- switch ($this->getLanguageInstance()->getLanguageCode()) {
- case 'de': // German format is a bit different to default
- $localized = number_format($value, $this->getConfigInstance()->getConfigEntry('decimals'), ',', '.');
- break;
-
- default: // US, etc.
- $localized = number_format($value, $this->getConfigInstance()->getConfigEntry('decimals'), '.', ',');
- break;
- } // END - switch
-
- // Return it
- return $localized;
- }
-
/**
* "Getter" for databse entry
*
@@ -2105,7 +1005,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
if (!$this->getResultInstance() instanceof SearchableResult) {
// Throw an exception here
throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
- } // END - if
+ }
// Rewind it
$this->getResultInstance()->rewind();
@@ -2114,7 +1014,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
if ($this->getResultInstance()->valid() === false) {
// @TODO Move the constant to e.g. BaseDatabaseResult when there is a non-cached database result available
throw new InvalidDatabaseResultException(array($this, $this->getResultInstance()), CachedDatabaseResult::EXCEPTION_INVALID_DATABASE_RESULT);
- } // END - if
+ }
// Get next entry
$this->getResultInstance()->next();
@@ -2133,7 +1033,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
* @return $fieldValue Field value from the user
* @throws NullPointerException If the result instance is null
*/
- public final function getField ($fieldName) {
+ public final function getField (string $fieldName) {
// Default field value
$fieldValue = NULL;
@@ -2144,14 +1044,14 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
if (is_null($resultInstance)) {
// Then the user instance is no longer valid (expired cookies?)
throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
- } // END - if
+ }
// Get current array
$fieldArray = $resultInstance->current();
//* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($fieldName.':'.print_r($fieldArray, true).'
');
// Convert dashes to underscore
- $fieldName2 = self::convertDashesToUnderscores($fieldName);
+ $fieldName2 = StringUtils::convertDashesToUnderscores($fieldName);
// Does the field exist?
if ($this->isFieldSet($fieldName)) {
@@ -2176,7 +1076,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
* @return $isSet Whether the given field name is set
* @throws NullPointerException If the result instance is null
*/
- public function isFieldSet ($fieldName) {
+ public function isFieldSet (string $fieldName) {
// Get result instance
$resultInstance = $this->getResultInstance();
@@ -2184,14 +1084,14 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
if (is_null($resultInstance)) {
// Then the user instance is no longer valid (expired cookies?)
throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
- } // END - if
+ }
// Get current array
$fieldArray = $resultInstance->current();
//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('[' . $this->__toString() . ':' . __LINE__ . '] fieldName=' . $fieldName . ',fieldArray='.print_r($fieldArray, true).'
');
// Convert dashes to underscore
- $fieldName = self::convertDashesToUnderscores($fieldName);
+ $fieldName = StringUtils::convertDashesToUnderscores($fieldName);
// Determine it
$isSet = isset($fieldArray[$fieldName]);
@@ -2219,7 +1119,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Yes, then send the whole result to the database layer
$wrapperInstance->doUpdateByResult($this->getResultInstance());
- } // END - if
+ }
}
/**
@@ -2302,143 +1202,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Return result
return $hasSlept;
}
- /**
- * Converts a hexadecimal string, even with negative sign as first string to
- * a decimal number using BC functions.
- *
- * This work is based on comment #86673 on php.net documentation page at:
- *
- *
- * @param $hex Hexadecimal string
- * @return $dec Decimal number
- */
- protected function hex2dec ($hex) {
- // Convert to all lower-case
- $hex = strtolower($hex);
-
- // Detect sign (negative/positive numbers)
- $sign = '';
- if (substr($hex, 0, 1) == '-') {
- $sign = '-';
- $hex = substr($hex, 1);
- } // END - if
-
- // Decode the hexadecimal string into a decimal number
- $dec = 0;
- for ($i = strlen($hex) - 1, $e = 1; $i >= 0; $i--, $e = bcmul($e, 16)) {
- $factor = self::$hexdec[substr($hex, $i, 1)];
- $dec = bcadd($dec, bcmul($factor, $e));
- } // END - for
-
- // Return the decimal number
- return $sign . $dec;
- }
-
- /**
- * Converts even very large decimal numbers, also signed, to a hexadecimal
- * string.
- *
- * This work is based on comment #97756 on php.net documentation page at:
- *
- *
- * @param $dec Decimal number, even with negative sign
- * @param $maxLength Optional maximum length of the string
- * @return $hex Hexadecimal string
- */
- protected function dec2hex ($dec, $maxLength = 0) {
- // maxLength can be zero or devideable by 2
- assert(($maxLength == 0) || (($maxLength % 2) == 0));
-
- // Detect sign (negative/positive numbers)
- $sign = '';
- if ($dec < 0) {
- $sign = '-';
- $dec = abs($dec);
- } // END - if
-
- // Encode the decimal number into a hexadecimal string
- $hex = '';
- do {
- $hex = self::$dechex[($dec % (2 ^ 4))] . $hex;
- $dec /= (2 ^ 4);
- } while ($dec >= 1);
-
- /*
- * Leading zeros are required for hex-decimal "numbers". In some
- * situations more leading zeros are wanted, so check for both
- * conditions.
- */
- if ($maxLength > 0) {
- // Prepend more zeros
- $hex = str_pad($hex, $maxLength, '0', STR_PAD_LEFT);
- } elseif ((strlen($hex) % 2) != 0) {
- // Only make string's length dividable by 2
- $hex = '0' . $hex;
- }
-
- // Return the hexadecimal string
- return $sign . $hex;
- }
-
- /**
- * Converts a ASCII string (0 to 255) into a decimal number.
- *
- * @param $asc The ASCII string to be converted
- * @return $dec Decimal number
- */
- protected function asc2dec ($asc) {
- // Convert it into a hexadecimal number
- $hex = bin2hex($asc);
-
- // And back into a decimal number
- $dec = $this->hex2dec($hex);
-
- // Return it
- return $dec;
- }
-
- /**
- * Converts a decimal number into an ASCII string.
- *
- * @param $dec Decimal number
- * @return $asc An ASCII string
- */
- protected function dec2asc ($dec) {
- // First convert the number into a hexadecimal string
- $hex = $this->dec2hex($dec);
-
- // Then convert it into the ASCII string
- $asc = $this->hex2asc($hex);
-
- // Return it
- return $asc;
- }
-
- /**
- * Converts a hexadecimal number into an ASCII string. Negative numbers
- * are not allowed.
- *
- * @param $hex Hexadecimal string
- * @return $asc An ASCII string
- */
- protected function hex2asc ($hex) {
- // Check for length, it must be devideable by 2
- //* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('hex='.$hex);
- assert((strlen($hex) % 2) == 0);
-
- // Walk the string
- $asc = '';
- for ($idx = 0; $idx < strlen($hex); $idx+=2) {
- // Get the decimal number of the chunk
- $part = hexdec(substr($hex, $idx, 2));
-
- // Add it to the final string
- $asc .= chr($part);
- } // END - for
-
- // Return the final string
- return $asc;
- }
/**
* Checks whether the given encoded data was encoded with Base64
@@ -2461,15 +1224,16 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
* @param $onlyKeys Only use these keys for a cache key
* @return $cacheKey A cache key suitable for lookup/storage purposes
*/
- protected function getCacheKeyByCriteria (Criteria $criteriaInstance, array $onlyKeys = array()) {
+ protected function getCacheKeyByCriteria (Criteria $criteriaInstance, array $onlyKeys = []) {
// Generate it
+ //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-FRAMEWORK-SYSTEM: criteriaInstance=' . $criteriaInstance->__toString() . ',onlyKeys()=' . count($onlyKeys) . ' - CALLED!');
$cacheKey = sprintf('%s@%s',
$this->__toString(),
$criteriaInstance->getCacheKey($onlyKeys)
);
// And return it
- //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($this->__toString() . ': cacheKey=' . $cacheKey);
+ //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-FRAMEWORK-SYSTEM: cacheKey=' . $cacheKey . ' - EXIT!');
return $cacheKey;
}
@@ -2524,7 +1288,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
if (is_null(self::$hashLength)) {
// No, then hash a string and save its length.
self::$hashLength = strlen(self::hash('abc123'));
- } // END - if
+ }
// Return it
return self::$hashLength;
@@ -2546,13 +1310,13 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
if ($castValue === true) {
// Cast to biggest numeric type
$ret = (double) $ret;
- } // END - if
+ }
// Assert only if requested
if ($assertMismatch === true) {
// Has the whole value changed?
assert(('' . $ret . '' != '' . $num . '') && (!is_null($num)));
- } // END - if
+ }
// Return result
return $ret;
@@ -2573,7 +1337,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
if ($assertMismatch === true) {
// Has the whole value changed?
assert(('' . $ret . '' != '' . $num . '') && (!is_null($num)));
- } // END - if
+ }
// Return result
return $ret;
@@ -2649,7 +1413,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// No, then abort here
trigger_error(__METHOD__ . ': keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ' not found.');
exit;
- } // END - if
+ }
//Â Debug message
//* NOISY-DEBUG: */ $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',value=' . print_r($this->genericArray[$keyGroup][$subGroup], true));
@@ -2774,10 +1538,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Already initialized
trigger_error(__METHOD__ . ':keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ' already initialized.');
exit;
- } // END - if
+ }
// Initialize it
- $this->genericArray[$keyGroup][$subGroup] = array();
+ $this->genericArray[$keyGroup][$subGroup] = [];
}
/**
@@ -2798,10 +1562,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Already initialized
trigger_error(__METHOD__ . ':keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ' already initialized.');
exit;
- } // END - if
+ }
// Initialize it
- $this->genericArray[$keyGroup][$subGroup][$key] = array();
+ $this->genericArray[$keyGroup][$subGroup][$key] = [];
}
/**
@@ -2823,10 +1587,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Already initialized
trigger_error(__METHOD__ . ':keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ',element=' . $element . ' already initialized.');
exit;
- } // END - if
+ }
// Initialize it
- $this->genericArray[$keyGroup][$subGroup][$key][$element] = array();
+ $this->genericArray[$keyGroup][$subGroup][$key][$element] = [];
}
/**
@@ -2846,7 +1610,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
if (!$this->isGenericArrayKeySet($keyGroup, $subGroup, $key)) {
// Initialize array
$this->initGenericArrayKey($keyGroup, $subGroup, $key);
- } // END - if
+ }
// Then push it
$count = array_push($this->genericArray[$keyGroup][$subGroup][$key], $value);
@@ -2875,7 +1639,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
if (!$this->isGenericArrayElementSet($keyGroup, $subGroup, $key, $element)) {
// Initialize array
$this->initGenericArrayElement($keyGroup, $subGroup, $key, $element);
- } // END - if
+ }
// Then push it
$count = array_push($this->genericArray[$keyGroup][$subGroup][$key][$element], $value);
@@ -2903,7 +1667,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Not found
trigger_error(__METHOD__ . ': keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ' not found.');
exit;
- } // END - if
+ }
// Then "pop" it
$value = array_pop($this->genericArray[$keyGroup][$subGroup][$key]);
@@ -2931,7 +1695,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Not found
trigger_error(__METHOD__ . ': keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ' not found.');
exit;
- } // END - if
+ }
// Then "shift" it
$value = array_shift($this->genericArray[$keyGroup][$subGroup][$key]);
@@ -2957,7 +1721,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Abort here
trigger_error(__METHOD__ . ': keyGroup=' . $keyGroup . ' not found.');
exit;
- } // END - if
+ }
// Then count it
$count = count($this->genericArray[$keyGroup]);
@@ -2985,7 +1749,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Abort here
trigger_error(__METHOD__ . ': keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ' not found.');
exit;
- } // END - if
+ }
// Then count it
$count = count($this->genericArray[$keyGroup][$subGroup]);
@@ -3045,7 +1809,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Then abort here
trigger_error(__METHOD__ . ': keyGroup=' . $keyGroup . ' does not exist.');
exit;
- } // END - if
+ }
// Return it
return $this->genericArray[$keyGroup];
@@ -3085,7 +1849,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Then abort here
trigger_error(__METHOD__ . ': keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ' does not exist.');
exit;
- } // END - if
+ }
// Return it
return $this->genericArray[$keyGroup][$subGroup][$key];
@@ -3127,7 +1891,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Then abort here
trigger_error(__METHOD__ . ': keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ',element=' . $element . ' does not exist.');
exit;
- } // END - if
+ }
// Return it
return $this->genericArray[$keyGroup][$subGroup][$key][$element];
@@ -3177,7 +1941,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
*/
protected function initWebOutputInstance () {
// Get application instance
- $applicationInstance = Registry::getRegistry()->getInstance('app');
+ $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
// Init web output instance
$outputInstance = ObjectFactory::createObjectByConfiguredName('output_class', array($applicationInstance));
@@ -3192,7 +1956,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
* @param $boolean Boolean value
* @return $translated Translated boolean value
*/
- public static final function translateBooleanToYesNo ($boolean) {
+ public static final function translateBooleanToYesNo (bool $boolean) {
// Make sure it is really boolean
assert(is_bool($boolean));
@@ -3203,104 +1967,36 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
return $translated;
}
- /**
- * Encodes raw data (almost any type) by "serializing" it and then pack it
- * into a "binary format".
- *
- * @param $rawData Raw data (almost any type)
- * @return $encoded Encoded data
- */
- protected function encodeData ($rawData) {
- // Make sure no objects or resources pass through
- assert(!is_object($rawData));
- assert(!is_resource($rawData));
-
- // First "serialize" it (json_encode() is faster than serialize())
- $encoded = $this->packString(json_encode($rawData));
-
- // And return it
- return $encoded;
- }
-
- /**
- * Pack a string into a "binary format". Please execuse me that this is
- * widely undocumented. :-(
- *
- * @param $str Unpacked string
- * @return $packed Packed string
- * @todo Improve documentation
- */
- protected function packString ($str) {
- // Debug message
- //* NOISY-DEBUG */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('str=' . $str . ' - CALLED!');
-
- // First compress the string (gzcompress is okay)
- $str = gzcompress($str);
-
- // Init variable
- $packed = '';
-
- // And start the "encoding" loop
- for ($idx = 0; $idx < strlen($str); $idx += $this->packingData[$this->archArrayElement]['step']) {
- $big = 0;
- for ($i = 0; $i < $this->packingData[$this->archArrayElement]['step']; $i++) {
- $factor = ($this->packingData[$this->archArrayElement]['step'] - 1 - $i);
-
- if (($idx + $i) <= strlen($str)) {
- $ord = ord(substr($str, ($idx + $i), 1));
-
- $add = $ord * pow(256, $factor);
-
- $big += $add;
-
- //print 'idx=' . $idx . ',i=' . $i . ',ord=' . $ord . ',factor=' . $factor . ',add=' . $add . ',big=' . $big . PHP_EOL;
- } // END - if
- } // END - for
-
- $l = ($big & $this->packingData[$this->archArrayElement]['left']) >>$this->packingData[$this->archArrayElement]['factor'];
- $r = $big & $this->packingData[$this->archArrayElement]['right'];
-
- $chunk = str_pad(pack($this->packingData[$this->archArrayElement]['format'], $l, $r), 8, '0', STR_PAD_LEFT);
- //* NOISY-DEBUG */ print 'big=' . $big . ',chunk('.strlen($chunk) . ')='.md5($chunk).PHP_EOL;
-
- $packed .= $chunk;
- } // END - for
-
- // Return it
- //* NOISY-DEBUG */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('packed=' . $packed . ' - EXIT!');
- return $packed;
- }
-
/**
* Creates a full-qualified file name (FQFN) for given file name by adding
* a configured temporary file path to it.
*
- * @param $fileName Name for temporary file
- * @return $fqfn Full-qualified file name
+ * @param $infoInstance An instance of a SplFileInfo class
+ * @return $tempInstance An instance of a SplFileInfo class (temporary file)
* @throw PathWriteProtectedException If the path in 'temp_file_path' is write-protected
* @throws FileIoException If the file cannot be written
*/
- protected static function createTempPathForFile ($fileName) {
+ protected static function createTempPathForFile (SplFileInfo $infoInstance) {
// Get config entry
- $basePath = FrameworkConfiguration::getSelfInstance()->getConfigEntry('temp_file_path');
+ $basePath = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('temp_file_path');
// Is the path writeable?
if (!is_writable($basePath)) {
// Path is write-protected
- throw new PathWriteProtectedException($fileName, self::EXCEPTION_PATH_CANNOT_BE_WRITTEN);
- } // END - if
+ throw new PathWriteProtectedException($infoInstance, self::EXCEPTION_PATH_CANNOT_BE_WRITTEN);
+ }
// Add it
- $fqfn = $basePath . '/' . $fileName;
+ $tempInstance = new SplFileInfo($basePath . DIRECTORY_SEPARATOR . $infoInstance->getBasename());
// Is it reachable?
- if (!FrameworkBootstrap::isReachableFilePath($fqfn)) {
+ if (!FrameworkBootstrap::isReachableFilePath($tempInstance)) {
// Not reachable
- throw new FileIoException($fqfn, self::EXCEPTION_FILE_NOT_REACHABLE);
- } // END - if
+ throw new FileIoException($tempInstance, self::EXCEPTION_FILE_NOT_REACHABLE);
+ }
// Return it
- return $fqfn;
+ return $tempInstance;
}
/**
@@ -3319,7 +2015,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
if ($stateInstance instanceof Stateable) {
// Then use that state name
$stateName = $stateInstance->getStateName();
- } // END - if
+ }
// Return result
return $stateName;