]> git.mxchange.org Git - city.git/commitdiff
Output system is now no longer initialized by loading a centralized
authorRoland Haeder <roland@mxchange.org>
Tue, 24 Mar 2015 18:18:53 +0000 (19:18 +0100)
committerRoland Haeder <roland@mxchange.org>
Tue, 24 Mar 2015 18:18:53 +0000 (19:18 +0100)
inc/output.php as this was a stupid idea and sometimes the same application
has a console and web part.

Updated 'core' and re-enabled shutdown hook.

Signed-off-by: Roland Haeder <roland@mxchange.org>
application/city/class_ApplicationHelper.php
application/city/init.php
core

index ca061e497cd3d02bf0b652ff265326735364ec00..a9e56fa600dbcf527f4957ad7296482bcbef4a78 100644 (file)
@@ -153,8 +153,8 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
                Registry::getRegistry()->addInstance('app', $this);
 
                // Default response is console
-               $response = $this->getResponseTypeFromSystem();
-               $responseType = $this->getResponseTypeFromSystem();
+               $response = self::getResponseTypeFromSystem();
+               $responseType = self::getResponseTypeFromSystem();
 
                // Create a new request object
                $requestInstance = ObjectFactory::createObjectByName($this->convertToClassName($response) . 'Request');
@@ -205,7 +205,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
                $this->getControllerInstance()->handleRequest($requestInstance, $responseInstance);
 
                // -------------------------- Shutdown phase --------------------------
-               // @TODO $this->getControllerInstance()->executeShutdownFilters($requestInstance, $responseInstance);
+               $this->getControllerInstance()->executeShutdownFilters($requestInstance, $responseInstance);
        }
 
        /**
index 8d592ce3b7ad1f68ddcea7fadc5f8854dc5fa9e3..8f740dc8a1b9c0c7d35affd847df061af0d284a3 100644 (file)
@@ -27,8 +27,8 @@
 // Get config instance
 $cfg = FrameworkConfiguration::getSelfInstance();
 
-// Initialize output system
-require($cfg->getConfigEntry('base_path') . 'inc/output.php');
+// Initialize output system, you can use any class that expands BaseFrameworkSystem
+ApplicationHelper::createDebugInstance('ApplicationHelper');
 
 // This application needs a database connection then we have to simply include
 // the inc/database.php script
diff --git a/core b/core
index c0922d6cccd0fb0f1b5221585748e92d02ad1cee..a142fe5eeaaa17a434c80ea103088558157c43bb 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit c0922d6cccd0fb0f1b5221585748e92d02ad1cee
+Subproject commit a142fe5eeaaa17a434c80ea103088558157c43bb