]> git.mxchange.org Git - core.git/blobdiff - framework/main/classes/class_BaseFrameworkSystem.php
Continued:
[core.git] / framework / main / classes / class_BaseFrameworkSystem.php
index a9385580a18f2e20fecb6b6c3835471f112ec37d..4b481128041aae298adee3ecf301c608ce063e49 100644 (file)
@@ -5,40 +5,28 @@ namespace Org\Mxchange\CoreFramework\Object;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Criteria\Criteria;
-use Org\Mxchange\CoreFramework\Criteria\Local\LocalSearchCriteria;
-use Org\Mxchange\CoreFramework\Criteria\Local\LocalUpdateCriteria;
 use Org\Mxchange\CoreFramework\Crypto\Cryptable;
-use Org\Mxchange\CoreFramework\Crypto\RandomNumber\RandomNumberGenerator;
 use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper;
 use Org\Mxchange\CoreFramework\EntryPoint\ApplicationEntryPoint;
 use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Filesystem\FilePointer;
 use Org\Mxchange\CoreFramework\Filesystem\PathWriteProtectedException;
 use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
 use Org\Mxchange\CoreFramework\Generic\NullPointerException;
 use Org\Mxchange\CoreFramework\Generic\UnsupportedOperationException;
 use Org\Mxchange\CoreFramework\Handler\Handleable;
-use Org\Mxchange\CoreFramework\Helper\Helper;
-use Org\Mxchange\CoreFramework\Lists\Listable;
 use Org\Mxchange\CoreFramework\Loader\ClassLoader;
-use Org\Mxchange\CoreFramework\Localization\ManageableLanguage;
 use Org\Mxchange\CoreFramework\Manager\ManageableApplication;
-use Org\Mxchange\CoreFramework\Menu\RenderableMenu;
 use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware;
-use Org\Mxchange\CoreFramework\Parser\Parseable;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Result\Database\CachedDatabaseResult;
 use Org\Mxchange\CoreFramework\Result\Search\SearchableResult;
-use Org\Mxchange\CoreFramework\Stacker\Stackable;
 use Org\Mxchange\CoreFramework\State\Stateable;
 use Org\Mxchange\CoreFramework\Stream\Input\InputStream;
 use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer;
 use Org\Mxchange\CoreFramework\Stream\Output\OutputStream;
-use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 use Org\Mxchange\CoreFramework\User\ManageableAccount;
 use Org\Mxchange\CoreFramework\Utils\String\StringUtils;
-use Org\Mxchange\CoreFramework\Visitor\Visitor;
 
 // Import SPL stuff
 use \stdClass;
@@ -86,21 +74,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         */
        private $realClass = __CLASS__;
 
-       /**
-        * Search criteria instance
-        */
-       private $searchInstance = NULL;
-
-       /**
-        * Update criteria instance
-        */
-       private $updateInstance = NULL;
-
-       /**
-        * Template engine instance
-        */
-       private $templateInstance = NULL;
-
        /**
         * Database result instance
         */
@@ -111,11 +84,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         */
        private $userInstance = NULL;
 
-       /**
-        * Instance of a RNG
-        */
-       private $rngInstance = NULL;
-
        /**
         * Instance of a crypto helper
         */
@@ -126,36 +94,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         */
        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 Parseable instance
-        */
-       private $parserInstance = NULL;
-
-       /**
-        * A helper instance for the form
-        */
-       private $helperInstance = NULL;
-
        /**
         * An instance of a InputStream class
         */
@@ -171,21 +109,11 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         */
        private $handlerInstance = NULL;
 
-       /**
-        * Visitor handler instance
-        */
-       private $visitorInstance = 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;
-
        /**
         * State instance
         */
@@ -199,7 +127,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
        /**
         * Generic array
         */
-       private $genericArray = array();
+       private $genericArray = [];
 
        /***********************
         * Exception codes.... *
@@ -289,7 +217,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
                if (self::$startupTime == 0) {
                        // Then set it
                        self::$startupTime = microtime(true);
-               } // END - if
+               }
        }
 
        /**
@@ -324,7 +252,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         * @args        $args                   Arguments passed to the method
         * @return      void
         */
-       public final function __call ($methodName, $args) {
+       public final function __call (string $methodName, array $args = NULL) {
                // Set self-instance
                self::$instance = $this;
 
@@ -343,11 +271,9 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         * @return      void
         * @throws      InvalidArgumentException If self::$instance is not a framework's own object
         */
-       public static final function __callStatic ($methodName, $args) {
-               // Trace message
-               //* PRINT-DEBUG: */ printf('[%s:%d]: methodName=%s,args[]=%s - CALLED!' . PHP_EOL, __METHOD__, __LINE__, $methodName, gettype($args));
-
+       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));
                $argsString = '';
                $className = 'unknown';
 
@@ -401,19 +327,16 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
 
                                // Comma for next one
                                $argsString .= ', ';
-                       } // END - foreach
+                       }
 
                        // 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 = sprintf('!INVALID:%s!', gettype($args));
                }
 
                // Output stub message
@@ -444,7 +367,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         * @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),
@@ -458,7 +381,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         * @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
                ));
@@ -470,7 +393,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         * @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
                ));
@@ -512,9 +435,9 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         * @param       $realClass      Class name (string)
         * @return      void
         */
-       public final function setRealClass ($realClass) {
+       public final function setRealClass (string $realClass) {
                // Set real class
-               $this->realClass = (string) $realClass;
+               $this->realClass = $realClass;
        }
 
        /**
@@ -537,63 +460,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
                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 debug instance
         *
@@ -637,27 +503,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
                return $webOutputInstance;
        }
 
-       /**
-        * Private getter for language instance
-        *
-        * @return      $langInstance   An instance to the language sub-system
-        */
-       protected final function getLanguageInstance () {
-               $langInstance = GenericRegistry::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) {
-               GenericRegistry::getRegistry()->addInstance('language', $langInstance);
-       }
-
        /**
         * Protected setter for user instance
         *
@@ -677,25 +522,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
                return $this->userInstance;
        }
 
-       /**
-        * 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
         *
@@ -715,101 +541,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
                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 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 DatabaseWrapper instance
         *
@@ -829,25 +560,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
                return $this->wrapperInstance;
        }
 
-       /**
-        * 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;
-       }
-
        /**
         * Getter for a InputStream instance
         *
@@ -905,25 +617,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
                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 Iterator instance
         *
@@ -943,41 +636,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
                return $this->iteratorInstance;
        }
 
-       /**
-        * Setter for FilePointer instance
-        *
-        * @param       $pointerInstance        An instance of an FilePointer class
-        * @return      void
-        */
-       protected final function setPointerInstance (FilePointer $pointerInstance) {
-               $this->pointerInstance = $pointerInstance;
-       }
-
-       /**
-        * Getter for FilePointer instance
-        *
-        * @return      $pointerInstance        An instance of an FilePointer class
-        */
-       public final function getPointerInstance () {
-               return $this->pointerInstance;
-       }
-
-       /**
-        * 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.
-        *
-        * @return      void
-        */
-       protected final function unsetPointerInstance () {
-               // Simply it to NULL
-               $this->pointerInstance = NULL;
-       }
-
        /**
         * Setter for state instance
         *
@@ -1056,42 +714,12 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
                // 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 = GenericRegistry::getRegistry()->getInstance('application');
-
-                       // 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
         *
@@ -1111,7 +739,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
                        $content = sprintf('<div class="debug_message">
        Message: %s
 </div>' . PHP_EOL, $message);
-               } // END - if
+               }
 
                // Generate the output
                $content .= sprintf('<pre>%s</pre>',
@@ -1172,7 +800,7 @@ Loaded includes:
                if (!empty($message)) {
                        // Then add it as well
                        $stubMessage .= ' Message: ' . $message;
-               } // END - if
+               }
 
                // Debug instance is there?
                if (!is_null($this->getDebugInstance())) {
@@ -1197,7 +825,7 @@ Loaded includes:
                if (!empty($message)) {
                        // Output message
                        printf('Message: %s<br />' . PHP_EOL, $message);
-               } // END - if
+               }
 
                print('<pre>');
                debug_print_backtrace();
@@ -1206,7 +834,7 @@ Loaded includes:
                // Exit program?
                if ($doExit === true) {
                        exit();
-               } // END - if
+               }
        }
 
        /**
@@ -1309,13 +937,13 @@ Loaded includes:
                        if ($doPrint === false) {
                                // Die here if not printed
                                exit();
-                       } // END - if
+                       }
                } else {
                        // Are debug times enabled?
                        if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('debug_' . FrameworkBootstrap::getRequestTypeFromSystem() . '_output_timings') == 'Y') {
                                // Prepent it
                                $message = $this->getPrintableExecutionTime() . $message;
-                       } // END - if
+                       }
 
                        // Put directly out
                        if ($doPrint === true) {
@@ -1350,7 +978,7 @@ Loaded includes:
                                $errorArray['message'],
                                $errorArray['type']
                        );
-               } // END - if
+               }
 
                // Add line number to the code
                foreach (explode(chr(10), $phpCode) as $lineNo => $code) {
@@ -1359,79 +987,12 @@ Loaded includes:
                                ($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(FrameworkBootstrap::getConfigurationInstance()->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, FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('decimals'), ',', '.');
-                               break;
-
-                       default: // US, etc.
-                               $localized = number_format($value, FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('decimals'), '.', ',');
-                               break;
-               } // END - switch
-
-               // Return it
-               return $localized;
-       }
-
        /**
         * "Getter" for databse entry
         *
@@ -1444,7 +1005,7 @@ Loaded includes:
                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();
@@ -1453,7 +1014,7 @@ Loaded includes:
                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();
@@ -1483,7 +1044,7 @@ Loaded includes:
                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();
@@ -1523,7 +1084,7 @@ Loaded includes:
                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();
@@ -1558,7 +1119,7 @@ Loaded includes:
 
                        // Yes, then send the whole result to the database layer
                        $wrapperInstance->doUpdateByResult($this->getResultInstance());
-               } // END - if
+               }
        }
 
        /**
@@ -1663,7 +1224,7 @@ Loaded includes:
         * @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',
@@ -1727,7 +1288,7 @@ Loaded includes:
                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;
@@ -1749,13 +1310,13 @@ Loaded includes:
                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;
@@ -1776,7 +1337,7 @@ Loaded includes:
                if ($assertMismatch === true) {
                        // Has the whole value changed?
                        assert(('' . $ret . '' != '' . $num . '') && (!is_null($num)));
-               } // END - if
+               }
 
                // Return result
                return $ret;
@@ -1852,7 +1413,7 @@ Loaded includes:
                        // 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));
@@ -1977,10 +1538,10 @@ Loaded includes:
                        // 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] = [];
        }
 
        /**
@@ -2001,10 +1562,10 @@ Loaded includes:
                        // 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] = [];
        }
 
        /**
@@ -2026,10 +1587,10 @@ Loaded includes:
                        // 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] = [];
        }
 
        /**
@@ -2049,7 +1610,7 @@ Loaded includes:
                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);
@@ -2078,7 +1639,7 @@ Loaded includes:
                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);
@@ -2106,7 +1667,7 @@ Loaded includes:
                        // 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]);
@@ -2134,7 +1695,7 @@ Loaded includes:
                        // 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]);
@@ -2160,7 +1721,7 @@ Loaded includes:
                        // Abort here
                        trigger_error(__METHOD__ . ': keyGroup=' . $keyGroup . ' not found.');
                        exit;
-               } // END - if
+               }
 
                // Then count it
                $count = count($this->genericArray[$keyGroup]);
@@ -2188,7 +1749,7 @@ Loaded includes:
                        // Abort here
                        trigger_error(__METHOD__ . ': keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ' not found.');
                        exit;
-               } // END - if
+               }
 
                // Then count it
                $count = count($this->genericArray[$keyGroup][$subGroup]);
@@ -2248,7 +1809,7 @@ Loaded includes:
                        // Then abort here
                        trigger_error(__METHOD__ . ': keyGroup=' . $keyGroup . ' does not exist.');
                        exit;
-               } // END - if
+               }
 
                // Return it
                return $this->genericArray[$keyGroup];
@@ -2288,7 +1849,7 @@ Loaded includes:
                        // 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];
@@ -2330,7 +1891,7 @@ Loaded includes:
                        // 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];
@@ -2423,7 +1984,7 @@ Loaded includes:
                if (!is_writable($basePath)) {
                        // Path is write-protected
                        throw new PathWriteProtectedException($infoInstance, self::EXCEPTION_PATH_CANNOT_BE_WRITTEN);
-               } // END - if
+               }
 
                // Add it
                $tempInstance = new SplFileInfo($basePath . DIRECTORY_SEPARATOR . $infoInstance->getBasename());
@@ -2432,7 +1993,7 @@ Loaded includes:
                if (!FrameworkBootstrap::isReachableFilePath($tempInstance)) {
                        // Not reachable
                        throw new FileIoException($tempInstance, self::EXCEPTION_FILE_NOT_REACHABLE);
-               } // END - if
+               }
 
                // Return it
                return $tempInstance;
@@ -2454,7 +2015,7 @@ Loaded includes:
                if ($stateInstance instanceof Stateable) {
                        // Then use that state name
                        $stateName = $stateInstance->getStateName();
-               } // END - if
+               }
 
                // Return result
                return $stateName;