X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=application%2Ftests%2Fclass_ApplicationHelper.php;h=e21b875187296915dd838ba9119515da84b91dfc;hp=cc0f574983ff6c627d5187127f255b278ff09d43;hb=HEAD;hpb=24814f48bc7bad92f55e8763bf3f657fb41b131d diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php index cc0f5749..161f9fc2 100644 --- a/application/tests/class_ApplicationHelper.php +++ b/application/tests/class_ApplicationHelper.php @@ -1,16 +1,17 @@ * @version 0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2023 Core Developer Team * @license GNU GPL 3.0 or any newer version * * This program is free software: you can redistribute it and/or modify @@ -51,33 +52,13 @@ use CoreFramework\Template\CompileableTemplate; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplication, Registerable { - /** - * The version number of this application - */ - private $appVersion = ''; - - /** - * The human-readable name for this application - */ - private $appName = ''; - - /** - * The short uni*-like name for this application - */ - private $shortName = ''; - - /** - * An instance of this class - */ - private static $selfInstance = NULL; - +class ApplicationHelper extends BaseApplication implements ManageableApplication, Registerable { /** * Private constructor * * @return void */ - protected function __construct () { + private function __construct () { // Call parent constructor parent::__construct(__CLASS__); } @@ -89,71 +70,13 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica */ public static final function getSelfInstance () { // Is the instance there? - if (is_null(self::$selfInstance)) { - self::$selfInstance = new ApplicationHelper(); - } // END - if + if (is_null(self::getApplicationInstance())) { + // Then set it + self::setApplicationInstance(new ApplicationHelper()); + } // Return the instance - return self::$selfInstance; - } - - /** - * Getter for the version number - * - * @return $appVersion The application's version number - */ - public final function getAppVersion () { - return $this->appVersion; - } - /** - * Setter for the version number - * - * @param $appVersion The application's version number - * @return void - */ - public final function setAppVersion ($appVersion) { - // Cast and set it - $this->appVersion = (string) $appVersion; - } - - /** - * Getter for human-readable name - * - * @return $appName The application's human-readable name - */ - public final function getAppName () { - return $this->appName; - } - - /** - * Setter for human-readable name - * - * @param $appName The application's human-readable name - * @return void - */ - public final function setAppName ($appName) { - // Cast and set it - $this->appName = (string) $appName;; - } - - /** - * Getter for short uni*-like name - * - * @return $shortName The application's short uni*-like name - */ - public final function getAppShortName () { - return $this->shortName; - } - - /** - * Setter for short uni*-like name - * - * @param $shortName The application's short uni*-like name - * @return void - */ - public final function setAppShortName ($shortName) { - // Cast and set it - $this->shortName = (string) $shortName; + return self::getApplicationInstance(); } /** @@ -174,9 +97,6 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica * @return void */ public function initApplication () { - // Get config instance - $cfg = FrameworkBootstrap::getConfigurationInstance(); - // Initialize output system self::createDebugInstance('ApplicationHelper'); @@ -185,15 +105,6 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica * method. */ FrameworkBootstrap::initDatabaseInstance(); - - // Register core tests - ClassLoader::registerTestsPath('framework/main/tests'); - - // Register own tests - ClassLoader::registerTestsPath('application/tests/tests'); - - // Scan for them now - ClassLoader::scanTestsClasses(); } /** @@ -216,18 +127,19 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica // Set it in request $requestInstance->setRequestElement('command', $commandName); - } // END - if + } - // Get a controller resolver - $resolverClass = sprintf( - 'CoreFramework\Tests\Resolver\Controller\%s', - self::convertToClassName(sprintf( - '%s_%s_controller_resolver', - $this->getAppShortName(), - FrameworkBootstrap::getRequestTypeFromSystem() - )) + // Configuration entry key + $configEntry = sprintf( + '%s_%s_controller_resolver_class', + $this->getAppShortName(), + FrameworkBootstrap::getRequestTypeFromSystem() ); - $resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this)); + + // Get a controller resolver instance + $resolverInstance = ObjectFactory::createObjectByConfiguredName($configEntry, [ + $commandName, + ]); // Get a controller instance as well $this->setControllerInstance($resolverInstance->resolveController()); @@ -236,9 +148,9 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica $this->getControllerInstance()->handleRequest($requestInstance, $responseInstance); // -------------------------- Shutdown phase -------------------------- - self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MAIN: Shutdown in progress ...'); + self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('MAIN: Shutdown in progress ...'); $this->getControllerInstance()->executeShutdownFilters($requestInstance, $responseInstance); - self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MAIN: Shutdown completed. (This is the last line.)'); + self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('MAIN: Shutdown completed. (This is the last line.)'); } /** @@ -252,7 +164,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica // Walk through all messages foreach ($messageList as $message) { exit(__METHOD__ . ':MSG:' . $message); - } // END - foreach + } } /** @@ -267,12 +179,12 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica /** * Assigns extra application-depending data * - * @param $templateInstance An instance of a CompileableTemplate + * @param $templateInstance An instance of a CompileableTemplate class * @return void * @todo Nothing to add? */ public function assignExtraTemplateData (CompileableTemplate $templateInstance) { - $this->partialStub('Unfinished method. templateInstance=' . $templateInstance->__toString()); + DebugMiddleware::getSelfInstance()->partialStub('Unfinished method. templateInstance=' . $templateInstance->__toString()); } }