From 30a00c6dd22ddcb962dd1bd36af475cbc46be71b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 7 Nov 2020 13:17:51 +0100 Subject: [PATCH] Continued: - moved class fields from ApplicationHelper to BaseApplication class as all application "helper" (manager) will have these fields - moved $controllerInstance to proper classes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- application/tests/class_ApplicationHelper.php | 92 +------------ .../application/class_BaseApplication.php | 124 ++++++++++++++++++ .../classes/class_BaseFrameworkSystem.php | 27 +--- .../classes/resolver/class_BaseResolver.php | 25 ++++ 4 files changed, 157 insertions(+), 111 deletions(-) diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php index 7559e433..e4ee7971 100644 --- a/application/tests/class_ApplicationHelper.php +++ b/application/tests/class_ApplicationHelper.php @@ -51,26 +51,6 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate; * along with this program. If not, see . */ class ApplicationHelper extends BaseApplication 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; - /** * Private constructor * @@ -88,71 +68,13 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication */ 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 (string $appVersion) { - // Cast and set it - $this->appVersion = $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 (string $appName) { - // Cast and set it - $this->appName = $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 (string $shortName) { - // Cast and set it - $this->shortName = (string) $shortName; + return self::getApplicationInstance(); } /** @@ -215,7 +137,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication // Set it in request $requestInstance->setRequestElement('command', $commandName); - } // END - if + } // Get a controller resolver $resolverClass = sprintf( @@ -251,7 +173,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication // Walk through all messages foreach ($messageList as $message) { exit(__METHOD__ . ':MSG:' . $message); - } // END - foreach + } } /** diff --git a/framework/main/classes/application/class_BaseApplication.php b/framework/main/classes/application/class_BaseApplication.php index cc541e3e..deb2f7af 100644 --- a/framework/main/classes/application/class_BaseApplication.php +++ b/framework/main/classes/application/class_BaseApplication.php @@ -3,6 +3,8 @@ namespace Org\Mxchange\CoreFramework\Application; // Import framework stuff +use Org\Mxchange\CoreFramework\Controller\Controller; +use Org\Mxchange\CoreFramework\Manager\ManageableApplication; use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; @@ -29,6 +31,31 @@ use Org\Mxchange\CoreFramework\Registry\GenericRegistry; * along with this program. If not, see . */ abstract class BaseApplication extends BaseFrameworkSystem { + /** + * 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 = ''; + + /** + * Own singleton instance of this application helper + */ + private static $applicationInstance = NULL; + + /** + * A controller instance + */ + private $controllerInstance = NULL; + /** * Protected constructor * @@ -43,4 +70,101 @@ abstract class BaseApplication extends BaseFrameworkSystem { GenericRegistry::getRegistry()->addInstance('application', $this); } + /** + * Getter for own instance + * + * @return $applicationInstance An instance of a ManageableApplication class + */ + public static final function getApplicationInstance () { + return self::$applicationInstance; + } + + /** + * Setter for own instance + * + * @param $applicationInstance An instance of a ManageableApplication class + */ + public static final function setApplicationInstance (ManageableApplication $applicationInstance) { + self::$applicationInstance = $applicationInstance; + } + + /** + * 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; + } + + /** + * 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 (string $appVersion) { + // Cast and set it + $this->appVersion = $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 (string $appName) { + // Cast and set it + $this->appName = $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 (string $shortName) { + // Cast and set it + $this->shortName = (string) $shortName; + } + } diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php index ddfaef46..88168c53 100644 --- a/framework/main/classes/class_BaseFrameworkSystem.php +++ b/framework/main/classes/class_BaseFrameworkSystem.php @@ -7,7 +7,6 @@ use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Compressor\Compressor; use Org\Mxchange\CoreFramework\Configuration\FrameworkConfiguration; use Org\Mxchange\CoreFramework\Connection\Database\DatabaseConnection; -use Org\Mxchange\CoreFramework\Controller\Controller; use Org\Mxchange\CoreFramework\Criteria\Criteria; use Org\Mxchange\CoreFramework\Criteria\Local\LocalSearchCriteria; use Org\Mxchange\CoreFramework\Criteria\Local\LocalUpdateCriteria; @@ -93,7 +92,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac /** * The real class name */ - private $realClass = 'BaseFrameworkSystem'; + private $realClass = __CLASS__; /** * Search criteria instance @@ -120,11 +119,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac */ private $userInstance = NULL; - /** - * A controller instance - */ - private $controllerInstance = NULL; - /** * Instance of a RNG */ @@ -891,25 +885,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac 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 * diff --git a/framework/main/classes/resolver/class_BaseResolver.php b/framework/main/classes/resolver/class_BaseResolver.php index 4d98c915..56f2c4dd 100644 --- a/framework/main/classes/resolver/class_BaseResolver.php +++ b/framework/main/classes/resolver/class_BaseResolver.php @@ -3,6 +3,7 @@ namespace Org\Mxchange\CoreFramework\Resolver; // Import framework stuff +use Org\Mxchange\CoreFramework\Controller\Controller; use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; @@ -49,6 +50,11 @@ abstract class BaseResolver extends BaseFrameworkSystem { */ private $resolvedInstance = NULL; + /** + * A controller instance + */ + private $controllerInstance = NULL; + // Exception constants const EXCEPTION_INVALID_COMMAND = 0x1d0; const EXCEPTION_INVALID_CONTROLLER = 0x1d1; @@ -158,4 +164,23 @@ abstract class BaseResolver extends BaseFrameworkSystem { $this->resolvedInstance = $resolvedInstance; } + /** + * 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; + } + } -- 2.39.5