From: Roland Haeder Date: Sun, 5 Apr 2015 22:07:26 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=065380e2cffdb028bf0b4a25a0bd9635cabce9cc;p=hub.git Continued: - Removed 'shutdown' methods as the new 'core' provides it - Added missing method assignExtraTemplateData() - Updated 'core' to latest commit Signed-off-by: Roland Haeder --- diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php index 7692e57d7..5d6c81e77 100644 --- a/application/hub/class_ApplicationHelper.php +++ b/application/hub/class_ApplicationHelper.php @@ -212,6 +212,16 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica self::createDebugInstance(__CLASS__)->debugOutput('MAIN: Shutdown completed. (This is the last line.)'); } + /** + * Assigns extra application-depending data + * + * @param $templateInstance An instance of a CompileableTemplate + * @return void + * @todo Nothing to add? + */ + public function assignExtraTemplateData (CompileableTemplate $templateInstance) { + } + /** * Handle the indexed array of fatal messages and puts them out in an * acceptable fasion diff --git a/application/hub/main/controller/console/class_HubConsoleAptProxyController.php b/application/hub/main/controller/console/class_HubConsoleAptProxyController.php index e627bafdb..178388f13 100644 --- a/application/hub/main/controller/console/class_HubConsoleAptProxyController.php +++ b/application/hub/main/controller/console/class_HubConsoleAptProxyController.php @@ -104,27 +104,6 @@ class HubConsoleAptProxyController extends BaseController implements Controller public function executeBootstrapFilters (Requestable $requestInstance, Responseable $responseInstance) { $this->executeFilters('bootstrap', $requestInstance, $responseInstance); } - - /** - * Add a shutdown filter - * - * @param $filterInstance A Filterable class - * @return void - */ - public function addShutdownFilter (Filterable $filterInstance) { - $this->addFilter('shutdown', $filterInstance); - } - - /** - * Executes all shutdown filters - * - * @param $requestInstance A Requestable class - * @param $responseInstance A Responseable class - * @return void - */ - public function executeShutdownFilters (Requestable $requestInstance, Responseable $responseInstance) { - $this->executeFilters('shutdown', $requestInstance, $responseInstance); - } } // [EOF] diff --git a/application/hub/main/controller/console/class_HubConsoleChatController.php b/application/hub/main/controller/console/class_HubConsoleChatController.php index 051103a14..7a92d78de 100644 --- a/application/hub/main/controller/console/class_HubConsoleChatController.php +++ b/application/hub/main/controller/console/class_HubConsoleChatController.php @@ -104,27 +104,6 @@ class HubConsoleChatController extends BaseController implements Controller { public function executeBootstrapFilters (Requestable $requestInstance, Responseable $responseInstance) { $this->executeFilters('bootstrap', $requestInstance, $responseInstance); } - - /** - * Add a shutdown filter - * - * @param $filterInstance A Filterable class - * @return void - */ - public function addShutdownFilter (Filterable $filterInstance) { - $this->addFilter('shutdown', $filterInstance); - } - - /** - * Executes all shutdown filters - * - * @param $requestInstance A Requestable class - * @param $responseInstance A Responseable class - * @return void - */ - public function executeShutdownFilters (Requestable $requestInstance, Responseable $responseInstance) { - $this->executeFilters('shutdown', $requestInstance, $responseInstance); - } } // [EOF] diff --git a/application/hub/main/controller/console/class_HubConsoleCrawlerController.php b/application/hub/main/controller/console/class_HubConsoleCrawlerController.php index 2a514e7d8..c351e6c2e 100644 --- a/application/hub/main/controller/console/class_HubConsoleCrawlerController.php +++ b/application/hub/main/controller/console/class_HubConsoleCrawlerController.php @@ -104,27 +104,6 @@ class HubConsoleCrawlerController extends BaseController implements Controller { public function executeBootstrapFilters (Requestable $requestInstance, Responseable $responseInstance) { $this->executeFilters('bootstrap', $requestInstance, $responseInstance); } - - /** - * Add a shutdown filter - * - * @param $filterInstance A Filterable class - * @return void - */ - public function addShutdownFilter (Filterable $filterInstance) { - $this->addFilter('shutdown', $filterInstance); - } - - /** - * Executes all shutdown filters - * - * @param $requestInstance A Requestable class - * @param $responseInstance A Responseable class - * @return void - */ - public function executeShutdownFilters (Requestable $requestInstance, Responseable $responseInstance) { - $this->executeFilters('shutdown', $requestInstance, $responseInstance); - } } // [EOF] diff --git a/application/hub/main/controller/console/class_HubConsoleCruncherController.php b/application/hub/main/controller/console/class_HubConsoleCruncherController.php index 9f21aaa9f..b478baa73 100644 --- a/application/hub/main/controller/console/class_HubConsoleCruncherController.php +++ b/application/hub/main/controller/console/class_HubConsoleCruncherController.php @@ -105,27 +105,6 @@ class HubConsoleCruncherController extends BaseController implements Controller public function executeBootstrapFilters (Requestable $requestInstance, Responseable $responseInstance) { $this->executeFilters('bootstrap', $requestInstance, $responseInstance); } - - /** - * Add a shutdown filter - * - * @param $filterInstance A Filterable class - * @return void - */ - public function addShutdownFilter (Filterable $filterInstance) { - $this->addFilter('shutdown', $filterInstance); - } - - /** - * Executes all shutdown filters - * - * @param $requestInstance A Requestable class - * @param $responseInstance A Responseable class - * @return void - */ - public function executeShutdownFilters (Requestable $requestInstance, Responseable $responseInstance) { - $this->executeFilters('shutdown', $requestInstance, $responseInstance); - } } // [EOF] diff --git a/application/hub/main/controller/console/class_HubConsoleDefaultNewsController.php b/application/hub/main/controller/console/class_HubConsoleDefaultNewsController.php index dcdc3acb7..35c26b32c 100644 --- a/application/hub/main/controller/console/class_HubConsoleDefaultNewsController.php +++ b/application/hub/main/controller/console/class_HubConsoleDefaultNewsController.php @@ -129,27 +129,6 @@ class HubConsoleDefaultNewsController extends BaseController implements Controll public function executeActivationFilters (Requestable $requestInstance, Responseable $responseInstance) { $this->executeFilters('activation', $requestInstance, $responseInstance); } - - /** - * Add a shutdown filter - * - * @param $filterInstance A Filterable class - * @return void - */ - public function addShutdownFilter (Filterable $filterInstance) { - $this->addFilter('shutdown', $filterInstance); - } - - /** - * Executes all shutdown filters - * - * @param $requestInstance A Requestable class - * @param $responseInstance A Responseable class - * @return void - */ - public function executeShutdownFilters (Requestable $requestInstance, Responseable $responseInstance) { - $this->executeFilters('shutdown', $requestInstance, $responseInstance); - } } // [EOF] diff --git a/application/hub/main/controller/console/class_HubConsoleMinerController.php b/application/hub/main/controller/console/class_HubConsoleMinerController.php index 96de80a07..e3e564a7f 100644 --- a/application/hub/main/controller/console/class_HubConsoleMinerController.php +++ b/application/hub/main/controller/console/class_HubConsoleMinerController.php @@ -104,27 +104,6 @@ class HubConsoleMinerController extends BaseController implements Controller { public function executeBootstrapFilters (Requestable $requestInstance, Responseable $responseInstance) { $this->executeFilters('bootstrap', $requestInstance, $responseInstance); } - - /** - * Add a shutdown filter - * - * @param $filterInstance A Filterable class - * @return void - */ - public function addShutdownFilter (Filterable $filterInstance) { - $this->addFilter('shutdown', $filterInstance); - } - - /** - * Executes all shutdown filters - * - * @param $requestInstance A Requestable class - * @param $responseInstance A Responseable class - * @return void - */ - public function executeShutdownFilters (Requestable $requestInstance, Responseable $responseInstance) { - $this->executeFilters('shutdown', $requestInstance, $responseInstance); - } } // [EOF] diff --git a/core b/core index 69e15880c..64d9752d2 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 69e15880c80ca131c7ddde022366d4198d0fce4c +Subproject commit 64d9752d26925eb4389f478362e84e77dee6057a