Continued:

- renamed $app -> $applicationInstance
- assignApplicationData() has no parameters now
- updated core to latest commit

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php b/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php
index 0da9ba6fe9788a0422b45bbd09daee7f3ffafdfc..c33eeb7e79c75af707401642344f730fe7df472b 100644 (file)
--- a/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php
+++ b/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php
@@ -72,11 +72,11 @@ class NodeConsoleAptProxy extends BaseNodeAptProxy implements AptProxy, Register
         */
        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__, __LINE__)->debugOutput(' ');
-               self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($app->getAppName() . ' v' . $app->getAppVersion() . ' - An apt-proxy connection helper');
+               self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($applicationInstance->getAppName() . ' v' . $applicationInstance->getAppVersion() . ' - An apt-proxy connection helper');
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('Copyright (c) 2012 Apt-Proxy Developer Team');
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(' ');
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('This program comes with ABSOLUTELY NO WARRANTY; for details see docs/COPYING.');

diff --git a/application/hub/classes/chat/console/class_NodeConsoleChat.php b/application/hub/classes/chat/console/class_NodeConsoleChat.php
index 1fa9b9a91c4a59e4ee3af639fb115c3ba376000c..da1fc45f884af30ea76d69b91e8ee523f27ea2cf 100644 (file)
--- a/application/hub/classes/chat/console/class_NodeConsoleChat.php
+++ b/application/hub/classes/chat/console/class_NodeConsoleChat.php
@@ -72,11 +72,11 @@ class NodeConsoleChat extends BaseNodeChat implements Chatter, Registerable {
         */
        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__, __LINE__)->debugOutput(' ');
-               self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($app->getAppName() . ' v' . $app->getAppVersion() . ' - A telnet connection helper');
+               self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($applicationInstance->getAppName() . ' v' . $applicationInstance->getAppVersion() . ' - A telnet connection helper');
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('Copyright (c) 2012 Chat Developer Team');
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(' ');
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('This program comes with ABSOLUTELY NO WARRANTY; for details see docs/COPYING.');

diff --git a/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php b/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php
index de8c4845bd925866f841852817dd10de5578c690..ac5d3598418ceb8357c54085473d724c39917ec9 100644 (file)
--- a/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php
+++ b/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php
@@ -72,11 +72,11 @@ class NodeConsoleCrawler extends BaseNodeCrawler implements Crawler, Registerabl
         */
        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__, __LINE__)->debugOutput(' ');
-               self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('Distributed Crawler v' . $app->getAppVersion());
+               self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('Distributed Crawler v' . $applicationInstance->getAppVersion());
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('Copyright (c) 2014 Crawler Developer Team');
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(' ');
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('This program comes with ABSOLUTELY NO WARRANTY; for details see docs/COPYING.');

diff --git a/application/hub/classes/nodes/class_BaseHubNode.php b/application/hub/classes/nodes/class_BaseHubNode.php
index 7757175a0277289f9fa0df6a1296091c30294d8c..c9808caea0e14db7a87ba2395f461b38cfccfcc0 100644 (file)
--- a/application/hub/classes/nodes/class_BaseHubNode.php
+++ b/application/hub/classes/nodes/class_BaseHubNode.php
@@ -272,11 +272,11 @@ abstract class BaseHubNode extends BaseHubSystem implements Updateable, AddableC
         */
        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__, __LINE__)->debugOutput(' ');
-               self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($app->getAppName() . ' v' . $app->getAppVersion() . ' - ' . FrameworkBootstrap::getRequestInstance()->getRequestElement('mode') . ' mode active');
+               self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($applicationInstance->getAppName() . ' v' . $applicationInstance->getAppVersion() . ' - ' . FrameworkBootstrap::getRequestInstance()->getRequestElement('mode') . ' mode active');
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('Copyright (c) 2007 - 2008 Roland Haeder, 2009 - 2015 Hub Developer Team');
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(' ');
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('This program comes with ABSOLUTELY NO WARRANTY; for details see docs/COPYING.');

diff --git a/core b/core
index 2f930fd62f97e06a6b90afb971cce6343522f9b9..3509acc2599a67101b078129441c8125f93dfa1e 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 2f930fd62f97e06a6b90afb971cce6343522f9b9
+Subproject commit 3509acc2599a67101b078129441c8125f93dfa1e

diff --git a/index.php b/index.php
index 1e7f1d48f75e9a68e0803bef7bd71d416ff24fa6..e3c5da87df742caed7a31be487ec3306d16460a3 100644 (file)
--- a/index.php
+++ b/index.php
@@ -137,7 +137,7 @@ final class ApplicationEntryPoint {
                                $applicationInstance = ApplicationHelper::getSelfInstance();
 
                                // Assign application data
-                               $templateInstance->assignApplicationData($applicationInstance);
+                               $templateInstance->assignApplicationData();
                        } // END - if
 
                        // We only try this