From 645d7022e1e74573bd7511fb98ae3ac4e341464e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 30 Oct 2020 00:45:45 +0100 Subject: [PATCH] Continued: - added missing Responable::initTemplateEngine() invocation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- framework/bootstrap/class_FrameworkBootstrap.php | 3 +++ .../resolver/command/class_BaseCommandResolver.php | 8 ++++---- .../classes/response/console/class_ConsoleResponse.php | 1 + .../main/classes/response/html/class_HtmlResponse.php | 1 + .../main/classes/response/image/class_ImageResponse.php | 1 + .../main/interfaces/response/class_Responseable.php | 9 +++++++++ 6 files changed, 19 insertions(+), 4 deletions(-) diff --git a/framework/bootstrap/class_FrameworkBootstrap.php b/framework/bootstrap/class_FrameworkBootstrap.php index f7a4b5e2..e5d27674 100644 --- a/framework/bootstrap/class_FrameworkBootstrap.php +++ b/framework/bootstrap/class_FrameworkBootstrap.php @@ -363,6 +363,9 @@ final class FrameworkBootstrap { )); } + // Init template engine + self::getResponseInstance()->initTemplateEngine($applicationInstance); + // Now call all methods in one go foreach (array('setupApplicationData', 'initApplication', 'launchApplication') as $methodName) { // Debug message diff --git a/framework/main/classes/resolver/command/class_BaseCommandResolver.php b/framework/main/classes/resolver/command/class_BaseCommandResolver.php index f064b30f..4dd1861e 100644 --- a/framework/main/classes/resolver/command/class_BaseCommandResolver.php +++ b/framework/main/classes/resolver/command/class_BaseCommandResolver.php @@ -177,9 +177,6 @@ abstract class BaseCommandResolver extends BaseResolver { * @throws InvalidArgumentException Thrown if given command is not set */ protected function isCommandValid ($namespace, $commandName) { - // By default nothing shall be valid - $isValid = false; - // Is namespace and command name set? if (empty($namespace)) { // Then thrown an exception here @@ -187,7 +184,10 @@ abstract class BaseCommandResolver extends BaseResolver { } elseif (empty($commandName)) { // Then thrown an exception here throw new InvalidArgumentException('Parameter "commandName" is empty'); - } // END - if + } + + // By default nothing shall be valid + $isValid = false; // Create the full class name $className = sprintf( diff --git a/framework/main/classes/response/console/class_ConsoleResponse.php b/framework/main/classes/response/console/class_ConsoleResponse.php index 020cf78f..6d5d6df4 100644 --- a/framework/main/classes/response/console/class_ConsoleResponse.php +++ b/framework/main/classes/response/console/class_ConsoleResponse.php @@ -3,6 +3,7 @@ namespace Org\Mxchange\CoreFramework\Response; // Import framework stuff +use Org\Mxchange\CoreFramework\Manager\ManageableApplication; use Org\Mxchange\CoreFramework\Response\Responseable; /** diff --git a/framework/main/classes/response/html/class_HtmlResponse.php b/framework/main/classes/response/html/class_HtmlResponse.php index 9b4783e2..2e84655b 100644 --- a/framework/main/classes/response/html/class_HtmlResponse.php +++ b/framework/main/classes/response/html/class_HtmlResponse.php @@ -3,6 +3,7 @@ namespace Org\Mxchange\CoreFramework\Response; // Import framework stuff +use Org\Mxchange\CoreFramework\Manager\ManageableApplication; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/framework/main/classes/response/image/class_ImageResponse.php b/framework/main/classes/response/image/class_ImageResponse.php index ebcf9665..3d54e6a4 100644 --- a/framework/main/classes/response/image/class_ImageResponse.php +++ b/framework/main/classes/response/image/class_ImageResponse.php @@ -3,6 +3,7 @@ namespace Org\Mxchange\CoreFramework\Response; // Import framework stuff +use Org\Mxchange\CoreFramework\Manager\ManageableApplication; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/framework/main/interfaces/response/class_Responseable.php b/framework/main/interfaces/response/class_Responseable.php index 0bebd0cd..0713ab78 100644 --- a/framework/main/interfaces/response/class_Responseable.php +++ b/framework/main/interfaces/response/class_Responseable.php @@ -4,6 +4,7 @@ namespace Org\Mxchange\CoreFramework\Response; // Import framework stuff use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; +use Org\Mxchange\CoreFramework\Manager\ManageableApplication; /** * An interface for responses @@ -115,4 +116,12 @@ interface Responseable extends FrameworkInterface { */ function refreshCookie ($cookieName); + /** + * Initializes the template engine instance + * + * @param $applicationInstance An instance of a manageable application + * @return void + */ + function initTemplateEngine (ManageableApplication $applicationInstance); + } -- 2.39.2