From 083892d43cd5e566fba63c0ef6d1c75dde5944f2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 11 Apr 2018 06:38:03 +0200
Subject: [PATCH] Continued: - ApplicationHelper needs to expand
BaseApplication to have "self-registration" generically done - updated
'core' to latest commit
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Signed-off-by: Roland Häder <roland@mxchange.org>
---
application/city/class_ApplicationHelper.php | 4 ++--
application/city/classes/city_daemon/class_BaseCityDaemon.php | 4 ++--
.../classes/commands/html/class_CityHtmlConfirmCommand.php | 2 +-
.../classes/commands/html/class_CityHtmlLoginAreaCommand.php | 4 ++--
.../city/classes/commands/html/class_CityHtmlLoginCommand.php | 2 +-
.../commands/html/class_CityHtmlLoginFailedCommand.php | 2 +-
.../classes/commands/html/class_CityHtmlResendLinkCommand.php | 2 +-
.../classes/commands/html/class_HtmlLogoutDoneCommand.php | 2 +-
core | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/application/city/class_ApplicationHelper.php b/application/city/class_ApplicationHelper.php
index 794635c..5aa8b14 100644
--- a/application/city/class_ApplicationHelper.php
+++ b/application/city/class_ApplicationHelper.php
@@ -3,11 +3,11 @@
namespace Org\Mxchange\CoreFramework\Helper\Application;
// Import framework stuff
+use Org\Mxchange\CoreFramework\Application\BaseApplication;
use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
use Org\Mxchange\CoreFramework\Loader\ClassLoader;
use Org\Mxchange\CoreFramework\Manager\ManageableApplication;
-use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
use Org\Mxchange\CoreFramework\Registry\Registerable;
use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
@@ -50,7 +50,7 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplication, Registerable {
+class ApplicationHelper extends BaseApplication implements ManageableApplication, Registerable {
/**
* The version number of this application
*/
diff --git a/application/city/classes/city_daemon/class_BaseCityDaemon.php b/application/city/classes/city_daemon/class_BaseCityDaemon.php
index 667eaac..fc6fa2b 100644
--- a/application/city/classes/city_daemon/class_BaseCityDaemon.php
+++ b/application/city/classes/city_daemon/class_BaseCityDaemon.php
@@ -100,11 +100,11 @@ abstract class BaseCityDaemon extends BaseCitySystem implements Updateable, Adda
*/
public function outputConsoleTeaser () {
// Get the app instance (for shortening our code)
- $app = $this->getApplicationInstance();
+ $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
// Output all lines
self::createDebugInstance(__CLASS__)->debugOutput(' ');
- self::createDebugInstance(__CLASS__)->debugOutput($app->getAppName() . ' v' . $app->getAppVersion() . ' - ' . FrameworkBootstrap::getRequestInstance()->getRequestElement('mode') . ' daemon starting');
+ self::createDebugInstance(__CLASS__)->debugOutput($applicationInstance->getAppName() . ' v' . $applicationInstance->getAppVersion() . ' - ' . FrameworkBootstrap::getRequestInstance()->getRequestElement('mode') . ' daemon starting');
self::createDebugInstance(__CLASS__)->debugOutput('Copyright (c) 2015, 2016 City Developer Team');
self::createDebugInstance(__CLASS__)->debugOutput(' ');
self::createDebugInstance(__CLASS__)->debugOutput('This program comes with ABSOLUTELY NO WARRANTY; for details see docs/COPYING.');
diff --git a/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php b/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php
index 9c46a14..81a6cab 100644
--- a/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php
@@ -70,7 +70,7 @@ class CityHtmlConfirmCommand extends BaseCommand implements Commandable {
*/
public function execute (Requestable $requestInstance, Responseable $responseInstance) {
// Get the application instance
- $applicationInstance = $this->getResolverInstance()->getApplicationInstance();
+ $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
// Prepare a template instance
$templateInstance = $this->prepareTemplateInstance($applicationInstance);
diff --git a/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php
index 0cb727b..4197b4d 100644
--- a/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php
@@ -94,7 +94,7 @@ class CityHtmlLoginAreaCommand extends BaseCommand implements Commandable {
} // END - if
// Get the application instance
- $applicationInstance = $this->getResolverInstance()->getApplicationInstance();
+ $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
// Prepare a template instance
$templateInstance = $this->prepareTemplateInstance($applicationInstance);
@@ -193,7 +193,7 @@ class CityHtmlLoginAreaCommand extends BaseCommand implements Commandable {
} // END - if
// Get application instance
- $applicationInstance = $this->getResolverInstance()->getApplicationInstance();
+ $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
// Get a resolver
$actionResolver = HtmlActionResolver::createHtmlActionResolver($this->actionName, $applicationInstance);
diff --git a/application/city/classes/commands/html/class_CityHtmlLoginCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginCommand.php
index 46cd32a..5ead86c 100644
--- a/application/city/classes/commands/html/class_CityHtmlLoginCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlLoginCommand.php
@@ -73,7 +73,7 @@ class CityHtmlLoginCommand extends BaseCommand implements Commandable, Registera
GenericRegistry::getRegistry()->addInstance('extra', $this);
// Get the application instance
- $applicationInstance = $this->getResolverInstance()->getApplicationInstance();
+ $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
// Prepare a template instance
$templateInstance = $this->prepareTemplateInstance($applicationInstance);
diff --git a/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php
index 758159b..d1c24ad 100644
--- a/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php
@@ -69,7 +69,7 @@ class CityHtmlLoginFailedCommand extends BaseCommand implements Commandable {
*/
public function execute (Requestable $requestInstance, Responseable $responseInstance) {
// Get the application instance
- $applicationInstance = $this->getResolverInstance()->getApplicationInstance();
+ $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
// Prepare a template instance
$templateInstance = $this->prepareTemplateInstance($applicationInstance);
diff --git a/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php
index b67be67..c625b14 100644
--- a/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php
@@ -74,7 +74,7 @@ class CityHtmlResendLinkCommand extends BaseCommand implements Commandable {
$userInstance = GenericRegistry::getRegistry()->getInstance('user');
// Get an application instance
- $applicationInstance = $this->getResolverInstance()->getApplicationInstance();
+ $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
// Get a RNG instance (Random Number Generator)
$rngInstance = ObjectFactory::createObjectByConfiguredName('rng_class');
diff --git a/application/city/classes/commands/html/class_HtmlLogoutDoneCommand.php b/application/city/classes/commands/html/class_HtmlLogoutDoneCommand.php
index f4824be..90b3206 100644
--- a/application/city/classes/commands/html/class_HtmlLogoutDoneCommand.php
+++ b/application/city/classes/commands/html/class_HtmlLogoutDoneCommand.php
@@ -70,7 +70,7 @@ class HtmlLogoutDoneCommand extends BaseCommand implements Commandable {
*/
public function execute (Requestable $requestInstance, Responseable $responseInstance) {
// Get the application instance
- $applicationInstance = $this->getResolverInstance()->getApplicationInstance();
+ $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
// Prepare a template instance
$templateInstance = $this->prepareTemplateInstance($applicationInstance);
diff --git a/core b/core
index 2f930fd..e137daa 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 2f930fd62f97e06a6b90afb971cce6343522f9b9
+Subproject commit e137daa3a06f4b9e3767db913854c609383e8533
--
2.39.5